git » qscintilla.git » commit 69d1fe6

Update to 2.10.1

author Antonio Rojas
2017-07-06 06:23:29 UTC
committer Antonio Rojas
2017-07-06 06:23:29 UTC
parent e03cf3dfbf9bb1b79008001070e07aa991536b87

Update to 2.10.1

PKGBUILD +3 -7
qscintilla-python-infinite-loop.patch +0 -11

diff --git a/PKGBUILD b/PKGBUILD
index 306722e..778d42b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,21 +7,17 @@ pkgname=('qscintilla-qt4' 'python-qscintilla-qt4' 'python2-qscintilla-qt4'
          'python-qscintilla-qt4-common'
          'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5'
          'python-qscintilla-qt5-common')
-pkgver=2.10
+pkgver=2.10.1
 pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python-pyqt4' 'python2-pyqt4' 'python-pyqt5' 'python2-pyqt5' 'qt5-tools')
 options=('!buildflags') # Fix Qt Designer plugin
-source=("http://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz" 'qscintilla-python-infinite-loop.patch')
-md5sums=('a61eb0d598b6787de18450574c2ad3b4'
-         '18892160a8a430e6921ba3014fc619e8')
+source=("http://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz")
+md5sums=('e6d74c445bae69ba335acef65d526260')
 
 prepare() {
-# Fix infinite loop
-  (cd QScintilla_gpl-${pkgver}; patch -p1 -i "${srcdir}"/qscintilla-python-infinite-loop.patch)
-
   cp -a QScintilla_gpl-${pkgver}{,-qt4}
 }
 
diff --git a/qscintilla-python-infinite-loop.patch b/qscintilla-python-infinite-loop.patch
deleted file mode 100644
index ddaf0c0..0000000
--- a/qscintilla-python-infinite-loop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- QScintilla_gpl-2.9.4/Python/configure.py.orig	2017-02-03 21:30:08.943203061 +0100
-+++ QScintilla_gpl-2.9.4/Python/configure.py	2017-02-03 21:29:50.836480389 +0100
-@@ -1318,8 +1318,6 @@
-     sip_file = module_config.get_sip_file(target_config)
- 
-     head, tail = os.path.split(sip_file)
--    while head:
--        head, tail = os.path.split(head)
- 
-     if tail != sip_file:
-         argv.append('-I')