r39904 - in /desktop/unstable/evince/debian: changelog control.in libevdocument3-4.symbols libevview3-3.symbols patches/01-poppler-0.18-compat.patch patches/revert-poppler-0.23.3.patch patches/revert-poppler-0.24.patch patches/series

ah at users.alioth.debian.org ah at users.alioth.debian.org
Tue Oct 15 19:01:44 UTC 2013 

Author: ah
Date: Tue Oct 15 19:01:42 2013
New Revision: 39904

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39904
Log:
* New upstream release.
* Bump build-dependencies according to configure.ac (except poppler):
  - libgtk-3-dev to >= 3.8.0
  - libglib2.0-dev to >= 2.36
* Add patches to revert more poppler version bumps:
  - debian/patches/revert-poppler-0.24.patch
  - debian/patches/revert-poppler-0.23.3.patch
* Refresh debian/patches/01-poppler-0.18-compat.patch while at it.
* Update debian/libevdocument3-4.symbols with one added symbol
* Update debian/libevview3-3.symbols
  - several additions and one removal: ev_view_selection_mode_get_type
  - dropped symbol used (or wrapped atleast) in gnome-python-desktop
  - Noone else seems to have noticed, so I'll just stick my head
    in the sand for now and hope this doesn't cause any issues.

Added:
    desktop/unstable/evince/debian/patches/revert-poppler-0.23.3.patch
    desktop/unstable/evince/debian/patches/revert-poppler-0.24.patch
Modified:
    desktop/unstable/evince/debian/changelog
    desktop/unstable/evince/debian/control.in
    desktop/unstable/evince/debian/libevdocument3-4.symbols
    desktop/unstable/evince/debian/libevview3-3.symbols
    desktop/unstable/evince/debian/patches/01-poppler-0.18-compat.patch
    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=39904&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog	[utf-8] (original)
+++ desktop/unstable/evince/debian/changelog	[utf-8] Tue Oct 15 19:01:42 2013
@@ -1,3 +1,22 @@
+evince (3.10.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Bump build-dependencies according to configure.ac (except poppler):
+    - libgtk-3-dev to >= 3.8.0
+    - libglib2.0-dev to >= 2.36
+  * Add patches to revert more poppler version bumps:
+    - debian/patches/revert-poppler-0.24.patch
+    - debian/patches/revert-poppler-0.23.3.patch
+  * Refresh debian/patches/01-poppler-0.18-compat.patch while at it.
+  * Update debian/libevdocument3-4.symbols with one added symbol
+  * Update debian/libevview3-3.symbols
+    - several additions and one removal: ev_view_selection_mode_get_type
+    - dropped symbol used (or wrapped atleast) in gnome-python-desktop
+    - Noone else seems to have noticed, so I'll just stick my head
+      in the sand for now and hope this doesn't cause any issues.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 15 Oct 2013 13:11:57 +0200
+
 evince (3.8.3-2) unstable; urgency=low
 
   * Depend on gnome-icon-theme-symbolic for the symbolic icons used in the

Modified: desktop/unstable/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control.in?rev=39904&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in	[utf-8] (original)
+++ desktop/unstable/evince/debian/control.in	[utf-8] Tue Oct 15 19:01:42 2013
@@ -13,9 +13,9 @@
                gtk-doc-tools (>= 1.0),
                libx11-dev,
                libcairo2-dev (>= 1.10.0),
-               libgtk-3-dev (>= 3.7.5),
+               libgtk-3-dev (>= 3.8.0),
                libgail-3-dev (>= 3.0.2),
-               libglib2.0-dev (>= 2.34),
+               libglib2.0-dev (>= 2.36),
                libsecret-1-dev (>= 0.5),
                gnome-icon-theme (>= 2.17.1),
                libxml2-dev (>= 2.5.0),

Modified: desktop/unstable/evince/debian/libevdocument3-4.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/libevdocument3-4.symbols?rev=39904&op=diff
==============================================================================
--- desktop/unstable/evince/debian/libevdocument3-4.symbols	[utf-8] (original)
+++ desktop/unstable/evince/debian/libevdocument3-4.symbols	[utf-8] Tue Oct 15 19:01:42 2013
@@ -180,6 +180,7 @@
  ev_document_synctex_backward_search at Base 3.0.2
  ev_document_synctex_forward_search at Base 3.0.2
  ev_document_text_get_text at Base 3.0.2
+ ev_document_text_get_text_attrs at Base 3.10.0
  ev_document_text_get_text_layout at Base 3.0.2
  ev_document_text_get_text_mapping at Base 3.0.2
  ev_document_text_get_type at Base 3.0.2

Modified: desktop/unstable/evince/debian/libevview3-3.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/libevview3-3.symbols?rev=39904&op=diff
==============================================================================
--- desktop/unstable/evince/debian/libevview3-3.symbols	[utf-8] (original)
+++ desktop/unstable/evince/debian/libevview3-3.symbols	[utf-8] Tue Oct 15 19:01:42 2013
@@ -112,7 +112,9 @@
  ev_page_cache_get_image_mapping at Base 3.0.2
  ev_page_cache_get_link_mapping at Base 3.0.2
  ev_page_cache_get_text at Base 3.0.2
+ ev_page_cache_get_text_attrs at Base 3.10.0
  ev_page_cache_get_text_layout at Base 3.0.2
+ ev_page_cache_get_text_log_attrs at Base 3.10.0
  ev_page_cache_get_text_mapping at Base 3.0.2
  ev_page_cache_get_type at Base 3.0.2
  ev_page_cache_mark_dirty at Base 3.0.2
@@ -122,6 +124,7 @@
  ev_page_layout_get_type at Base 3.7.90
  ev_pixbuf_cache_clear at Base 3.0.2
  ev_pixbuf_cache_get_selection_list at Base 3.0.2
+ ev_pixbuf_cache_get_selection_region at Base 3.10.0
  ev_pixbuf_cache_get_selection_surface at Base 3.0.2
  ev_pixbuf_cache_get_surface at Base 3.0.2
  ev_pixbuf_cache_get_type at Base 3.0.2
@@ -174,6 +177,7 @@
  ev_transition_animation_set_origin_surface at Base 3.0.2
  ev_view_accessible_get_type at Base 3.7.90
  ev_view_accessible_new at Base 3.7.90
+ ev_view_accessible_set_model at Base 3.10.0
  ev_view_autoscroll_start at Base 3.0.2
  ev_view_autoscroll_stop at Base 3.0.2
  ev_view_begin_add_annotation at Base 3.0.2
@@ -189,6 +193,7 @@
  ev_view_find_previous at Base 3.0.2
  ev_view_find_search_changed at Base 3.0.2
  ev_view_find_set_highlight_search at Base 3.0.2
+ ev_view_find_set_result at Base 3.10.0
  ev_view_find_started at Base 3.5.92
  ev_view_focus_annotation at Base 3.0.2
  ev_view_get_has_selection at Base 3.0.2
@@ -197,6 +202,7 @@
  ev_view_handle_link at Base 3.0.2
  ev_view_hide_cursor at Base 3.0.2
  ev_view_highlight_forward_search at Base 3.0.2
+ ev_view_is_caret_navigation_enabled at Base 3.10.0
  ev_view_is_loading at Base 3.7.90
  ev_view_new at Base 3.0.2
  ev_view_next_page at Base 3.0.2
@@ -211,10 +217,13 @@
  ev_view_reload at Base 3.0.2
  ev_view_scroll at Base 3.0.2
  ev_view_select_all at Base 3.0.2
- ev_view_selection_mode_get_type at Base 3.0.2
+#MISSING: 3.10.0# ev_view_selection_mode_get_type at Base 3.0.2
+ ev_view_set_caret_cursor_position at Base 3.10.0
+ ev_view_set_caret_navigation_enabled at Base 3.10.0
  ev_view_set_loading at Base 3.0.2
  ev_view_set_model at Base 3.0.2
  ev_view_set_page_cache_size at Base 3.0.2
  ev_view_show_cursor at Base 3.0.2
+ ev_view_supports_caret_navigation at Base 3.10.0
  ev_view_zoom_in at Base 3.0.2
  ev_view_zoom_out at Base 3.0.2

Modified: 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=39904&op=diff
==============================================================================
--- desktop/unstable/evince/debian/patches/01-poppler-0.18-compat.patch	[utf-8] (original)
+++ desktop/unstable/evince/debian/patches/01-poppler-0.18-compat.patch	[utf-8] Tue Oct 15 19:01:42 2013
@@ -3,11 +3,9 @@
  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,
+@@ -1115,10 +1115,10 @@
  		const char *type_str;
  		const char *embedded;
  		const char *standard_str = "";
@@ -20,7 +18,7 @@
  		const gchar *encoding_text;
  		char *details;
  		
-@@ -1128,7 +1128,9 @@ pdf_document_fonts_fill_model (EvDocumentFonts *document_fonts,
+@@ -1128,7 +1128,9 @@
  			name = _("No name");
  		}
  
@@ -30,7 +28,7 @@
  		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,
+@@ -1165,7 +1167,9 @@
  			}
  		}
  
@@ -40,11 +38,9 @@
  		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],
+@@ -474,7 +474,7 @@
    [enable_pdf=yes])
  
  if test "x$enable_pdf" = "xyes"; then

Added: desktop/unstable/evince/debian/patches/revert-poppler-0.23.3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/revert-poppler-0.23.3.patch?rev=39904&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/revert-poppler-0.23.3.patch	(added)
+++ desktop/unstable/evince/debian/patches/revert-poppler-0.23.3.patch	[utf-8] Tue Oct 15 19:01:42 2013
@@ -0,0 +1,109 @@
+--- a/backend/pdf/ev-poppler.cc
++++ b/backend/pdf/ev-poppler.cc
+@@ -281,6 +281,7 @@
+ 	return TRUE;
+ }
+ 
++#ifdef HAVE_POPPLER_DOCUMENT_NEW_FROM_STREAM
+ static gboolean
+ pdf_document_load_stream (EvDocument          *document,
+                           GInputStream        *stream,
+@@ -304,7 +305,9 @@
+ 
+         return TRUE;
+ }
++#endif
+ 
++#ifdef HAVE_POPPLER_DOCUMENT_NEW_FROM_GFILE
+ static gboolean
+ pdf_document_load_gfile (EvDocument          *document,
+                          GFile               *file,
+@@ -328,6 +331,7 @@
+ 
+         return TRUE;
+ }
++#endif
+ 
+ static int
+ pdf_document_get_n_pages (EvDocument *document)
+@@ -936,8 +940,12 @@
+ 
+ 	ev_document_class->save = pdf_document_save;
+ 	ev_document_class->load = pdf_document_load;
++#ifdef HAVE_POPPLER_DOCUMENT_NEW_FROM_STREAM
+         ev_document_class->load_stream = pdf_document_load_stream;
++#endif
++#ifdef HAVE_POPPLER_DOCUMENT_NEW_FROM_GFILE
+         ev_document_class->load_gfile = pdf_document_load_gfile;
++#endif
+ 	ev_document_class->get_n_pages = pdf_document_get_n_pages;
+ 	ev_document_class->get_page = pdf_document_get_page;
+ 	ev_document_class->get_page_size = pdf_document_get_page_size;
+@@ -1639,18 +1647,24 @@
+ 	PopplerPage *poppler_page;
+ 	gdouble height;
+ 	GList *retval = NULL;
++#ifdef HAVE_POPPLER_PAGE_FIND_TEXT_WITH_OPTIONS
+ 	guint find_flags = 0;
++#endif
+ 
+ 	g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);
+ 	g_return_val_if_fail (text != NULL, NULL);
+ 
+ 	poppler_page = POPPLER_PAGE (page->backend_page);
+ 
++#ifdef HAVE_POPPLER_PAGE_FIND_TEXT_WITH_OPTIONS
+ 	if (options & EV_FIND_CASE_SENSITIVE)
+ 		find_flags |= POPPLER_FIND_CASE_SENSITIVE;
+ 	if (options & EV_FIND_WHOLE_WORDS_ONLY)
+ 		find_flags |= POPPLER_FIND_WHOLE_WORDS_ONLY;
+ 	matches = poppler_page_find_text_with_options (poppler_page, text, (PopplerFindFlags)find_flags);
++#else
++	matches = poppler_page_find_text (poppler_page, text);
++#endif
+ 	if (!matches)
+ 		return NULL;
+ 
+@@ -1692,14 +1706,20 @@
+ static EvFindOptions
+ pdf_document_find_get_supported_options (EvDocumentFind *document_find)
+ {
++#ifdef HAVE_POPPLER_PAGE_FIND_TEXT_WITH_OPTIONS
+ 	return (EvFindOptions)(EV_FIND_CASE_SENSITIVE | EV_FIND_WHOLE_WORDS_ONLY);
++#else
++	return EV_FIND_DEFAULT;
++#endif
+ }
+ 
+ static void
+ pdf_document_find_iface_init (EvDocumentFindInterface *iface)
+ {
+         iface->find_text = pdf_document_find_find_text;
++#ifdef HAVE_POPPLER_PAGE_FIND_TEXT_WITH_OPTIONS
+ 	iface->find_text_with_options = pdf_document_find_find_text_with_options;
++#endif
+ 	iface->get_supported_options = pdf_document_find_get_supported_options;
+ }
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -474,7 +474,7 @@
+   [enable_pdf=yes])
+ 
+ if test "x$enable_pdf" = "xyes"; then
+-    POPPLER_REQUIRED=0.23.3
++    POPPLER_REQUIRED=0.20.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
+@@ -490,6 +490,10 @@
+     else
+ 	    AC_MSG_ERROR("PDF support is disabled since poppler-glib library version $POPPLER_REQUIRED or newer not found")
+     fi 
++    evince_save_LIBS=$LIBS
++    LIBS="$LIBS $POPPLER_LIBS"
++    AC_CHECK_FUNCS(poppler_document_new_from_stream poppler_document_new_from_gfile poppler_page_find_text_with_options)
++    LIBS=$evince_save_LIBS
+ fi
+ 
+ AM_CONDITIONAL(ENABLE_PDF, test x$enable_pdf = xyes)

Added: desktop/unstable/evince/debian/patches/revert-poppler-0.24.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/revert-poppler-0.24.patch?rev=39904&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/revert-poppler-0.24.patch	(added)
+++ desktop/unstable/evince/debian/patches/revert-poppler-0.24.patch	[utf-8] Tue Oct 15 19:01:42 2013
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -474,7 +474,7 @@
+   [enable_pdf=yes])
+ 
+ if test "x$enable_pdf" = "xyes"; then
+-    POPPLER_REQUIRED=0.24.0
++    POPPLER_REQUIRED=0.23.3
+     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=39904&op=diff
==============================================================================
--- desktop/unstable/evince/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/evince/debian/patches/series	[utf-8] Tue Oct 15 19:01:42 2013
@@ -1 +1,3 @@
+revert-poppler-0.24.patch
+revert-poppler-0.23.3.patch
 01-poppler-0.18-compat.patch

More information about the pkg-gnome-commits mailing list