[arch-commits] Commit in python2-traitsui/repos/community-any (3 files)

[Andrzej Giniewicz]

    Date: Saturday, March 21, 2015 @ 12:03:23
  Author: aginiewicz
Revision: 129678

archrelease: copy trunk to community-any

Added:
  python2-traitsui/repos/community-any/PKGBUILD
    (from rev 129677, python2-traitsui/trunk/PKGBUILD)
  python2-traitsui/repos/community-any/wx28.patch
    (from rev 129677, python2-traitsui/trunk/wx28.patch)
Deleted:
  python2-traitsui/repos/community-any/PKGBUILD

------------+
 PKGBUILD   |   68 ++++++++++++++++++++++++++++++++---------------------------
 wx28.patch |   12 ++++++++++
 2 files changed, 49 insertions(+), 31 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-21 11:03:15 UTC (rev 129677)
+++ PKGBUILD	2015-03-21 11:03:23 UTC (rev 129678)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrzej Giniewicz <gginiu at gmail.com>
-
-pkgname=python2-traitsui
-pkgver=4.4.0
-pkgrel=1
-pkgdesc="Traits-capable user interfaces"
-arch=('any')
-url="https://github.com/enthought/traitsui"
-license=('BSD')
-depends=('python2-pyface')
-makedepends=('python2-setuptools')
-options=(!emptydirs)
-
-source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traitsui/archive/${pkgver}.tar.gz")
-md5sums=('02b79ca4f2773394bd7c412d331c51d2')
-
-build() {
-  cd "$srcdir"/traitsui-$pkgver
-
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir"/traitsui-$pkgver
-
-  python2 setup.py install --root="$pkgdir"/ --optimize=1
-
-  install -D LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-

Copied: python2-traitsui/repos/community-any/PKGBUILD (from rev 129677, python2-traitsui/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-03-21 11:03:23 UTC (rev 129678)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrzej Giniewicz <gginiu at gmail.com>
+
+pkgname=python2-traitsui
+pkgver=4.4.0
+pkgrel=2
+pkgdesc="Traits-capable user interfaces"
+arch=('any')
+url="https://github.com/enthought/traitsui"
+license=('BSD')
+depends=('python2-pyface')
+makedepends=('python2-setuptools')
+options=(!emptydirs)
+
+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
+}
+
+package() {
+  cd "$srcdir"/traitsui-$pkgver
+
+  python2 setup.py install --root="$pkgdir"/ --optimize=1
+
+  install -D LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+

Copied: python2-traitsui/repos/community-any/wx28.patch (from rev 129677, python2-traitsui/trunk/wx28.patch)
===================================================================
--- wx28.patch	                        (rev 0)
+++ wx28.patch	2015-03-21 11:03:23 UTC (rev 129678)
@@ -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
+ 
+