git » qscintilla.git » commit 7233273

upgpkg: 2.9-1

author Felix Yan
2015-04-29 09:27:33 UTC
committer Felix Yan
2015-04-29 09:27:33 UTC
parent 3155059e3e136df1ee5fa0bf15bf1f847f65f4fc

upgpkg: 2.9-1

PKGBUILD +6 -5
configure.py-objdir-support.diff +4 -4

diff --git a/PKGBUILD b/PKGBUILD
index 215cdb0..7e093e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
-pkgver=2.8.4
-pkgrel=3
+pkgver=2.9
+pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
@@ -13,8 +14,8 @@ makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
 options=('!buildflags') # Fix Qt Designer plugin
 source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
-md5sums=('28aec903ff48ae541295a4fb9c96f8ea'
-         'e304f8cd5e3e7ded61eda15bf56613a8')
+md5sums=('24659879edf9786f41a9b9268ce3c817'
+         '0a952497a52c85bf5c09dd2ee091e763')
 
 prepare() {
   cd QScintilla-gpl-${pkgver}
diff --git a/configure.py-objdir-support.diff b/configure.py-objdir-support.diff
index 6d2e708..a2de59b 100644
--- a/configure.py-objdir-support.diff
+++ b/configure.py-objdir-support.diff
@@ -8,14 +8,14 @@ Index: qscintilla2-2.8.3+dfsg/Python/configure.py
 --- qscintilla2-2.8.3+dfsg.orig/Python/configure.py	2014-07-05 10:02:02.318834374 -0400
 +++ qscintilla2-2.8.3+dfsg/Python/configure.py	2014-07-05 10:02:02.306834375 -0400
 @@ -31,6 +31,8 @@
- import glob
  import optparse
+ import sys
  
 +src_dir = os.path.dirname(os.path.abspath(__file__))
 +
- try:
-     import sysconfig
- except ImportError:
+ 
+ ###############################################################################
+ # You shouldn't need to modify anything above this line.
 @@ -210,6 +212,8 @@
                      "The QScintilla version number could not be determined by "
                      "reading %s." % sciglobal)