diff options
Diffstat (limited to 'office/epdfview/poppler-0151.patch')
| -rw-r--r-- | office/epdfview/poppler-0151.patch | 134 |
1 files changed, 0 insertions, 134 deletions
diff --git a/office/epdfview/poppler-0151.patch b/office/epdfview/poppler-0151.patch deleted file mode 100644 index c1aa9a1a6f..0000000000 --- a/office/epdfview/poppler-0151.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 951a8f66463c0dc38fa05931bd8df7b45707f6e8 Mon Sep 17 00:00:00 2001 -From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e> -Date: Wed, 17 Nov 2010 16:02:45 +0000 -Subject: [PATCH 3/3] Applied patch by Dennis Sheil <dennis-poppler@vartmp.com> to use the correct variable type for linearization since poppler version 0.15.1. - -git-svn-id: svn://svn.emma-soft.com/epdfview@357 cb4bfb15-1111-0410-82e2-95233c8f1c7e ---- - trunk/THANKS | 1 + - trunk/configure.ac | 5 +++++ - trunk/src/IDocument.cxx | 15 ++++++++++++++- - trunk/src/IDocument.h | 8 ++++++++ - trunk/src/PDFDocument.cxx | 4 ++++ - 5 files changed, 32 insertions(+), 1 deletions(-) - -diff --git a/trunk/THANKS b/trunk/THANKS -index 48dcb2b..7888d1a 100644 ---- a/trunk/THANKS -+++ b/trunk/THANKS -@@ -4,6 +4,7 @@ contributions: - - Alain Mendizabal <alainmendi@gmail.com>, for his Basque translation. - - Alex Dedul <rotmer@gmail.com>, for his patch. - - Alexander <lothalev@gmail.com>, for corrections in the Polish translation. -+ - Dennis Sheil <dennis-poppler@vartmp.com>, for his patch. - - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch and others. - - Daniel Nylander <po@danielnylander.se>, for his Swedish translation. - - Daniel Pielmeie <daniel.pielmeie@googlemail.com>, for his patches. -diff --git a/trunk/configure.ac b/trunk/configure.ac -index 6cbd0e2..f8316b0 100644 ---- a/trunk/configure.ac -+++ b/trunk/configure.ac -@@ -56,6 +56,11 @@ PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes]) - if test "x$have_poppler_0_15_0" = "xyes"; then - AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.]) - fi -+PKG_CHECK_EXISTS([poppler-glib >= 0.15.1], [have_poppler_0_15_1=yes]) -+if test "x$have_poppler_0_15_1" = "xyes"; then -+ AC_DEFINE([HAVE_POPPLER_0_15_1], [1], [Define to 1 if you have Poppler version 0.15.1 or higher.]) -+fi -+ - - EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes]) - AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes") -diff --git a/trunk/src/IDocument.cxx b/trunk/src/IDocument.cxx -index f1b71c5..f560f34 100644 ---- a/trunk/src/IDocument.cxx -+++ b/trunk/src/IDocument.cxx -@@ -755,11 +755,16 @@ IDocument::setFormat (gchar *format) - const gchar * - IDocument::getLinearized () - { -+#if defined (HAVE_POPPLER_0_15_1) -+ if ( m_Linearized ) return "Yes"; -+ else return "No"; -+#else - if ( NULL == m_Linearized ) - { - return "No"; - } - return m_Linearized; -+#endif - } - - /// -@@ -768,14 +773,22 @@ IDocument::getLinearized () - /// @param linearized Set to "Yes" if the document is linearized. "No" - /// otherwise. IDocument will free it. - /// -+#if defined (HAVE_POPPLER_0_15_1) - void --IDocument::setLinearized (gchar *linearized) -+IDocument::setLinearized (gboolean *linearized) -+{ -+ m_Linearized = linearized; -+} -+#else -+void -+ IDocument::setLinearized (gchar *linearized) - { - gchar *oldLinearized = m_Linearized; - m_Linearized = g_strdup (linearized); - g_free (oldLinearized); - g_free (linearized); - } -+#endif - - /// - /// @brief Gets the document's creation date. -diff --git a/trunk/src/IDocument.h b/trunk/src/IDocument.h -index fbb3954..32aadf2 100644 ---- a/trunk/src/IDocument.h -+++ b/trunk/src/IDocument.h -@@ -306,7 +306,11 @@ namespace ePDFView - const gchar *getFormat (void); - void setFormat (gchar *format); - const gchar *getLinearized (void); -+#if defined (HAVE_POPPLER_0_15_1) -+ void setLinearized (gboolean *linearized); -+#else - void setLinearized (gchar *linearized); -+#endif - const gchar *getCreationDate (void); - void setCreationDate (gchar *date); - const gchar *getModifiedDate (void); -@@ -382,7 +386,11 @@ namespace ePDFView - /// The document's keyword. - gchar *m_Keywords; - /// Tells if the document is linearized or not. -+#if defined (HAVE_POPPLER_0_15_1) -+ gboolean *m_Linearized; -+#else - gchar *m_Linearized; -+#endif - /// The document's modification date and time. - gchar *m_ModifiedDate; - /// @brief The list of classes that will receive notifications -diff --git a/trunk/src/PDFDocument.cxx b/trunk/src/PDFDocument.cxx -index a590a20..4d425cd 100644 ---- a/trunk/src/PDFDocument.cxx -+++ b/trunk/src/PDFDocument.cxx -@@ -324,7 +324,11 @@ PDFDocument::loadMetadata (void) - gchar *format = NULL; - gchar *keywords = NULL; - PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET; -+#if defined (HAVE_POPPLER_0_15_1) -+ gboolean *linearized = NULL; -+#else - gchar *linearized = NULL; -+#endif - GTime modDate; - PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET; - gchar *producer = NULL; --- -1.7.4 - |