r48886 - in /desktop/jessie/evince/debian: changelog patches/check-load-job-success.patch patches/reload-page-count.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue May 24 22:19:41 2016
New Revision: 48886

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48886
Log:
* Add reload-page-count.patch.  Fix crash when document has pages removed and
  is reloaded.  Update the end page index when the document is reloaded.
  (Closes: #805276)
* Add check-load-job-success.patch.  Fix crash in recent documents view when
  a recent document fails to load.  Check whether a document's load job
  failed before creating it's thumbnail.  (Closes: #762719)

Added:
    desktop/jessie/evince/debian/patches/check-load-job-success.patch
    desktop/jessie/evince/debian/patches/reload-page-count.patch
Modified:
    desktop/jessie/evince/debian/changelog
    desktop/jessie/evince/debian/patches/series

Modified: desktop/jessie/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/jessie/evince/debian/changelog?rev=48886&op=diff
==============================================================================
--- desktop/jessie/evince/debian/changelog	[utf-8] (original)
+++ desktop/jessie/evince/debian/changelog	[utf-8] Tue May 24 22:19:41 2016
@@ -1,3 +1,15 @@
+evince (3.14.1-2+deb8u1) stable; urgency=medium
+
+  [ Jason Crain ]
+  * Add reload-page-count.patch.  Fix crash when document has pages removed and
+    is reloaded.  Update the end page index when the document is reloaded.
+    (Closes: #805276)
+  * Add check-load-job-success.patch.  Fix crash in recent documents view when
+    a recent document fails to load.  Check whether a document's load job
+    failed before creating it's thumbnail.  (Closes: #762719)
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 25 May 2016 00:19:23 +0200
+
 evince (3.14.1-2) unstable; urgency=medium
 
   * Team upload.

Added: desktop/jessie/evince/debian/patches/check-load-job-success.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/jessie/evince/debian/patches/check-load-job-success.patch?rev=48886&op=file
==============================================================================
--- desktop/jessie/evince/debian/patches/check-load-job-success.patch	(added)
+++ desktop/jessie/evince/debian/patches/check-load-job-success.patch	[utf-8] Tue May 24 22:19:41 2016
@@ -0,0 +1,23 @@
+Description: Check whether load job succeeded
+ Check whether document load job succeeded before creating it's thumbnail.
+ This fixes a crash in the recent documents view when a document fails to load.
+Origin: upstream, https://git.gnome.org/browse/evince/commit/?id=921211ea2dfcff79df172e39a380074883e2b1a2
+Author: Marek Kasik <mkasik at redhat.com>
+Bug: https://bugzilla.gnome.org/744049
+Bug-Debian: https://bugs.debian.org/762719
+Last-Update: 2016-05-19
+
+Index: evince-3.14.1/shell/ev-recent-view.c
+===================================================================
+--- evince-3.14.1.orig/shell/ev-recent-view.c
++++ evince-3.14.1/shell/ev-recent-view.c
+@@ -366,7 +366,8 @@ document_load_job_completed_callback (Ev
+         EvRecentViewPrivate *priv = data->ev_recent_view->priv;
+         EvDocument          *document = EV_JOB (job_load)->document;
+ 
+-        if (g_cancellable_is_cancelled (data->cancellable) || !document) {
++        if (g_cancellable_is_cancelled (data->cancellable) ||
++            ev_job_is_failed (EV_JOB (job_load))) {
+                 get_document_info_async_data_free (data);
+                 return;
+         }

Added: desktop/jessie/evince/debian/patches/reload-page-count.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/jessie/evince/debian/patches/reload-page-count.patch?rev=48886&op=file
==============================================================================
--- desktop/jessie/evince/debian/patches/reload-page-count.patch	(added)
+++ desktop/jessie/evince/debian/patches/reload-page-count.patch	[utf-8] Tue May 24 22:19:41 2016
@@ -0,0 +1,29 @@
+Description: Check legal boundaries of accessable pages
+ Keep the accessible view end page under the limits of the document.  Sometimes
+ when a document is reloaded, it may have fewer pages making the end page
+ higher than the actual number of pages.
+Origin: backport, https://git.gnome.org/browse/evince/commit/?id=e6e0d29d9fed63599e736003f06428a1aea87121
+Author: Germ�n Poo-Caama�o <gpoo at gnome.org>
+Bug: https://bugzilla.gnome.org/735744
+Bug-Debian: https://bugs.debian.org/805276
+Last-Update: 2016-05-17
+
+Index: evince-3.14.1/libview/ev-view-accessible.c
+===================================================================
+--- evince-3.14.1.orig/libview/ev-view-accessible.c
++++ evince-3.14.1/libview/ev-view-accessible.c
+@@ -389,6 +389,14 @@ initialize_children (EvViewAccessible *s
+ 		child = ev_page_accessible_new (self, i);
+ 		g_ptr_array_add (self->priv->children, child);
+ 	}
++
++        /* When a document is reloaded, it may have less pages.
++         * We need to update the end page accordingly to avoid
++         * invalid access to self->priv->children
++         * See https://bugzilla.gnome.org/show_bug.cgi?id=735744
++         */
++	if (self->priv->end_page >= n_pages)
++		self->priv->end_page = n_pages - 1;
+ }
+ 
+ static void

Modified: desktop/jessie/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/jessie/evince/debian/patches/series?rev=48886&op=diff
==============================================================================
--- desktop/jessie/evince/debian/patches/series	[utf-8] (original)
+++ desktop/jessie/evince/debian/patches/series	[utf-8] Tue May 24 22:19:41 2016
@@ -1 +1,3 @@
 revert-69b474fce1.patch
+reload-page-count.patch
+check-load-job-success.patch