commit c5c82dc1e2f2ddab757877c98517ca42d3af0db1 Author: Danny Rawlins <monster.romster@gmail.com> Date: Fri Sep 28 18:44:15 2018 +1000 [notify] pygtk: dependency change: pygobject and pycairo to python-gobject-compat and python-cairo, 2 patches applied upstream bugs: 623965 and 660216 diff --git a/pygtk/.signature b/pygtk/.signature index 30dc38d6a..c12b8e79a 100644 --- a/pygtk/.signature +++ b/pygtk/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/d1J5fM/hOFa+0t/QW/l1ACYpO5i8gQ9YbjJcWPfovEnWnyKkkhtKnoBr96AFDc5Ldsz+4Vn+Z5z6J83vS8Ahgs= -SHA256 (Pkgfile) = 81c4bcaee9f3ac29fbdab63e67e7c693136dc3e5f9936ba651c42cdd1c967e0b +RWSE3ohX2g5d/ZMLul6fGgLt6oO7NnXGLbpX26WcCJxVbHJKTAR5Smnw7b6RraAMKPxxk8Djzv1kQ4xrX2pYjM2j9TpZOlTaYQw= +SHA256 (Pkgfile) = 7c4de2861c780673c3499f105df9677f45819eb5c1707956f70ac05cfa8a096a SHA256 (.footprint) = 6d1e16b13d6a41f46564160687cc9ad0cbd71213381d505d806db4a03a26e561 SHA256 (pygtk-2.24.0.tar.bz2) = cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912 +SHA256 (python27.patch) = 39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682 +SHA256 (fix-leaks-of-pango-objects.patch) = 0ca9e910e9bb88897089dd19752a419aa78de15463df766cb19a1d0c2dd45bcb diff --git a/pygtk/Pkgfile b/pygtk/Pkgfile index ac6d1588c..0fb71f7f7 100644 --- a/pygtk/Pkgfile +++ b/pygtk/Pkgfile @@ -1,18 +1,32 @@ -# Packager: Stoyan Zhekov, zhware at hotpop dot com -# Maintainer: Jose V Beneyto, sepen at crux dot nu # Description: set of bindings for the GTK widget set -# URL: http://www.pygtk.org -# Depends on: pygobject pycairo libglade +# URL: http://www.pygtk.org/ +# Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: libglade python-gobject-compat python-cairo name=pygtk version=2.24.0 -release=1 -source=(http://ftp.gnome.org/pub/GNOME/sources/$name/${version::4}/$name-$version.tar.bz2) +release=2 +source=(https://download.gnome.org/sources/$name/${version::4}/$name-$version.tar.bz2 + python27.patch + fix-leaks-of-pango-objects.patch) build() { - cd $name-$version - ./configure --prefix=/usr - make - make DESTDIR=$PKG install - rm -rf $PKG/usr/share/gtk-doc + cd $name-$version + + # https://bugzilla.gnome.org/show_bug.cgi?id=623965 + patch -p1 -i $SRC/python27.patch + + # https://bugzilla.gnome.org/show_bug.cgi?id=660216 + patch -p1 -i $SRC/fix-leaks-of-pango-objects.patch + + ./configure --prefix=/usr + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make + make DESTDIR=$PKG install + + install -m 0644 gtk/gtk-extrafuncs.defs $PKG/usr/share/pygtk/2.0/defs/ + + rm -r $PKG/usr/share/gtk-doc } diff --git a/pygtk/fix-leaks-of-pango-objects.patch b/pygtk/fix-leaks-of-pango-objects.patch new file mode 100644 index 000000000..c935dd6f2 --- /dev/null +++ b/pygtk/fix-leaks-of-pango-objects.patch @@ -0,0 +1,59 @@ +From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" <otaylor@fishsoup.net> +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 + +diff --git a/gtk/gtk-2.10.defs b/gtk/gtk-2.10.defs +index 69c7e0c..faa45e1 100644 +--- a/gtk/gtk-2.10.defs ++++ b/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*") + ) + +diff --git a/pangocairo.override b/pangocairo.override +index bb923e6..5101107 100644 +--- a/pangocairo.override ++++ b/pangocairo.override +@@ -118,11 +118,16 @@ _wrap_pango_cairo_update_context(PyGObject *self, PyObject *args, PyObject *kwar + 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 * +-- +cgit v0.10.2 + diff --git a/pygtk/python27.patch b/pygtk/python27.patch new file mode 100644 index 000000000..9bbe2b5ae --- /dev/null +++ b/pygtk/python27.patch @@ -0,0 +1,50 @@ +diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c +index c0e1493..aa8cf10 100644 +--- a/gtk/gtkmodule.c ++++ b/gtk/gtkmodule.c +@@ -227,8 +227,12 @@ init_gtk(void) + pygtk_add_stock_items(d); + + /* extension API */ +- PyDict_SetItemString(d, "_PyGtk_API", +- o=PyCObject_FromVoidPtr(&functions, NULL)); ++#if PY_VERSION_HEX >= 0x02070000 ++ o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL); ++#else ++ o = PyCObject_FromVoidPtr(&functions, NULL); ++#endif ++ PyDict_SetItemString(d, "_PyGtk_API", o); + Py_DECREF(o); + + PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning", +diff --git a/gtk/pygtk.h b/gtk/pygtk.h +index 573c3b9..e4c680f 100644 +--- a/gtk/pygtk.h ++++ b/gtk/pygtk.h +@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; + + + /* a function to initialise the pygtk functions */ ++ ++/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */ ++#if PY_VERSION_HEX >= 0x02070000 ++#define init_pygtk() G_STMT_START { \ ++ void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \ ++ if (!capsule) { \ ++ return; \ ++ } \ ++ _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \ ++} G_STMT_END ++#else /* PY_VERSION_HEX */ ++/* Python 2.6 and earlier use the CObject API */ + #define init_pygtk() G_STMT_START { \ + PyObject *pygtk = PyImport_ImportModule("gtk"); \ + if (pygtk != NULL) { \ +@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; + return; \ + } \ + } G_STMT_END ++#endif /* PY_VERSION_HEX */ + + #endif +