From 765faa42e643a7fe7ec19340a8985b251fb30cc8 Mon Sep 17 00:00:00 2001 From: Alexpux Date: Thu, 15 Jan 2015 23:48:45 +0300 Subject: [PATCH] python2-pygtk: Rebuild. Fix gtk-demo running. --- .../{python27.patch => 001-python27.patch} | 0 ...undefined.patch => 002-no-undefined.patch} | 0 .../{python-m4.patch => 003-python-m4.patch} | 0 mingw-w64-python2-pygtk/004-pygtk-demo.patch | 10 ++++++++ mingw-w64-python2-pygtk/PKGBUILD | 25 +++++++++++-------- 5 files changed, 24 insertions(+), 11 deletions(-) rename mingw-w64-python2-pygtk/{python27.patch => 001-python27.patch} (100%) rename mingw-w64-python2-pygtk/{no-undefined.patch => 002-no-undefined.patch} (100%) rename mingw-w64-python2-pygtk/{python-m4.patch => 003-python-m4.patch} (100%) create mode 100644 mingw-w64-python2-pygtk/004-pygtk-demo.patch diff --git a/mingw-w64-python2-pygtk/python27.patch b/mingw-w64-python2-pygtk/001-python27.patch similarity index 100% rename from mingw-w64-python2-pygtk/python27.patch rename to mingw-w64-python2-pygtk/001-python27.patch diff --git a/mingw-w64-python2-pygtk/no-undefined.patch b/mingw-w64-python2-pygtk/002-no-undefined.patch similarity index 100% rename from mingw-w64-python2-pygtk/no-undefined.patch rename to mingw-w64-python2-pygtk/002-no-undefined.patch diff --git a/mingw-w64-python2-pygtk/python-m4.patch b/mingw-w64-python2-pygtk/003-python-m4.patch similarity index 100% rename from mingw-w64-python2-pygtk/python-m4.patch rename to mingw-w64-python2-pygtk/003-python-m4.patch diff --git a/mingw-w64-python2-pygtk/004-pygtk-demo.patch b/mingw-w64-python2-pygtk/004-pygtk-demo.patch new file mode 100644 index 0000000000..3ba922392d --- /dev/null +++ b/mingw-w64-python2-pygtk/004-pygtk-demo.patch @@ -0,0 +1,10 @@ +--- pygtk-2.24.0/examples/pygtk-demo/pygtk-demo.in.orig 2015-01-15 23:10:33.264600000 +0300 ++++ pygtk-2.24.0/examples/pygtk-demo/pygtk-demo.in 2015-01-15 23:10:56.383800000 +0300 +@@ -2,6 +2,6 @@ + + import sys + import os.path +-pygtklibdir = os.path.join("@libdir@", "pygtk", "2.0") ++pygtklibdir = os.path.join(sys.prefix, 'lib', "pygtk", "2.0") + sys.path.insert(0, pygtklibdir) + execfile(os.path.join(pygtklibdir, "pygtk-demo.py")) diff --git a/mingw-w64-python2-pygtk/PKGBUILD b/mingw-w64-python2-pygtk/PKGBUILD index 5f93d96b61..e4b158e995 100644 --- a/mingw-w64-python2-pygtk/PKGBUILD +++ b/mingw-w64-python2-pygtk/PKGBUILD @@ -1,34 +1,37 @@ # Maintainer: Alexey Pavlov _realname=pygtk - pkgname="${MINGW_PACKAGE_PREFIX}-python2-pygtk" pkgver=2.24.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for the GTK widget set (mingw-w64)" arch=(any) url="http://www.pygtk.org" license=('LGPL') groups=("${MINGW_PACKAGE_PREFIX}") depends=("${MINGW_PACKAGE_PREFIX}-python2-cairo" - "${MINGW_PACKAGE_PREFIX}-python2-gobject2" - "${MINGW_PACKAGE_PREFIX}-libglade") + "${MINGW_PACKAGE_PREFIX}-python2-gobject2" + "${MINGW_PACKAGE_PREFIX}-libglade") makedepends=("${MINGW_PACKAGE_PREFIX}-python2-numpy") options=('staticlibs' 'strip') source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.bz2 - python27.patch - no-undefined.patch - python-m4.patch) + 001-python27.patch + 002-no-undefined.patch + 003-python-m4.patch + 004-pygtk-demo.patch) md5sums=('a1051d5794fd7696d3c1af6422d17a49' '12acfacd26f19c504a0a2d0edeb66121' 'edd96a4d9f4b7a1b05094a78f9cc811b' - '2f1b6f04e36474e58abb259e22cc8309') + '2f1b6f04e36474e58abb259e22cc8309' + '0bc4e06ae97f52403b366592a5881316') prepare() { cd "${srcdir}/${_realname}-${pkgver}" - patch -p1 -i ${srcdir}/python27.patch - patch -p1 -i ${srcdir}/no-undefined.patch - patch -p1 -i ${srcdir}/python-m4.patch + patch -p1 -i ${srcdir}/001-python27.patch + patch -p1 -i ${srcdir}/002-no-undefined.patch + patch -p1 -i ${srcdir}/003-python-m4.patch + patch -p1 -i ${srcdir}/004-pygtk-demo.patch + autoreconf -fi -I m4 #WANT_AUTOMAKE=latest ./autogen.sh }