diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-24 23:15:03 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-24 23:15:03 +0000 |
| commit | 2aa2acfff38de7de825868995e49792ecfc03126 (patch) | |
| tree | dee0f24162f2437b58208ac5073fb6492cb95767 /staging/pygtk | |
| parent | c6c657b8bcf062b5d19eff6298b7754c11838080 (diff) | |
Tue Jan 24 23:15:02 UTC 2012
Diffstat (limited to 'staging/pygtk')
| -rw-r--r-- | staging/pygtk/PKGBUILD | 37 | ||||
| -rw-r--r-- | staging/pygtk/python27.patch | 50 |
2 files changed, 87 insertions, 0 deletions
diff --git a/staging/pygtk/PKGBUILD b/staging/pygtk/PKGBUILD new file mode 100644 index 000000000..a231b87ef --- /dev/null +++ b/staging/pygtk/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 147168 2012-01-23 21:15:41Z eric $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> + +pkgname=pygtk +pkgver=2.24.0 +pkgrel=3 +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') +options=('!libtool') +url="http://www.pygtk.org/" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + python27.patch) +sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912' + '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + #https://bugzilla.gnome.org/show_bug.cgi?id=623965 + patch -Np1 -i "${srcdir}/python27.patch" + + 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/" + + sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py +} diff --git a/staging/pygtk/python27.patch b/staging/pygtk/python27.patch new file mode 100644 index 000000000..9bbe2b5ae --- /dev/null +++ b/staging/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 + |