r28046 - in /desktop/unstable/evince/debian: changelog patches/06_new_poppler_api_update.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed May 25 01:16:15 2011
New Revision: 28046

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28046
Log:
* debian/patches/06_new_poppler_api_update.patch
  - Update pdf_document_get_info to new poppler API. Patch cherry-picked
    from upstream Git.

Added:
    desktop/unstable/evince/debian/patches/06_new_poppler_api_update.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=28046&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog [utf-8] (original)
+++ desktop/unstable/evince/debian/changelog [utf-8] Wed May 25 01:16:15 2011
@@ -14,6 +14,9 @@
   * Update libevince for soname bump from 2 → 3.
   * debian/evince-common.install:
     - Install gsettings schemas and gconf conversion script.
+  * debian/patches/06_new_poppler_api_update.patch
+    - Update pdf_document_get_info to new poppler API. Patch cherry-picked
+      from upstream Git.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 24 May 2011 11:40:44 +0200
 

Added: desktop/unstable/evince/debian/patches/06_new_poppler_api_update.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/06_new_poppler_api_update.patch?rev=28046&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/06_new_poppler_api_update.patch (added)
+++ desktop/unstable/evince/debian/patches/06_new_poppler_api_update.patch [utf-8] Wed May 25 01:16:15 2011
@@ -1,0 +1,54 @@
+Description: Update to poppler api changes
+ Linearized PopplerDocument property is now boolean rather than string.
+Author: Carlos Garcia Campos <carlosgc at gnome.org>
+Origin: http://git.gnome.org/browse/evince/commit/?id=f77e6cf4fd7fef49ac91d8c62b6a9a993529adb8
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=638312
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/708404
+
+--- evince-2.32.0.orig/configure.ac
++++ evince-2.32.0/configure.ac
+@@ -505,6 +505,7 @@ if test "x$enable_pdf" = "xyes"; then
+ 	    AC_CHECK_FUNCS(poppler_page_get_text_layout)
+ 	    AC_CHECK_FUNCS(poppler_page_get_selected_text)
+ 	    AC_CHECK_FUNCS(poppler_page_add_annot)
++	    AC_CHECK_FUNCS(poppler_document_is_linearized)
+ 	    LIBS=$evince_save_LIBS
+ 	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
+ 	    if test x$enable_cairo_pdf = xyes; then
+--- evince-2.32.0.orig/backend/pdf/ev-poppler.cc
++++ evince-2.32.0/backend/pdf/ev-poppler.cc
+@@ -640,7 +640,9 @@ pdf_document_get_info (EvDocument *docum
+ 	PopplerPermissions permissions;
+ 	EvPage *page;
+ 	char *metadata;
+-
++#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
++gboolean linearized;
++#endif
+ 	info = g_new0 (EvDocumentInfo, 1);
+ 
+ 	info->fields_mask = EV_DOCUMENT_INFO_TITLE |
+@@ -676,7 +678,11 @@ pdf_document_get_info (EvDocument *docum
+ 		      "producer", &(info->producer),
+ 		      "creation-date", &(info->creation_date),
+ 		      "mod-date", &(info->modified_date),
++#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
++                      "linearized", &linearized,
++#else
+ 		      "linearized", &(info->linearized),
++#endif
+ 		      "metadata", &metadata,
+ 		      NULL);
+ 
+@@ -782,6 +788,11 @@ pdf_document_get_info (EvDocument *docum
+ 		info->security = g_strdup (_("No"));
+ 	}
+ 
++#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
++	info->linearized = linearized ? g_strdup (_("Yes")) : g_strdup (_("No"));
++#endif
++
++
+ 	return info;
+ }
+ 

Modified: desktop/unstable/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/series?rev=28046&op=diff
==============================================================================
--- desktop/unstable/evince/debian/patches/series [utf-8] (original)
+++ desktop/unstable/evince/debian/patches/series [utf-8] Wed May 25 01:16:15 2011
@@ -1,3 +1,4 @@
 01_dvi_security.patch
 02_link_ice.patch
 03_dvi_security_CVE-2010-0433.patch
+06_new_poppler_api_update.patch