Date: Tuesday, July 7, 2015 @ 21:22:12 Author: aginiewicz Revision: 136538
upgpkg: python2-pyface 4.5.0-2 See https://github.com/enthought/pyface/commit/a67056ab91fce031967a63be66b5650dd4ca142b Added: python2-pyface/trunk/pygments2.patch Modified: python2-pyface/trunk/PKGBUILD -----------------+ PKGBUILD | 13 ++++++++++--- pygments2.patch | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-07-07 18:52:59 UTC (rev 136537) +++ PKGBUILD 2015-07-07 19:22:12 UTC (rev 136538) @@ -3,7 +3,7 @@ pkgname=python2-pyface pkgver=4.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Traits-capable windowing framework" arch=('any') url="https://github.com/enthought/pyface"; @@ -14,9 +14,16 @@ 'wxpython2.8: for wx backend') options=(!emptydirs) -source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/pyface/archive/${pkgver}.tar.gz";) -md5sums=('05ea27821ed63a457bf5d95892ac0cf0') +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 Added: pygments2.patch =================================================================== --- pygments2.patch (rev 0) +++ pygments2.patch 2015-07-07 19:22:12 UTC (rev 136538) @@ -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
