diffstat of debian/ for pygobject_2.14.2-1 pygobject_2.14.2-1maemo2 changelog | 14 ++++ control | 19 +++++ control.in | 17 ++++- patches/05-change_pygconstant_strip_prefix.patch | 14 ++++ patches/07-fix-lambda-expression-broken.patch | 75 +++++++++++++++++++++++ patches/series | 2 6 files changed, 138 insertions(+), 3 deletions(-) diff -Nru pygobject-2.14.2/debian/changelog pygobject-2.14.2/debian/changelog --- pygobject-2.14.2/debian/changelog 2019-03-09 06:16:14.000000000 +0000 +++ pygobject-2.14.2/debian/changelog 2009-01-16 08:17:35.000000000 +0000 @@ -1,3 +1,17 @@ +pygobject (2.14.2-1maemo2) unstable; urgency=low + + * Add pymaemo specific patches: + - 05-change_pygconstant_strip_prefix.patch + - 07-fix-lambda-expression-broken.patch + + -- Bruno dos Santos de Araujo Tue, 09 Dec 2008 09:44:14 -0400 + +pygobject (2.14.2-1maemo1) unstable; urgency=low + + * Add Conflicts/Replaces for "python2.5-gobject (<< ${binary:Version})". + + -- Anderson Lizardo Tue, 11 Nov 2008 10:25:22 -0400 + pygobject (2.14.2-1) unstable; urgency=low * Switch to quilt; build-depend on quilt. diff -Nru pygobject-2.14.2/debian/control pygobject-2.14.2/debian/control --- pygobject-2.14.2/debian/control 2019-03-09 06:16:14.000000000 +0000 +++ pygobject-2.14.2/debian/control 2009-03-06 10:13:09.000000000 +0000 @@ -2,7 +2,7 @@ Section: python Priority: optional Maintainer: Josselin Mouette -Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastien Bacher +Uploaders: Build-Depends: debhelper (>= 5), python-support (>= 0.4), gnome-pkg-tools (>= 0.10), @@ -29,7 +29,8 @@ Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Suggests: python-gobject-dbg -Conflicts: python-gtk2 (<< 2.10) +Replaces: python2.5-gobject (<< ${binary:Version}) +Conflicts: python-gtk2 (<< 2.10), python2.5-gobject (<< ${binary:Version}) Description: Python bindings for the GObject library GObject is an abstraction layer that allows to program with an object paradigm that is compatible with many languages. It is a part of Glib, @@ -71,3 +72,17 @@ . This package contains the Python bindings for GObject. It is mostly used by other bindings to map their GObjects to Python objects. + +Package: python2.5-gobject +Architecture: any +Depends: python-gobject (= ${binary:Version}) +Description: Python bindings for the GTK+ widget set + This package name is now deprecated, please use the python-gobject package + for developing new software. + +Package: python2.5-gobject-dev +Architecture: any +Depends: python-gobject-dev (= ${binary:Version}) +Description: GTK+ bindings: devel files + This package name is now deprecated, please use the python-gobject-dev package + for developing new software. diff -Nru pygobject-2.14.2/debian/control.in pygobject-2.14.2/debian/control.in --- pygobject-2.14.2/debian/control.in 2019-03-09 06:16:14.000000000 +0000 +++ pygobject-2.14.2/debian/control.in 2009-03-04 09:25:53.000000000 +0000 @@ -29,7 +29,8 @@ Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Suggests: python-gobject-dbg -Conflicts: python-gtk2 (<< 2.10) +Replaces: python2.5-gobject (<< ${binary:Version}) +Conflicts: python-gtk2 (<< 2.10), python2.5-gobject (<< ${binary:Version}) Description: Python bindings for the GObject library GObject is an abstraction layer that allows to program with an object paradigm that is compatible with many languages. It is a part of Glib, @@ -71,3 +72,17 @@ . This package contains the Python bindings for GObject. It is mostly used by other bindings to map their GObjects to Python objects. + +Package: python2.5-gobject +Architecture: any +Depends: python-gobject (= ${binary:Version}) +Description: Python bindings for the GTK+ widget set + This package name is now deprecated, please use the python-gobject package + for developing new software. + +Package: python2.5-gobject-dev +Architecture: any +Depends: python-gobject-dev (= ${binary:Version}) +Description: GTK+ bindings: devel files + This package name is now deprecated, please use the python-gobject-dev package + for developing new software. diff -Nru pygobject-2.14.2/debian/patches/05-change_pygconstant_strip_prefix.patch pygobject-2.14.2/debian/patches/05-change_pygconstant_strip_prefix.patch --- pygobject-2.14.2/debian/patches/05-change_pygconstant_strip_prefix.patch 1970-01-01 00:00:00.000000000 +0000 +++ pygobject-2.14.2/debian/patches/05-change_pygconstant_strip_prefix.patch 2009-01-16 08:17:35.000000000 +0000 @@ -0,0 +1,14 @@ +Index: pygobject-2.13.1/gobject/gobjectmodule.c +=================================================================== +--- pygobject-2.13.1.orig/gobject/gobjectmodule.c 2007-04-30 11:51:17.000000000 -0300 ++++ pygobject-2.13.1/gobject/gobjectmodule.c 2007-10-22 14:20:55.000000000 -0300 +@@ -2926,6 +2926,9 @@ + + prefix_len = strlen(strip_prefix); + ++ if (!g_str_has_prefix(name, strip_prefix)) ++ return name; ++ + /* strip off prefix from value name, while keeping it a valid + * identifier */ + for (j = prefix_len; j >= 0; j--) { diff -Nru pygobject-2.14.2/debian/patches/07-fix-lambda-expression-broken.patch pygobject-2.14.2/debian/patches/07-fix-lambda-expression-broken.patch --- pygobject-2.14.2/debian/patches/07-fix-lambda-expression-broken.patch 1970-01-01 00:00:00.000000000 +0000 +++ pygobject-2.14.2/debian/patches/07-fix-lambda-expression-broken.patch 2009-01-16 08:17:35.000000000 +0000 @@ -0,0 +1,75 @@ +Index: python-gobject-2.14.1/gobject/pygobject.c +=================================================================== +--- python-gobject-2.14.1.orig/gobject/pygobject.c 2008-09-09 16:57:11.000000000 -0300 ++++ python-gobject-2.14.1/gobject/pygobject.c 2008-09-09 16:45:28.000000000 -0300 +@@ -1026,18 +1026,19 @@ + if (ret != 0) return ret; + + if (data) { +- + for (tmp = data->closures; tmp != NULL; tmp = tmp->next) { + PyGClosure *closure = tmp->data; + +- if (closure->callback) ret = visit(closure->callback, arg); +- if (ret != 0) return ret; +- +- if (closure->extra_args) ret = visit(closure->extra_args, arg); +- if (ret != 0) return ret; +- +- if (closure->swap_data) ret = visit(closure->swap_data, arg); +- if (ret != 0) return ret; ++ if (self->obj->ref_count == 1) { ++ if (closure->callback) ret = visit(closure->callback, arg); ++ if (ret != 0) return ret; ++ ++ if (closure->extra_args) ret = visit(closure->extra_args, arg); ++ if (ret != 0) return ret; ++ ++ if (closure->swap_data) ret = visit(closure->swap_data, arg); ++ if (ret != 0) return ret; ++ } + } + } + return ret; +Index: python-gobject-2.14.1/tests/test_subtype.py +=================================================================== +--- python-gobject-2.14.1.orig/tests/test_subtype.py 2008-09-09 16:57:02.000000000 -0300 ++++ python-gobject-2.14.1/tests/test_subtype.py 2008-09-09 16:49:12.000000000 -0300 +@@ -4,7 +4,7 @@ + import sys + + import testmodule +-from common import gobject, testhelper ++from common import glib, gobject, gio, testhelper + from gobject import GObject, GInterface, GObjectMeta + import gtk + +@@ -267,3 +267,28 @@ + foo = Foo() + d = foo.__dict__ + ++ def test_func_closure(self): ++ variables = [] ++ ++ def make_cancellable(): ++ cancellable = gio.Cancellable() ++ def on_cancelled(*args): ++ variables.append (cancellable) ++ cancellable.connect('cancelled', on_cancelled) ++ return cancellable ++ ++ # This is a dummy object only need to avoid Python reference ++ # to the callable (only reference will be hold by C GIO). ++ x = gio.FileInfo() ++ x.set_attribute_object('cancellable', make_cancellable()) ++ ++ gc.collect() ++ ++ loop = glib.MainLoop() ++ ++ glib.idle_add(lambda: x.get_attribute_object('cancellable').cancel()) ++ glib.idle_add(lambda: loop.quit()) ++ ++ loop.run() ++ ++ self.assert_(variables and isinstance(variables[0], gio.Cancellable)) diff -Nru pygobject-2.14.2/debian/patches/series pygobject-2.14.2/debian/patches/series --- pygobject-2.14.2/debian/patches/series 2019-03-09 06:16:14.000000000 +0000 +++ pygobject-2.14.2/debian/patches/series 2009-03-04 09:25:53.000000000 +0000 @@ -4,3 +4,5 @@ 60_use-python-config-for-includes.patch 61_wakeupfd-fix.patch 90_autofoo.patch +05-change_pygconstant_strip_prefix.patch +07-fix-lambda-expression-broken.patch