r39357 - in /desktop/unstable/evince/debian: changelog patches/01-poppler-0.18-compat.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Aug 27 23:52:48 2013
New Revision: 39357

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39357
Log:
debian/patches/01-poppler-0.18-compat.patch: Make it possible to compile
evince against poppler 0.18 since unstable doesn't have 0.20 yet.

Added:
    desktop/unstable/evince/debian/patches/01-poppler-0.18-compat.patch
Modified:
    desktop/unstable/evince/debian/changelog
    desktop/unstable/evince/debian/patches/series

Modified: desktop/unstable/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/changelog?rev=39357&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog	[utf-8] (original)
+++ desktop/unstable/evince/debian/changelog	[utf-8] Tue Aug 27 23:52:48 2013
@@ -2,6 +2,8 @@
 
   * New upstream release.
   * Bump Standards-Version to 3.9.4. No further changes.
+  * debian/patches/01-poppler-0.18-compat.patch: Make it possible to compile
+    evince against poppler 0.18 since unstable doesn't have 0.20 yet.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 28 Aug 2013 01:36:08 +0200
 

Added: desktop/unstable/evince/debian/patches/01-poppler-0.18-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/01-poppler-0.18-compat.patch?rev=39357&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/01-poppler-0.18-compat.patch	(added)
+++ desktop/unstable/evince/debian/patches/01-poppler-0.18-compat.patch	[utf-8] Tue Aug 27 23:52:48 2013
@@ -0,0 +1,55 @@
+Description: Make it possible to compile evince 3.8 against poppler 0.18
+ Since poppler 0.20.0 is not yet available in Debian sid, add a version
+ check so we can build against older versions. The existing code already
+ provides a sensible fallback path.
+Author: Michael Biebl <biebl at debian.org>
+diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
+index 883de2d..0ddaef9 100644
+--- a/backend/pdf/ev-poppler.cc
++++ b/backend/pdf/ev-poppler.cc
+@@ -1115,10 +1115,10 @@ pdf_document_fonts_fill_model (EvDocumentFonts *document_fonts,
+ 		const char *type_str;
+ 		const char *embedded;
+ 		const char *standard_str = "";
+-		const gchar *substitute;
++		const gchar *substitute = NULL;
+ 		const gchar *substitute_text;
+ 		const gchar *filename;
+-		const gchar *encoding;
++		const gchar *encoding = NULL;
+ 		const gchar *encoding_text;
+ 		char *details;
+ 		
+@@ -1128,7 +1128,9 @@ pdf_document_fonts_fill_model (EvDocumentFonts *document_fonts,
+ 			name = _("No name");
+ 		}
+ 
++#if POPPLER_CHECK_VERSION(0, 20, 0)
+ 		encoding = poppler_fonts_iter_get_encoding (iter);
++#endif
+ 		if (!encoding) {
+ 			/* translators: When a font type does not have
+ 			   encoding information or it is unknown.  Example:
+@@ -1165,7 +1167,9 @@ pdf_document_fonts_fill_model (EvDocumentFonts *document_fonts,
+ 			}
+ 		}
+ 
++#if POPPLER_CHECK_VERSION(0, 20, 0)
+ 		substitute = poppler_fonts_iter_get_substitute_name (iter);
++#endif
+ 		filename = poppler_fonts_iter_get_file_name (iter);
+ 		encoding_text = _("Encoding");
+ 		substitute_text = _("Substituting with");
+diff --git a/configure.ac b/configure.ac
+index 184f492..5bfb40b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -471,7 +471,7 @@ AC_ARG_ENABLE([pdf],
+   [enable_pdf=yes])
+ 
+ if test "x$enable_pdf" = "xyes"; then
+-    POPPLER_REQUIRED=0.20.0
++    POPPLER_REQUIRED=0.18.0
+     PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no)
+ 
+     if test "x$enable_pdf" = "xyes"; then

Modified: desktop/unstable/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/series?rev=39357&op=diff
==============================================================================
--- desktop/unstable/evince/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/evince/debian/patches/series	[utf-8] Tue Aug 27 23:52:48 2013
@@ -0,0 +1 @@
+01-poppler-0.18-compat.patch