[arch-commits] Commit in python2-traitsui/trunk (PKGBUILD wx28.patch)

[Andrzej Giniewicz]

    Date: Saturday, March 21, 2015 @ 12:03:15
  Author: aginiewicz
Revision: 129677

upgpkg: python2-traitsui 4.4.0-2

python2-traitsui: force selection of wxpython 2.8 due to incompatibilities with wxpython 3.0

Added:
  python2-traitsui/trunk/wx28.patch
Modified:
  python2-traitsui/trunk/PKGBUILD

------------+
 PKGBUILD   |   12 +++++++++---
 wx28.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-21 10:52:29 UTC (rev 129676)
+++ PKGBUILD	2015-03-21 11:03:15 UTC (rev 129677)
@@ -3,7 +3,7 @@
 
 pkgname=python2-traitsui
 pkgver=4.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Traits-capable user interfaces"
 arch=('any')
 url="https://github.com/enthought/traitsui"
@@ -12,12 +12,18 @@
 makedepends=('python2-setuptools')
 options=(!emptydirs)
 
-source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traitsui/archive/${pkgver}.tar.gz")
-md5sums=('02b79ca4f2773394bd7c412d331c51d2')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traitsui/archive/${pkgver}.tar.gz" "wx28.patch")
+md5sums=('02b79ca4f2773394bd7c412d331c51d2'
+         '0baa7f7c9620871b5e472d033181db4d')
 
 build() {
   cd "$srcdir"/traitsui-$pkgver
 
+  # force selection of wxpython 2.8
+  # (see https://github.com/enthought/pyface/issues/96)
+  sed -e "s/^\(.*\)import wx$/\1import wxversion\n\1wxversion.select(\"2.8\")\n\1import wx/g" -i $(find . -name '*.py')
+  patch -p0 < ../wx28.patch
+
   python2 setup.py build
 }
 

Added: wx28.patch
===================================================================
--- wx28.patch	                        (rev 0)
+++ wx28.patch	2015-03-21 11:03:15 UTC (rev 129677)
@@ -0,0 +1,12 @@
+--- traitsui/toolkit.py.orig	2015-03-21 11:54:29.883107683 +0100
++++ traitsui/toolkit.py	2015-03-21 11:56:52.905373040 +0100
+@@ -48,6 +48,9 @@
+ #-------------------------------------------------------------------------------
+ 
+ def _import_toolkit ( name ):
++    if name == "wx":
++        import wxversion
++        wxversion.select("2.8")
+     return __import__( name, globals=globals(), level=1 ).toolkit
+ 
+