r32874 - in /desktop/experimental/evince/debian: changelog patches/01_poppler-0.16-compat.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Mar  8 15:22:08 2012
New Revision: 32874

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32874
Log:
debian/patches/01_poppler-0.16-compat.patch: Keep evince compiling against
0.16 so we don't require 0.18. Thanks Pino Toscano for the patch.

Added:
    desktop/experimental/evince/debian/patches/01_poppler-0.16-compat.patch
Modified:
    desktop/experimental/evince/debian/changelog
    desktop/experimental/evince/debian/patches/series

Modified: desktop/experimental/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/changelog?rev=32874&op=diff
==============================================================================
--- desktop/experimental/evince/debian/changelog [utf-8] (original)
+++ desktop/experimental/evince/debian/changelog [utf-8] Thu Mar  8 15:22:08 2012
@@ -4,6 +4,8 @@
   * Change section of gir1.2-evince-3.0 to introspection.
   * Tighten dependency beetwen libevince-dev and gir1.2-evince-3.0.
   * Exclude /usr/lib/nautilus/ and /usr/lib/evince/ from dh_makeshlibs.
+  * debian/patches/01_poppler-0.16-compat.patch: Keep evince compiling against
+    0.16 so we don't require 0.18. Thanks Pino Toscano for the patch.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 08 Mar 2012 16:18:06 +0100
 

Added: desktop/experimental/evince/debian/patches/01_poppler-0.16-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/patches/01_poppler-0.16-compat.patch?rev=32874&op=file
==============================================================================
--- desktop/experimental/evince/debian/patches/01_poppler-0.16-compat.patch (added)
+++ desktop/experimental/evince/debian/patches/01_poppler-0.16-compat.patch [utf-8] Thu Mar  8 15:22:08 2012
@@ -1,0 +1,31 @@
+Description: Make evince compile against poppler 0.16
+Author: Pino Toscano <pino at debian.org>
+Index: evince-3.3.90/configure.ac
+===================================================================
+--- evince-3.3.90.orig/configure.ac	2012-03-08 13:47:49.657097584 +0100
++++ evince-3.3.90/configure.ac	2012-03-08 13:47:51.641097514 +0100
+@@ -485,7 +485,7 @@
+   [enable_pdf=yes])
+ 
+ if test "x$enable_pdf" = "xyes"; then
+-    POPPLER_REQUIRED=0.18.0
++    POPPLER_REQUIRED=0.16.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
+Index: evince-3.3.90/backend/pdf/ev-poppler.cc
+===================================================================
+--- evince-3.3.90.orig/backend/pdf/ev-poppler.cc	2012-03-08 13:47:49.657097584 +0100
++++ evince-3.3.90/backend/pdf/ev-poppler.cc	2012-03-08 13:48:22.821096411 +0100
+@@ -1234,9 +1234,11 @@
+ 
+ 		}
+ 			break;
++#if POPPLER_CHECK_VERSION(0, 18, 0)
+ 	        case POPPLER_ACTION_JAVASCRIPT:
+ 			unimplemented_action = "POPPLER_ACTION_JAVASCRIPT";
+ 			break;
++#endif
+ 	        case POPPLER_ACTION_UNKNOWN:
+ 			unimplemented_action = "POPPLER_ACTION_UNKNOWN";
+ 	}

Modified: desktop/experimental/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/patches/series?rev=32874&op=diff
==============================================================================
--- desktop/experimental/evince/debian/patches/series [utf-8] (original)
+++ desktop/experimental/evince/debian/patches/series [utf-8] Thu Mar  8 15:22:08 2012
@@ -1,2 +1,2 @@
-#02-link-missing-zlib-library.patch
+01_poppler-0.16-compat.patch
 03_nodisplay.patch