summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2011-04-03 11:16:40 +0200
committerTreeve Jelbert2011-04-03 11:17:30 +0200
commit57a2b20791644b0020bdf4d22386564b2c10e854 (patch)
tree20cfb99f4749643248ee434fac307ed80633023c
parent39a456558dcf5e8c669089b769fe5c5abfd474d6 (diff)
pygtk2: => 2.24.0
-rwxr-xr-xx11-toolkits/pygtk2/BUILD4
-rwxr-xr-xx11-toolkits/pygtk2/DETAILS6
-rw-r--r--x11-toolkits/pygtk2/HISTORY5
-rwxr-xr-xx11-toolkits/pygtk2/PRE_BUILD4
-rw-r--r--x11-toolkits/pygtk2/py27.patch46
-rw-r--r--x11-toolkits/pygtk2/pygtk-2.22.0.tar.bz2.sigbin287 -> 0 bytes
6 files changed, 9 insertions, 56 deletions
diff --git a/x11-toolkits/pygtk2/BUILD b/x11-toolkits/pygtk2/BUILD
index c48a3c9fc8..52d96586e0 100755
--- a/x11-toolkits/pygtk2/BUILD
+++ b/x11-toolkits/pygtk2/BUILD
@@ -1,4 +1,2 @@
OPTS="$OPTS --enable-thread" &&
-make_single &&
-default_build &&
-make_normal
+default_build
diff --git a/x11-toolkits/pygtk2/DETAILS b/x11-toolkits/pygtk2/DETAILS
index a31dc7b40a..c2edc1adf5 100755
--- a/x11-toolkits/pygtk2/DETAILS
+++ b/x11-toolkits/pygtk2/DETAILS
@@ -1,10 +1,10 @@
SPELL=pygtk2
- VERSION=2.22.0
- PATCHLEVEL=1
+ VERSION=2.24.0
+ SOURCE_HASH=sha512:64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=pygtk-$VERSION.tar.bz2
SOURCE_URL[0]=$GNOME_URL/sources/pygtk/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/pygtk-$VERSION"
WEB_SITE=http://www.pygtk.org/
LICENSE[0]=LGPL
diff --git a/x11-toolkits/pygtk2/HISTORY b/x11-toolkits/pygtk2/HISTORY
index 2ecd798cb2..329dcb5e29 100644
--- a/x11-toolkits/pygtk2/HISTORY
+++ b/x11-toolkits/pygtk2/HISTORY
@@ -1,3 +1,8 @@
+2011-04-03 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.1=24.0
+ * PRE_BUILD, py27.patch: deleted
+ * BUILD: remove make_single
+
2010-10-31 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: added, to apply patch
diff --git a/x11-toolkits/pygtk2/PRE_BUILD b/x11-toolkits/pygtk2/PRE_BUILD
deleted file mode 100755
index 9e42183fd9..0000000000
--- a/x11-toolkits/pygtk2/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/py27.patch"
diff --git a/x11-toolkits/pygtk2/py27.patch b/x11-toolkits/pygtk2/py27.patch
deleted file mode 100644
index 22cbc366af..0000000000
--- a/x11-toolkits/pygtk2/py27.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- gtk/gtkmodule.c.orig
-+++ 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",
---- gtk/pygtk.h.orig
-+++ 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
-
diff --git a/x11-toolkits/pygtk2/pygtk-2.22.0.tar.bz2.sig b/x11-toolkits/pygtk2/pygtk-2.22.0.tar.bz2.sig
deleted file mode 100644
index dec3bdd9d2..0000000000
--- a/x11-toolkits/pygtk2/pygtk-2.22.0.tar.bz2.sig
+++ /dev/null
Binary files differ