r36955 - in /desktop/experimental/gdk-pixbuf/debian: changelog patches/0001-animation-Allow-prepare_func-call-in-stop_load.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Mar 14 21:17:22 2013
New Revision: 36955

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36955
Log:
* d/p/0001-animation-Allow-prepare_func-call-in-stop_load.patch:
  + Backport patch from upstream GIT, fixes a crash with animations.
    Closes: #702780, #702517.

Added:
    desktop/experimental/gdk-pixbuf/debian/patches/0001-animation-Allow-prepare_func-call-in-stop_load.patch
Modified:
    desktop/experimental/gdk-pixbuf/debian/changelog
    desktop/experimental/gdk-pixbuf/debian/patches/series

Modified: desktop/experimental/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/changelog?rev=36955&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/changelog [utf-8] Thu Mar 14 21:17:22 2013
@@ -1,3 +1,11 @@
+gdk-pixbuf (2.27.2-2) UNRELEASED; urgency=low
+
+  * d/p/0001-animation-Allow-prepare_func-call-in-stop_load.patch:
+    + Backport patch from upstream GIT, fixes a crash with animations.
+      Closes: #702780, #702517.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 14 Mar 2013 22:15:07 +0100
+
 gdk-pixbuf (2.27.2-1) experimental; urgency=low
 
   [ Martin Pitt ]

Added: desktop/experimental/gdk-pixbuf/debian/patches/0001-animation-Allow-prepare_func-call-in-stop_load.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/patches/0001-animation-Allow-prepare_func-call-in-stop_load.patch?rev=36955&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/patches/0001-animation-Allow-prepare_func-call-in-stop_load.patch (added)
+++ desktop/experimental/gdk-pixbuf/debian/patches/0001-animation-Allow-prepare_func-call-in-stop_load.patch [utf-8] Thu Mar 14 21:17:22 2013
@@ -1,0 +1,47 @@
+From ff7e0f385b4c3f63b43b474a0a43e975c1881ebb Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Tue, 12 Mar 2013 21:41:34 +0100
+Subject: [PATCH] animation: Allow prepare_func call in stop_load
+
+Move the assertion that prepare_func was called after the stop_load
+call. Makes the XPM loader not die.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=695228
+---
+ gdk-pixbuf/gdk-pixbuf-animation.c |   13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/gdk-pixbuf/gdk-pixbuf-animation.c b/gdk-pixbuf/gdk-pixbuf-animation.c
+index e39a592..911bf41 100644
+--- a/gdk-pixbuf/gdk-pixbuf-animation.c
++++ b/gdk-pixbuf/gdk-pixbuf-animation.c
+@@ -238,8 +238,6 @@ gdk_pixbuf_animation_new_from_file (const char *filename,
+                         }
+                 }
+ 
+-                /* If there was no error, there must be an animation that was successfully loaded */
+-                g_assert (animation);
+                 success = TRUE;
+ 
+ fail_load_increment:
+@@ -249,9 +247,14 @@ fail_load_increment:
+ fail_begin_load:
+ 		fclose (f);
+ 
+-                if (!success && animation) {
+-                        g_object_unref (animation);
+-                        animation = NULL;
++                if (success) {
++                        /* If there was no error, there must be an animation that was successfully loaded */
++                        g_assert (animation);
++                } else {
++                        if (animation) {
++                                g_object_unref (animation);
++                                animation = NULL;
++                        }
+                 }
+ 	} else {
+ 		GdkPixbuf *pixbuf;
+-- 
+1.7.10.4
+

Modified: desktop/experimental/gdk-pixbuf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/patches/series?rev=36955&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/patches/series [utf-8] Thu Mar 14 21:17:22 2013
@@ -1,0 +1,1 @@
+0001-animation-Allow-prepare_func-call-in-stop_load.patch