[arch-commits] Commit in pygtk/repos (12 files)
Jan Steffens
heftig at archlinux.org
Fri Jul 14 12:19:36 UTC 2017
Date: Friday, July 14, 2017 @ 12:19:36
Author: heftig
Revision: 300534
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
pygtk/repos/extra-i686/PKGBUILD
(from rev 300533, pygtk/trunk/PKGBUILD)
pygtk/repos/extra-i686/fix-leaks-of-pango-objects.patch
(from rev 300533, pygtk/trunk/fix-leaks-of-pango-objects.patch)
pygtk/repos/extra-i686/python27.patch
(from rev 300533, pygtk/trunk/python27.patch)
pygtk/repos/extra-x86_64/PKGBUILD
(from rev 300533, pygtk/trunk/PKGBUILD)
pygtk/repos/extra-x86_64/fix-leaks-of-pango-objects.patch
(from rev 300533, pygtk/trunk/fix-leaks-of-pango-objects.patch)
pygtk/repos/extra-x86_64/python27.patch
(from rev 300533, pygtk/trunk/python27.patch)
Deleted:
pygtk/repos/extra-i686/PKGBUILD
pygtk/repos/extra-i686/fix-leaks-of-pango-objects.patch
pygtk/repos/extra-i686/python27.patch
pygtk/repos/extra-x86_64/PKGBUILD
pygtk/repos/extra-x86_64/fix-leaks-of-pango-objects.patch
pygtk/repos/extra-x86_64/python27.patch
-----------------------------------------------+
/PKGBUILD | 100 ++++++++++++++++++++
/fix-leaks-of-pango-objects.patch | 118 ++++++++++++++++++++++++
/python27.patch | 100 ++++++++++++++++++++
extra-i686/PKGBUILD | 45 ---------
extra-i686/fix-leaks-of-pango-objects.patch | 59 ------------
extra-i686/python27.patch | 50 ----------
extra-x86_64/PKGBUILD | 45 ---------
extra-x86_64/fix-leaks-of-pango-objects.patch | 59 ------------
extra-x86_64/python27.patch | 50 ----------
9 files changed, 318 insertions(+), 308 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-07-14 12:17:48 UTC (rev 300533)
+++ extra-i686/PKGBUILD 2017-07-14 12:19:36 UTC (rev 300534)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-
-pkgname=pygtk
-pkgver=2.24.0
-pkgrel=6
-pkgdesc="Python bindings for the GTK widget set"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libglade' 'python2-cairo' 'pygobject')
-makedepends=('python2-numpy' 'pygobject2-devel')
-optdepends=('python2-numpy')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
- python27.patch
- fix-leaks-of-pango-objects.patch)
-sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
- '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682'
- '0ca9e910e9bb88897089dd19752a419aa78de15463df766cb19a1d0c2dd45bcb')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- #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
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
Copied: pygtk/repos/extra-i686/PKGBUILD (from rev 300533, pygtk/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-07-14 12:19:36 UTC (rev 300534)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+
+pkgname=pygtk
+pkgver=2.24.0
+pkgrel=7
+pkgdesc="Python bindings for the GTK widget set"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('libglade' 'python2-cairo' 'pygobject')
+makedepends=('python2-numpy' 'pygobject2-devel')
+optdepends=('python2-numpy')
+url="http://www.pygtk.org/"
+source=(https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ python27.patch
+ fix-leaks-of-pango-objects.patch)
+sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
+ '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682'
+ '0ca9e910e9bb88897089dd19752a419aa78de15463df766cb19a1d0c2dd45bcb')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # 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"
+
+ # Python 2
+ sed -i -e 's#env python$#env python2#' examples/pygtk-demo/{,demos/}*.py
+
+ # No docs
+ sed -i '/^SUBDIRS =/s/docs//' Makefile.in
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-docs
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
+}
Deleted: extra-i686/fix-leaks-of-pango-objects.patch
===================================================================
--- extra-i686/fix-leaks-of-pango-objects.patch 2017-07-14 12:17:48 UTC (rev 300533)
+++ extra-i686/fix-leaks-of-pango-objects.patch 2017-07-14 12:19:36 UTC (rev 300534)
@@ -1,59 +0,0 @@
-From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001
-From: "Owen W. Taylor" <otaylor at 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
-
Copied: pygtk/repos/extra-i686/fix-leaks-of-pango-objects.patch (from rev 300533, pygtk/trunk/fix-leaks-of-pango-objects.patch)
===================================================================
--- extra-i686/fix-leaks-of-pango-objects.patch (rev 0)
+++ extra-i686/fix-leaks-of-pango-objects.patch 2017-07-14 12:19:36 UTC (rev 300534)
@@ -0,0 +1,59 @@
+From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor at 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
+
Deleted: extra-i686/python27.patch
===================================================================
--- extra-i686/python27.patch 2017-07-14 12:17:48 UTC (rev 300533)
+++ extra-i686/python27.patch 2017-07-14 12:19:36 UTC (rev 300534)
@@ -1,50 +0,0 @@
-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
-
Copied: pygtk/repos/extra-i686/python27.patch (from rev 300533, pygtk/trunk/python27.patch)
===================================================================
--- extra-i686/python27.patch (rev 0)
+++ extra-i686/python27.patch 2017-07-14 12:19:36 UTC (rev 300534)
@@ -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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-07-14 12:17:48 UTC (rev 300533)
+++ extra-x86_64/PKGBUILD 2017-07-14 12:19:36 UTC (rev 300534)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-
-pkgname=pygtk
-pkgver=2.24.0
-pkgrel=6
-pkgdesc="Python bindings for the GTK widget set"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libglade' 'python2-cairo' 'pygobject')
-makedepends=('python2-numpy' 'pygobject2-devel')
-optdepends=('python2-numpy')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
- python27.patch
- fix-leaks-of-pango-objects.patch)
-sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
- '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682'
- '0ca9e910e9bb88897089dd19752a419aa78de15463df766cb19a1d0c2dd45bcb')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- #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
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
Copied: pygtk/repos/extra-x86_64/PKGBUILD (from rev 300533, pygtk/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-07-14 12:19:36 UTC (rev 300534)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+
+pkgname=pygtk
+pkgver=2.24.0
+pkgrel=7
+pkgdesc="Python bindings for the GTK widget set"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('libglade' 'python2-cairo' 'pygobject')
+makedepends=('python2-numpy' 'pygobject2-devel')
+optdepends=('python2-numpy')
+url="http://www.pygtk.org/"
+source=(https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ python27.patch
+ fix-leaks-of-pango-objects.patch)
+sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
+ '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682'
+ '0ca9e910e9bb88897089dd19752a419aa78de15463df766cb19a1d0c2dd45bcb')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # 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"
+
+ # Python 2
+ sed -i -e 's#env python$#env python2#' examples/pygtk-demo/{,demos/}*.py
+
+ # No docs
+ sed -i '/^SUBDIRS =/s/docs//' Makefile.in
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-docs
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
+}
Deleted: extra-x86_64/fix-leaks-of-pango-objects.patch
===================================================================
--- extra-x86_64/fix-leaks-of-pango-objects.patch 2017-07-14 12:17:48 UTC (rev 300533)
+++ extra-x86_64/fix-leaks-of-pango-objects.patch 2017-07-14 12:19:36 UTC (rev 300534)
@@ -1,59 +0,0 @@
-From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001
-From: "Owen W. Taylor" <otaylor at 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
-
Copied: pygtk/repos/extra-x86_64/fix-leaks-of-pango-objects.patch (from rev 300533, pygtk/trunk/fix-leaks-of-pango-objects.patch)
===================================================================
--- extra-x86_64/fix-leaks-of-pango-objects.patch (rev 0)
+++ extra-x86_64/fix-leaks-of-pango-objects.patch 2017-07-14 12:19:36 UTC (rev 300534)
@@ -0,0 +1,59 @@
+From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor at 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
+
Deleted: extra-x86_64/python27.patch
===================================================================
--- extra-x86_64/python27.patch 2017-07-14 12:17:48 UTC (rev 300533)
+++ extra-x86_64/python27.patch 2017-07-14 12:19:36 UTC (rev 300534)
@@ -1,50 +0,0 @@
-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
-
Copied: pygtk/repos/extra-x86_64/python27.patch (from rev 300533, pygtk/trunk/python27.patch)
===================================================================
--- extra-x86_64/python27.patch (rev 0)
+++ extra-x86_64/python27.patch 2017-07-14 12:19:36 UTC (rev 300534)
@@ -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
+
More information about the arch-commits
mailing list