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

Andrzej Giniewicz aginiewicz at archlinux.org
Tue Jul 7 19:22:20 UTC 2015


    Date: Tuesday, July 7, 2015 @ 21:22:20
  Author: aginiewicz
Revision: 136539

archrelease: copy trunk to community-any

Added:
  python2-pyface/repos/community-any/PKGBUILD
    (from rev 136538, python2-pyface/trunk/PKGBUILD)
  python2-pyface/repos/community-any/pygments2.patch
    (from rev 136538, python2-pyface/trunk/pygments2.patch)
Deleted:
  python2-pyface/repos/community-any/PKGBUILD

-----------------+
 PKGBUILD        |   81 +++++++++++++++++++++++++++++-------------------------
 pygments2.patch |   20 +++++++++++++
 2 files changed, 64 insertions(+), 37 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-07 19:22:12 UTC (rev 136538)
+++ PKGBUILD	2015-07-07 19:22:20 UTC (rev 136539)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Andrzej Giniewicz <gginiu at gmail.com>
-
-pkgname=python2-pyface
-pkgver=4.5.0
-pkgrel=1
-pkgdesc="Traits-capable windowing framework"
-arch=('any')
-url="https://github.com/enthought/pyface"
-license=('BSD')
-depends=('python2-traits')
-makedepends=('python2-setuptools')
-optdepends=('python2-pyqt4: for Qt backend'
-            'wxpython2.8: for wx backend')
-options=(!emptydirs)
-
-source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz")
-md5sums=('05ea27821ed63a457bf5d95892ac0cf0')
-
-build() {
-  cd "$srcdir"/pyface-$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')
-
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir"/pyface-$pkgver
-
-  python2 setup.py install --root="$pkgdir"/ --optimize=1
-
-  install -D LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-

Copied: python2-pyface/repos/community-any/PKGBUILD (from rev 136538, python2-pyface/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-07-07 19:22:20 UTC (rev 136539)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Andrzej Giniewicz <gginiu at gmail.com>
+
+pkgname=python2-pyface
+pkgver=4.5.0
+pkgrel=2
+pkgdesc="Traits-capable windowing framework"
+arch=('any')
+url="https://github.com/enthought/pyface"
+license=('BSD')
+depends=('python2-traits')
+makedepends=('python2-setuptools')
+optdepends=('python2-pyqt4: for Qt backend'
+            'wxpython2.8: for wx backend')
+options=(!emptydirs)
+
+source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz" "pygments2.patch")
+md5sums=('05ea27821ed63a457bf5d95892ac0cf0'
+         'e874bda3e3871120c7c47bf0c632582f')
+
+prepare() {
+  cd "$srcdir"/pyface-$pkgver
+
+  patch -p0 < ../pygments2.patch
+}
+
+build() {
+  cd "$srcdir"/pyface-$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')
+
+  python2 setup.py build
+}
+
+package() {
+  cd "$srcdir"/pyface-$pkgver
+
+  python2 setup.py install --root="$pkgdir"/ --optimize=1
+
+  install -D LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+

Copied: python2-pyface/repos/community-any/pygments2.patch (from rev 136538, python2-pyface/trunk/pygments2.patch)
===================================================================
--- pygments2.patch	                        (rev 0)
+++ pygments2.patch	2015-07-07 19:22:20 UTC (rev 136539)
@@ -0,0 +1,20 @@
+--- pyface/ui/qt4/code_editor/pygments_highlighter.py.orig	2015-07-07 21:18:51.174941435 +0200
++++ pyface/ui/qt4/code_editor/pygments_highlighter.py	2015-07-07 21:19:29.448031232 +0200
+@@ -33,11 +33,12 @@
+         for rexmatch, action, new_state in statetokens:
+             m = rexmatch(text, pos)
+             if m:
+-                if type(action) is _TokenType:
+-                    yield pos, action, m.group()
+-                else:
+-                    for item in action(self, m):
+-                        yield item
++                if action is not None:
++                    if type(action) is _TokenType:
++                        yield pos, action, m.group()
++                    else:
++                        for item in action(self, m):
++                            yield item
+                 pos = m.end()
+                 if new_state is not None:
+                     # state transition



More information about the arch-commits mailing list