diff -Nru pygtk-2.24.0/debian/changelog pygtk-2.24.0/debian/changelog --- pygtk-2.24.0/debian/changelog 2017-11-23 03:01:49.000000000 +0000 +++ pygtk-2.24.0/debian/changelog 2020-05-03 15:32:15.000000000 +0000 @@ -1,3 +1,9 @@ +pygtk (2.24.0-0~201711230314~ubuntu18.04.1) bionic; urgency=low + + * Auto build. + + -- Norbert Sun, 03 May 2020 15:32:15 +0000 + pygtk (2.24.0-5.1ubuntu2) bionic; urgency=medium * No-change rebuild against latest pycairo diff -Nru pygtk-2.24.0/debian/control pygtk-2.24.0/debian/control --- pygtk-2.24.0/debian/control 2017-11-23 03:01:49.000000000 +0000 +++ pygtk-2.24.0/debian/control 2020-05-03 15:32:15.000000000 +0000 @@ -1,5 +1,5 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: pygtk diff -Nru pygtk-2.24.0/debian/git-build-recipe.manifest pygtk-2.24.0/debian/git-build-recipe.manifest --- pygtk-2.24.0/debian/git-build-recipe.manifest 1970-01-01 00:00:00.000000000 +0000 +++ pygtk-2.24.0/debian/git-build-recipe.manifest 2020-05-03 15:32:15.000000000 +0000 @@ -0,0 +1,2 @@ +# git-build-recipe format 0.4 deb-version {debupstream}-0~201711230314 +lp:ubuntu/+source/pygtk git-commit:bed6ff8cb9b045a8ce400f56566b15086e918eeb diff -Nru pygtk-2.24.0/debian/patches/01_pygtk-demo.patch pygtk-2.24.0/debian/patches/01_pygtk-demo.patch --- pygtk-2.24.0/debian/patches/01_pygtk-demo.patch 2008-11-12 17:40:19.000000000 +0000 +++ pygtk-2.24.0/debian/patches/01_pygtk-demo.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Index: pygtk-2.13.0/examples/pygtk-demo/pygtk-demo.in -=================================================================== ---- pygtk-2.13.0.orig/examples/pygtk-demo/pygtk-demo.in 2008-04-27 11:51:14.000000000 +0200 -+++ pygtk-2.13.0/examples/pygtk-demo/pygtk-demo.in 2008-11-12 17:59:10.695490976 +0100 -@@ -1,7 +1,7 @@ --#! @PYTHON@ -+#! /usr/bin/python - - import sys - import os.path --pygtklibdir = os.path.join("@libdir@", "pygtk", "2.0") -+pygtklibdir = os.path.join("/usr/share", "pygtk", "2.0") - sys.path.insert(0, pygtklibdir) - execfile(os.path.join(pygtklibdir, "pygtk-demo.py")) diff -Nru pygtk-2.24.0/debian/patches/03_testsuite_filechooser.patch pygtk-2.24.0/debian/patches/03_testsuite_filechooser.patch --- pygtk-2.24.0/debian/patches/03_testsuite_filechooser.patch 2008-11-25 23:14:13.000000000 +0000 +++ pygtk-2.24.0/debian/patches/03_testsuite_filechooser.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: pygtk-2.13.0/tests/runtests.py -=================================================================== ---- pygtk-2.13.0.orig/tests/runtests.py 2008-11-26 00:13:20.451100628 +0100 -+++ pygtk-2.13.0/tests/runtests.py 2008-11-26 00:13:34.107100762 +0100 -@@ -21,7 +21,7 @@ else: - common.importModules(buildDir=buildDir, - srcDir=srcDir) - --SKIP_FILES = ['common', 'runtests', 'testmodule'] -+SKIP_FILES = ['common', 'runtests', 'testmodule', 'test_filechooserdialog'] - - dir = os.path.split(os.path.abspath(__file__))[0] - os.chdir(dir) diff -Nru pygtk-2.24.0/debian/patches/04_Fix_leaks_of_Pango_objects.patch pygtk-2.24.0/debian/patches/04_Fix_leaks_of_Pango_objects.patch --- pygtk-2.24.0/debian/patches/04_Fix_leaks_of_Pango_objects.patch 2015-02-07 04:49:14.000000000 +0000 +++ pygtk-2.24.0/debian/patches/04_Fix_leaks_of_Pango_objects.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -From: "Owen W. Taylor" -Date: Tue, 27 Sep 2011 00:17:52 -0400 -Subject: Fix leaks of Pango objects - -Gtk.PrintContext.create_pango_context() -Gtk.PrintContext.create_pango_layout() -pangocairo.CairoContext.create_layout() - -were leaking the objects they returned. - -https://bugzilla.gnome.org/show_bug.cgi?id=660216 - -Index: pygtk-2.24.0/gtk/gtk-2.10.defs -=================================================================== ---- pygtk-2.24.0.orig/gtk/gtk-2.10.defs -+++ pygtk-2.24.0/gtk/gtk-2.10.defs -@@ -1388,12 +1388,14 @@ - (define-method create_pango_context - (of-object "GtkPrintContext") - (c-name "gtk_print_context_create_pango_context") -+ (caller-owns-return #t) - (return-type "PangoContext*") - ) - - (define-method create_pango_layout - (of-object "GtkPrintContext") - (c-name "gtk_print_context_create_pango_layout") -+ (caller-owns-return #t) - (return-type "PangoLayout*") - ) - -Index: pygtk-2.24.0/pangocairo.override -=================================================================== ---- pygtk-2.24.0.orig/pangocairo.override -+++ pygtk-2.24.0/pangocairo.override -@@ -118,11 +118,16 @@ _wrap_pango_cairo_update_context(PyGObje - static PyObject * - _wrap_pango_cairo_create_layout(PyGObject *self) - { -- PangoLayout *ret; -+ PangoLayout *layout; -+ PyObject *ret; - -- ret = pango_cairo_create_layout(PycairoContext_GET(self)); -+ layout = pango_cairo_create_layout(PycairoContext_GET(self)); - /* pygobject_new handles NULL checking */ -- return pygobject_new((GObject *)ret); -+ ret = pygobject_new((GObject *)layout); -+ if (layout) -+ g_object_unref(layout); -+ -+ return ret; - } - - static PyObject * diff -Nru pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch --- pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch 2016-10-07 13:46:42.000000000 +0000 +++ pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -Description: Fix bus error on sparc64 - Since GdkColor.pixel is a guint32, but "k" in the format string means unsigned - long, a temporary local needs to be used to get the right alignment and size - on platforms where unsigned long is not 32-bit. -Author: James Clarke -Bug-Debian: https://bugs.debian.org/839867 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: pygtk-2.24.0/gtk/gdkcolor.override -=================================================================== ---- pygtk-2.24.0.orig/gtk/gdkcolor.override -+++ pygtk-2.24.0/gtk/gdkcolor.override -@@ -33,6 +33,7 @@ _wrap_gdk_color_new(PyGBoxed *self, - static char *kwlist1[] = {"red", "green", "blue", "pixel", NULL }; - static char *kwlist2[] = { "spec", NULL }; - PyObject *red = Py_None, *green = Py_None, *blue = Py_None; -+ unsigned long pixel; - const char *spec = NULL; - GdkColor colour; - -@@ -56,7 +57,9 @@ _wrap_gdk_color_new(PyGBoxed *self, - PyErr_Clear(); - - if (PyArg_ParseTupleAndKeywords(args, kwargs, "|OOOk:gdk.Color", kwlist1, -- &red, &green, &blue, &colour.pixel)) { -+ &red, &green, &blue, &pixel)) { -+ colour.pixel = pixel; -+ - /* We don't allow mixing floats and non-floats as that is too - * error-prone. All non-floats are deemed integers in case - * they have __int__() method. */ diff -Nru pygtk-2.24.0/debian/patches/series pygtk-2.24.0/debian/patches/series --- pygtk-2.24.0/debian/patches/series 2016-10-07 13:36:11.000000000 +0000 +++ pygtk-2.24.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -01_pygtk-demo.patch -03_testsuite_filechooser.patch -04_Fix_leaks_of_Pango_objects.patch -05_Fix_GdkColor_pixel_parse.patch diff -Nru pygtk-2.24.0/debian/source/format pygtk-2.24.0/debian/source/format --- pygtk-2.24.0/debian/source/format 2010-08-05 19:37:22.000000000 +0000 +++ pygtk-2.24.0/debian/source/format 2020-05-03 15:32:15.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru pygtk-2.24.0/examples/pygtk-demo/pygtk-demo.in pygtk-2.24.0/examples/pygtk-demo/pygtk-demo.in --- pygtk-2.24.0/examples/pygtk-demo/pygtk-demo.in 2011-04-01 10:37:25.000000000 +0000 +++ pygtk-2.24.0/examples/pygtk-demo/pygtk-demo.in 2020-05-03 15:32:15.000000000 +0000 @@ -1,7 +1,7 @@ -#! @PYTHON@ +#! /usr/bin/python import sys import os.path -pygtklibdir = os.path.join("@libdir@", "pygtk", "2.0") +pygtklibdir = os.path.join("/usr/share", "pygtk", "2.0") sys.path.insert(0, pygtklibdir) execfile(os.path.join(pygtklibdir, "pygtk-demo.py")) diff -Nru pygtk-2.24.0/gtk/gdkcolor.override pygtk-2.24.0/gtk/gdkcolor.override --- pygtk-2.24.0/gtk/gdkcolor.override 2011-04-01 10:37:25.000000000 +0000 +++ pygtk-2.24.0/gtk/gdkcolor.override 2020-05-03 15:32:15.000000000 +0000 @@ -33,6 +33,7 @@ static char *kwlist1[] = {"red", "green", "blue", "pixel", NULL }; static char *kwlist2[] = { "spec", NULL }; PyObject *red = Py_None, *green = Py_None, *blue = Py_None; + unsigned long pixel; const char *spec = NULL; GdkColor colour; @@ -56,7 +57,9 @@ PyErr_Clear(); if (PyArg_ParseTupleAndKeywords(args, kwargs, "|OOOk:gdk.Color", kwlist1, - &red, &green, &blue, &colour.pixel)) { + &red, &green, &blue, &pixel)) { + colour.pixel = pixel; + /* We don't allow mixing floats and non-floats as that is too * error-prone. All non-floats are deemed integers in case * they have __int__() method. */ diff -Nru pygtk-2.24.0/gtk/gtk-2.10.defs pygtk-2.24.0/gtk/gtk-2.10.defs --- pygtk-2.24.0/gtk/gtk-2.10.defs 2011-04-01 10:37:25.000000000 +0000 +++ pygtk-2.24.0/gtk/gtk-2.10.defs 2020-05-03 15:32:15.000000000 +0000 @@ -1388,12 +1388,14 @@ (define-method create_pango_context (of-object "GtkPrintContext") (c-name "gtk_print_context_create_pango_context") + (caller-owns-return #t) (return-type "PangoContext*") ) (define-method create_pango_layout (of-object "GtkPrintContext") (c-name "gtk_print_context_create_pango_layout") + (caller-owns-return #t) (return-type "PangoLayout*") ) diff -Nru pygtk-2.24.0/pangocairo.override pygtk-2.24.0/pangocairo.override --- pygtk-2.24.0/pangocairo.override 2011-04-01 10:37:25.000000000 +0000 +++ pygtk-2.24.0/pangocairo.override 2020-05-03 15:32:15.000000000 +0000 @@ -118,11 +118,16 @@ static PyObject * _wrap_pango_cairo_create_layout(PyGObject *self) { - PangoLayout *ret; + PangoLayout *layout; + PyObject *ret; - ret = pango_cairo_create_layout(PycairoContext_GET(self)); + layout = pango_cairo_create_layout(PycairoContext_GET(self)); /* pygobject_new handles NULL checking */ - return pygobject_new((GObject *)ret); + ret = pygobject_new((GObject *)layout); + if (layout) + g_object_unref(layout); + + return ret; } static PyObject * diff -Nru pygtk-2.24.0/tests/runtests.py pygtk-2.24.0/tests/runtests.py --- pygtk-2.24.0/tests/runtests.py 2011-04-01 10:37:25.000000000 +0000 +++ pygtk-2.24.0/tests/runtests.py 2020-05-03 15:32:15.000000000 +0000 @@ -21,7 +21,7 @@ common.importModules(buildDir=buildDir, srcDir=srcDir) -SKIP_FILES = ['common', 'runtests', 'testmodule'] +SKIP_FILES = ['common', 'runtests', 'testmodule', 'test_filechooserdialog'] dir = os.path.split(os.path.abspath(__file__))[0] os.chdir(dir)