[Pkg-xfce-commits] r3850 - in goodies/trunk/ristretto/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-02-08 21:31:52 +0000 (Mon, 08 Feb 2010)
New Revision: 3850

Added:
   goodies/trunk/ristretto/debian/patches/
   goodies/trunk/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch
Modified:
   goodies/trunk/ristretto/debian/changelog
   goodies/trunk/ristretto/debian/rules
Log:
* debian/patches/01_fix-segfault-with-gif-images.patch: copy pixbuf before
  using them, should fix unref & segfault issues with GIF files.
* debian/rules: include simple-patchsys.mk.

Modified: goodies/trunk/ristretto/debian/changelog
===================================================================
--- goodies/trunk/ristretto/debian/changelog	2010-02-08 10:26:05 UTC (rev 3849)
+++ goodies/trunk/ristretto/debian/changelog	2010-02-08 21:31:52 UTC (rev 3850)
@@ -12,8 +12,13 @@
   * debian/rules:
     - Don't call dh_desktop (deprecated)
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 08 Sep 2009 02:53:16 +0200
+  [ Lionel Le Folgoc ]
+  * debian/patches/01_fix-segfault-with-gif-images.patch: copy pixbuf before
+    using them, should fix unref & segfault issues with GIF files.
+  * debian/rules: include simple-patchsys.mk.
 
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 08 Feb 2010 22:29:46 +0100
+
 ristretto (0.0.22-1) unstable; urgency=low
 
   * New upstream release.

Added: goodies/trunk/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch
===================================================================
--- goodies/trunk/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch	                        (rev 0)
+++ goodies/trunk/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch	2010-02-08 21:31:52 UTC (rev 3850)
@@ -0,0 +1,20 @@
+--- ristretto-0.0.22.orig/src/navigator.c
++++ ristretto-0.0.22/src/navigator.c
+@@ -1308,7 +1308,7 @@
+ 
+     if (entry->iter)
+     {
+-        pixbuf = gdk_pixbuf_animation_iter_get_pixbuf(entry->iter);
++        pixbuf = gdk_pixbuf_copy (gdk_pixbuf_animation_iter_get_pixbuf(entry->iter));
+     }
+     else
+     {
+@@ -1364,7 +1364,7 @@
+                 gdk_pixbuf_unref(entry->src_pixbuf);
+                 entry->src_pixbuf = NULL;
+             }
+-            entry->src_pixbuf = gdk_pixbuf_animation_iter_get_pixbuf(entry->iter);
++            entry->src_pixbuf = gdk_pixbuf_copy (gdk_pixbuf_animation_iter_get_pixbuf(entry->iter));
+             src_pixbuf = entry->src_pixbuf;
+ 
+             if (src_pixbuf)

Modified: goodies/trunk/ristretto/debian/rules
===================================================================
--- goodies/trunk/ristretto/debian/rules	2010-02-08 10:26:05 UTC (rev 3849)
+++ goodies/trunk/ristretto/debian/rules	2010-02-08 21:31:52 UTC (rev 3850)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_INSTALL_MANPAGES_ristretto := debian/ristretto.1
 LDFLAGS +=-Wl,-z,-defs -Wl,--as-needed