r29538 - in /desktop/experimental/pygobject/debian: changelog patches/revert-refcount-fix.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Aug 30 06:28:59 2011
New Revision: 29538

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29538
Log:
Add revert-refcount-fix.patch: Revert
http://git.gnome.org/browse/pygobject/commit/?id=7bc4122897 as a
workaround for segfaults when creating custom widgets through the GObject
constructor (such as through GtkBuilder). This works around
https://bugzilla.gnome.org/show_bug.cgi?id=657403. This patch was reverted
in the 2-28 branch as well, so reverting it here is no regression from
2.28. (LP: #834168)

Added:
    desktop/experimental/pygobject/debian/patches/revert-refcount-fix.patch
Modified:
    desktop/experimental/pygobject/debian/changelog
    desktop/experimental/pygobject/debian/patches/series

Modified: desktop/experimental/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/changelog?rev=29538&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/changelog [utf-8] (original)
+++ desktop/experimental/pygobject/debian/changelog [utf-8] Tue Aug 30 06:28:59 2011
@@ -1,3 +1,15 @@
+pygobject (2.90.2-2) UNRELEASED; urgency=low
+
+  * Add revert-refcount-fix.patch: Revert
+    http://git.gnome.org/browse/pygobject/commit/?id=7bc4122897 as a
+    workaround for segfaults when creating custom widgets through the GObject
+    constructor (such as through GtkBuilder). This works around
+    https://bugzilla.gnome.org/show_bug.cgi?id=657403. This patch was reverted
+    in the 2-28 branch as well, so reverting it here is no regression from
+    2.28. (LP: #834168)
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 30 Aug 2011 08:23:22 +0200
+
 pygobject (2.90.2-1) experimental; urgency=low
 
   * New upstream bug fix release.

Added: desktop/experimental/pygobject/debian/patches/revert-refcount-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/patches/revert-refcount-fix.patch?rev=29538&op=file
==============================================================================
--- desktop/experimental/pygobject/debian/patches/revert-refcount-fix.patch (added)
+++ desktop/experimental/pygobject/debian/patches/revert-refcount-fix.patch [utf-8] Tue Aug 30 06:28:59 2011
@@ -1,0 +1,19 @@
+Description: Revert http://git.gnome.org/browse/pygobject/commit/?id=7bc4122897
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=657403
+Bug-Ubuntu: https://launchpad.net/bugs/834168
+
+diff --git a/gi/_gobject/pygobject.c b/gi/_gobject/pygobject.c
+index 56b9aef..0d089f9 100644
+--- a/gi/_gobject/pygobject.c
++++ b/gi/_gobject/pygobject.c
+@@ -967,9 +967,7 @@ pygobject_new_full(GObject *obj, gboolean sink, gpointer g_class)
+ 	self->weakreflist = NULL;
+ 	self->private_flags.flags = 0;
+ 	self->obj = obj;
+-        /* if we are creating a wrapper around a newly created object, it can have
+-           a floating ref (e.g. for methods like Gtk.Button.new()). Bug 640868 */
+-	g_object_ref_sink(obj);
++	g_object_ref(obj);
+ 	pygobject_register_wrapper((PyObject *)self);
+ 	PyObject_GC_Track((PyObject *)self);
+     }

Modified: desktop/experimental/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/patches/series?rev=29538&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/patches/series [utf-8] (original)
+++ desktop/experimental/pygobject/debian/patches/series [utf-8] Tue Aug 30 06:28:59 2011
@@ -1,0 +1,1 @@
+revert-refcount-fix.patch