r43275 - in /desktop/unstable/evince/debian: changelog patches/git_keep-ref-on-doc.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Sun Sep 28 09:44:20 2014
New Revision: 43275

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43275
Log:
* Add debian/patches/git_keep-ref-on-doc.patch (Closes: #763138)
  - from upstream git, fixes reference counting and thus crashes.

Added:
    desktop/unstable/evince/debian/patches/git_keep-ref-on-doc.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=43275&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog	[utf-8] (original)
+++ desktop/unstable/evince/debian/changelog	[utf-8] Sun Sep 28 09:44:20 2014
@@ -1,3 +1,10 @@
+evince (3.14.0-2) unstable; urgency=medium
+
+  * Add debian/patches/git_keep-ref-on-doc.patch (Closes: #763138)
+    - from upstream git, fixes reference counting and thus crashes.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sun, 28 Sep 2014 11:38:11 +0200
+
 evince (3.14.0-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/evince/debian/patches/git_keep-ref-on-doc.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/git_keep-ref-on-doc.patch?rev=43275&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/git_keep-ref-on-doc.patch	(added)
+++ desktop/unstable/evince/debian/patches/git_keep-ref-on-doc.patch	[utf-8] Sun Sep 28 09:44:20 2014
@@ -0,0 +1,52 @@
+From 0aafd8809a5464aef05e73c33e501cea0b413059 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc at gnome.org>
+Date: Sat, 27 Sep 2014 12:29:48 +0200
+Subject: window-title: Keep a weak ref on the document
+
+To cleanup the pointer and doc_title when the document is destroyed.
+Fixes a crash when a new document is added to the window.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=737365
+
+diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c
+index b442717..c09da93 100644
+--- a/shell/ev-window-title.c
++++ b/shell/ev-window-title.c
+@@ -190,6 +190,14 @@ ev_window_title_set_type (EvWindowTitle *window_title, EvWindowTitleType type)
+ 	ev_window_title_update (window_title);
+ }
+ 
++static void
++document_destroyed_cb (EvWindowTitle *window_title,
++                       GObject       *document)
++{
++        window_title->document = NULL;
++        g_clear_pointer (&window_title->doc_title, g_free);
++}
++
+ void
+ ev_window_title_set_document (EvWindowTitle *window_title,
+ 			      EvDocument    *document)
+@@ -197,7 +205,10 @@ ev_window_title_set_document (EvWindowTitle *window_title,
+         if (window_title->document == document)
+                 return;
+ 
++        if (window_title->document)
++                g_object_weak_unref (G_OBJECT (window_title->document), (GWeakNotify)document_destroyed_cb, window_title);
+ 	window_title->document = document;
++        g_object_weak_ref (G_OBJECT (window_title->document), (GWeakNotify)document_destroyed_cb, window_title);
+         g_clear_pointer (&window_title->doc_title, g_free);
+ 
+ 	if (window_title->document != NULL) {
+@@ -237,6 +248,8 @@ ev_window_title_set_uri (EvWindowTitle *window_title,
+ void
+ ev_window_title_free (EvWindowTitle *window_title)
+ {
++        if (window_title->document)
++                g_object_weak_unref (G_OBJECT (window_title->document), (GWeakNotify)document_destroyed_cb, window_title);
+         g_free (window_title->doc_title);
+ 	g_free (window_title->uri);
+ 	g_free (window_title);
+-- 
+cgit v0.10.1
+

Modified: desktop/unstable/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/series?rev=43275&op=diff
==============================================================================
--- desktop/unstable/evince/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/evince/debian/patches/series	[utf-8] Sun Sep 28 09:44:20 2014
@@ -1,3 +1,4 @@
 revert-poppler-0.24.patch
 revert-poppler-0.23.3.patch
 01-poppler-0.18-compat.patch
+git_keep-ref-on-doc.patch