Date: Monday, September 14, 2015 @ 18:34:03 Author: fyan Revision: 246035
upgpkg: pygtk 2.24.0-6 add an upstream patch to fix memory leak Added: pygtk/trunk/fix-leaks-of-pango-objects.patch Modified: pygtk/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 11 +++++- fix-leaks-of-pango-objects.patch | 59 +++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-09-14 16:09:28 UTC (rev 246034) +++ PKGBUILD 2015-09-14 16:34:03 UTC (rev 246035) @@ -4,7 +4,7 @@ pkgname=pygtk pkgver=2.24.0 -pkgrel=5 +pkgrel=6 pkgdesc="Python bindings for the GTK widget set" arch=('i686' 'x86_64') license=('LGPL') @@ -13,9 +13,11 @@ optdepends=('python2-numpy') url="http://www.pygtk.org/" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - python27.patch) + python27.patch + fix-leaks-of-pango-objects.patch) sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912' - '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682') + '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682' + '0ca9e910e9bb88897089dd19752a419aa78de15463df766cb19a1d0c2dd45bcb') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,6 +25,9 @@ #https://bugzilla.gnome.org/show_bug.cgi?id=623965 patch -Np1 -i "${srcdir}/python27.patch" + #https://bugzilla.gnome.org/show_bug.cgi?id=660216 + patch -Np1 -i "${srcdir}/fix-leaks-of-pango-objects.patch" + sed -i -e 's#env python$#env python2#' examples/pygtk-demo/{,demos/}*.py } Added: fix-leaks-of-pango-objects.patch =================================================================== --- fix-leaks-of-pango-objects.patch (rev 0) +++ fix-leaks-of-pango-objects.patch 2015-09-14 16:34:03 UTC (rev 246035) @@ -0,0 +1,59 @@ +From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" <otay...@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 +