[arch-commits] Commit in pygtk/repos/extra-i686 (4 files)
Ionut Biru
ibiru at archlinux.org
Fri Sep 16 07:33:58 UTC 2011
Date: Friday, September 16, 2011 @ 03:33:58
Author: ibiru
Revision: 138081
archrelease: copy trunk to extra-i686
Added:
pygtk/repos/extra-i686/PKGBUILD
(from rev 138080, pygtk/trunk/PKGBUILD)
pygtk/repos/extra-i686/python27.patch
(from rev 138080, pygtk/trunk/python27.patch)
Deleted:
pygtk/repos/extra-i686/PKGBUILD
pygtk/repos/extra-i686/python27.patch
----------------+
PKGBUILD | 74 ++++++++++++++++++++--------------------
python27.patch | 100 +++++++++++++++++++++++++++----------------------------
2 files changed, 87 insertions(+), 87 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2011-09-16 07:33:09 UTC (rev 138080)
+++ PKGBUILD 2011-09-16 07:33:58 UTC (rev 138081)
@@ -1,37 +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=2
-pkgdesc="Python bindings for the GTK widget set"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libglade' 'python2-cairo' 'pygobject')
-makedepends=('python2-numpy' 'pygobject-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=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
-}
Copied: pygtk/repos/extra-i686/PKGBUILD (from rev 138080, pygtk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2011-09-16 07:33:58 UTC (rev 138081)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+
+pkgname=pygtk
+pkgver=2.24.0
+pkgrel=2
+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=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
+}
Deleted: python27.patch
===================================================================
--- python27.patch 2011-09-16 07:33:09 UTC (rev 138080)
+++ python27.patch 2011-09-16 07:33:58 UTC (rev 138081)
@@ -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 138080, pygtk/trunk/python27.patch)
===================================================================
--- python27.patch (rev 0)
+++ python27.patch 2011-09-16 07:33:58 UTC (rev 138081)
@@ -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