diff options
Diffstat (limited to 'extra/pygtk')
-rw-r--r-- | extra/pygtk/.footprint | 71 | ||||
-rw-r--r-- | extra/pygtk/.md5sum | 3 | ||||
-rw-r--r-- | extra/pygtk/Pkgfile | 16 | ||||
-rw-r--r-- | extra/pygtk/python27.patch | 50 |
4 files changed, 103 insertions, 37 deletions
diff --git a/extra/pygtk/.footprint b/extra/pygtk/.footprint index fabc47b61..0bfe1bee1 100644 --- a/extra/pygtk/.footprint +++ b/extra/pygtk/.footprint @@ -64,6 +64,9 @@ drwxr-xr-x root/root usr/lib/pygtk/2.0/demos/images/ -rw-r--r-- root/root usr/lib/pygtk/2.0/demos/images/gnome-gsame.png -rw-r--r-- root/root usr/lib/pygtk/2.0/demos/images/gnu-keys.png -rw-r--r-- root/root usr/lib/pygtk/2.0/demos/images/gtk-logo-rgb.gif +-rw-r--r-- root/root usr/lib/pygtk/2.0/demos/infobar.py +-rw-r--r-- root/root usr/lib/pygtk/2.0/demos/infobar.pyc +-rw-r--r-- root/root usr/lib/pygtk/2.0/demos/infobar.pyo -rw-r--r-- root/root usr/lib/pygtk/2.0/demos/list_store.py -rw-r--r-- root/root usr/lib/pygtk/2.0/demos/list_store.pyc -rw-r--r-- root/root usr/lib/pygtk/2.0/demos/list_store.pyo @@ -109,37 +112,37 @@ drwxr-xr-x root/root usr/lib/pygtk/2.0/demos/images/ -rw-r--r-- root/root usr/lib/pygtk/2.0/pygtk-demo.py -rw-r--r-- root/root usr/lib/pygtk/2.0/pygtk-demo.pyc -rw-r--r-- root/root usr/lib/pygtk/2.0/pygtk-demo.pyo -drwxr-xr-x root/root usr/lib/python2.6/ -drwxr-xr-x root/root usr/lib/python2.6/site-packages/ -drwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/ --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/atk.la --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/atk.so -drwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/ --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/__init__.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/__init__.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/__init__.pyo --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/_gtk.la --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/_gtk.so --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/_lazyutils.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/_lazyutils.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/_lazyutils.pyo --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/compat.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/compat.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/compat.pyo --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/deprecation.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/deprecation.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/deprecation.pyo --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/glade.la --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/glade.so --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/keysyms.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/keysyms.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/gtk-2.0/gtk/keysyms.pyo --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/gtkunixprint.la --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/gtkunixprint.so --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/pango.la --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/pango.so --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/pangocairo.la --rwxr-xr-x root/root usr/lib/python2.6/site-packages/gtk-2.0/pangocairo.so +drwxr-xr-x root/root usr/lib/python2.7/ +drwxr-xr-x root/root usr/lib/python2.7/site-packages/ +drwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/ +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/atk.la +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/atk.so +drwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/__init__.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/__init__.pyo +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/_gtk.la +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/_gtk.so +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/_lazyutils.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/_lazyutils.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/_lazyutils.pyo +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/compat.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/compat.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/compat.pyo +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/deprecation.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/deprecation.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/deprecation.pyo +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/glade.la +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/glade.so +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/keysyms.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/keysyms.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/gtk-2.0/gtk/keysyms.pyo +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/gtkunixprint.la +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/gtkunixprint.so +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/pango.la +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/pango.so +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/pangocairo.la +-rwxr-xr-x root/root usr/lib/python2.7/site-packages/gtk-2.0/pangocairo.so drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/pygtk/ drwxr-xr-x root/root usr/share/pygtk/2.0/ @@ -151,6 +154,8 @@ drwxr-xr-x root/root usr/share/pygtk/2.0/defs/ -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-2.14.defs -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-2.16.defs -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-2.18.defs +-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-2.20.defs +-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-2.22.defs -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-base-types.defs -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-base.defs -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gdk-types.defs @@ -165,6 +170,10 @@ drwxr-xr-x root/root usr/share/pygtk/2.0/defs/ -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.16.defs -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.18-types.defs -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.18.defs +-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.20-types.defs +-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.20.defs +-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.22-types.defs (EMPTY) +-rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-2.22.defs -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-base-types.defs -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-base.defs -rw-r--r-- root/root usr/share/pygtk/2.0/defs/gtk-extrafuncs.defs diff --git a/extra/pygtk/.md5sum b/extra/pygtk/.md5sum index a93f041ad..12c077ddf 100644 --- a/extra/pygtk/.md5sum +++ b/extra/pygtk/.md5sum @@ -1 +1,2 @@ -43d704343d7ca04a6e4ddd4fa73a3c55 pygtk-2.17.0.tar.bz2 +e9bba9cd4cdaccb22a7991cc2f7c8373 pygtk-2.22.0.tar.bz2 +12acfacd26f19c504a0a2d0edeb66121 python27.patch diff --git a/extra/pygtk/Pkgfile b/extra/pygtk/Pkgfile index 5eb07f6f7..d4734d35e 100644 --- a/extra/pygtk/Pkgfile +++ b/extra/pygtk/Pkgfile @@ -5,16 +5,22 @@ # Depends on: gtk, pygobject, pycairo, libglade name=pygtk -version=2.17.0 -release=1 -source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2) +version=2.22.0 +release=2 +source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2 + python27.patch) build() { cd $name-$version - sed -i -e 's/SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs/SUBDIRS = codegen . $(GTK_SUBDIR) examples tests/' Makefile.in - ./configure --prefix=/usr --enable-numpy + patch -Np1 -i ../python27.patch + +# sed -i -e 's/SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs/SUBDIRS = codegen . $(GTK_SUBDIR) examples tests/' Makefile.in + + PYTHON=python2 ./configure --prefix=/usr --enable-numpy make make DESTDIR=$PKG install + + sed -i -e 's#env python$#env python2#' $PKG/usr/lib/pygtk/2.0/{,demos/}*.py install -m644 gtk/gtk-extrafuncs.defs $PKG/usr/share/pygtk/2.0/defs/ rm -rf $PKG/usr/share/gtk-doc } diff --git a/extra/pygtk/python27.patch b/extra/pygtk/python27.patch new file mode 100644 index 000000000..9bbe2b5ae --- /dev/null +++ b/extra/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 + |