summaryrefslogtreecommitdiffstats
path: root/abs/core/pygtk
diff options
context:
space:
mode:
authorMichael Hanson <hansonorders@verizon.net>2010-12-10 00:19:00 (GMT)
committerMichael Hanson <hansonorders@verizon.net>2010-12-10 00:19:00 (GMT)
commit5ab2c2d585290fb77dfc8d3670361df2fdc11c62 (patch)
tree58fc24f3a355bff701d6e93ba8011e9d1764f7b9 /abs/core/pygtk
parent4592612b015ff899ef52f33d96b52b5c60587ebb (diff)
downloadlinhes_pkgbuild-5ab2c2d585290fb77dfc8d3670361df2fdc11c62.zip
linhes_pkgbuild-5ab2c2d585290fb77dfc8d3670361df2fdc11c62.tar.gz
linhes_pkgbuild-5ab2c2d585290fb77dfc8d3670361df2fdc11c62.tar.bz2
A whole lotta housekeeping
Diffstat (limited to 'abs/core/pygtk')
-rw-r--r--abs/core/pygtk/PKGBUILD34
-rw-r--r--abs/core/pygtk/python27.patch50
2 files changed, 0 insertions, 84 deletions
diff --git a/abs/core/pygtk/PKGBUILD b/abs/core/pygtk/PKGBUILD
deleted file mode 100644
index b1e4c04..0000000
--- a/abs/core/pygtk/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 94310 2010-10-06 15:16:23Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=pygtk
-pkgver=2.22.0
-pkgrel=3
-pkgdesc="Python bindings for the GTK widget set"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libglade>=2.6.4' 'pycairo>=1.8.10' 'pygobject>=2.21.5')
-makedepends=('python-numpy')
-optdepends=('python-numpy')
-options=('!libtool')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/pygtk/2.22/${pkgname}-${pkgver}.tar.bz2
- python27.patch)
-sha256sums=('4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8'
- '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- #https://bugzilla.gnome.org/show_bug.cgi?id=623965
- patch -Np1 -i "${srcdir}/python27.patch"
- ./configure --prefix=/usr
- make || return 1
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install || return 1
- sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py
- install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
diff --git a/abs/core/pygtk/python27.patch b/abs/core/pygtk/python27.patch
deleted file mode 100644
index 9bbe2b5..0000000
--- a/abs/core/pygtk/python27.patch
+++ /dev/null
@@ -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
-