From e58d650a25627d97393d9000af0b9977c4542d6a Mon Sep 17 00:00:00 2001 From: bill-auger Date: Thu, 16 Apr 2020 03:22:08 -0400 Subject: [pygtk]: add package --- pcr/pygtk/PKGBUILD | 57 +++++++++++++++++++++ ...drop-pangofont-find_shaper-virtual-method.patch | 40 +++++++++++++++ pcr/pygtk/fix-leaks-of-pango-objects.patch | 59 ++++++++++++++++++++++ pcr/pygtk/python27.patch | 50 ++++++++++++++++++ 4 files changed, 206 insertions(+) create mode 100644 pcr/pygtk/PKGBUILD create mode 100644 pcr/pygtk/drop-pangofont-find_shaper-virtual-method.patch create mode 100644 pcr/pygtk/fix-leaks-of-pango-objects.patch create mode 100644 pcr/pygtk/python27.patch (limited to 'pcr/pygtk') diff --git a/pcr/pygtk/PKGBUILD b/pcr/pygtk/PKGBUILD new file mode 100644 index 000000000..ffba9fe7d --- /dev/null +++ b/pcr/pygtk/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Jan de Groot +# Contributor: Sarah Hay + +pkgname=pygtk +pkgver=2.24.0 +pkgrel=9 +pkgdesc="Python bindings for the GTK widget set" +url="http://www.pygtk.org/" +arch=(armv7h i686 x86_64) +license=('LGPL') +depends=('libglade' 'python2-cairo' 'python2-gobject2') +makedepends=('python2-numpy' 'pygobject2-devel') +optdepends=('python2-numpy') +source=(https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + python27.patch + fix-leaks-of-pango-objects.patch + drop-pangofont-find_shaper-virtual-method.patch) +sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912' + '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682' + '0ca9e910e9bb88897089dd19752a419aa78de15463df766cb19a1d0c2dd45bcb' + '31a2cec9151ae49307d1c307f33f78e49bfcae800f92643c93e0e1b1d29dca80') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # https://bugzilla.gnome.org/show_bug.cgi?id=623965 + # marked upstream as 'WONTFIX' + patch -Np1 -i "${srcdir}/python27.patch" + + # https://bugzilla.gnome.org/show_bug.cgi?id=660216 + # merged upstream, but not in any stable release + patch -Np1 -i "${srcdir}/fix-leaks-of-pango-objects.patch" + + # https://gitlab.gnome.org/Archive/pygtk/-/merge_requests/1 + # merged upstream, but not in any stable release + patch -Np1 -i "${srcdir}/drop-pangofont-find_shaper-virtual-method.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/" +} diff --git a/pcr/pygtk/drop-pangofont-find_shaper-virtual-method.patch b/pcr/pygtk/drop-pangofont-find_shaper-virtual-method.patch new file mode 100644 index 000000000..7178ea96c --- /dev/null +++ b/pcr/pygtk/drop-pangofont-find_shaper-virtual-method.patch @@ -0,0 +1,40 @@ +From 4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2 Mon Sep 17 00:00:00 2001 +From: Jordan Petridis +Date: Thu, 24 Oct 2019 22:58:36 +0200 +Subject: [PATCH] Drop the PangoFont find_shaper virtual method + +This API has been removed from Pango 1.44.6, because it was completely +unused by anything. + +However, PyGTK tries to bind everything, even unused API. + +Removing this from PyGTK means we can build it against the latest Pango +again. + +https://gitlab.gnome.org/GNOME/pango/issues/417 +--- + pango.defs | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/pango.defs b/pango.defs +index 6935c964..da968f58 100644 +--- a/pango.defs ++++ b/pango.defs +@@ -1391,15 +1391,6 @@ + ) + ) + +-(define-virtual find_shaper +- (of-object "PangoFont") +- (return-type "PangoEngineShape*") +- (parameters +- '("PangoLanguage*" "lang") +- '("guint32" "ch") +- ) +-) +- + (define-virtual get_glyph_extents + (of-object "PangoFont") + (return-type "none") +-- +2.24.1 diff --git a/pcr/pygtk/fix-leaks-of-pango-objects.patch b/pcr/pygtk/fix-leaks-of-pango-objects.patch new file mode 100644 index 000000000..c935dd6f2 --- /dev/null +++ b/pcr/pygtk/fix-leaks-of-pango-objects.patch @@ -0,0 +1,59 @@ +From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001 +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 + +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/pcr/pygtk/python27.patch b/pcr/pygtk/python27.patch new file mode 100644 index 000000000..9bbe2b5ae --- /dev/null +++ b/pcr/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 + -- cgit v1.2.3