git » qscintilla.git » commit ffc07c4

diff --git a/PKGBUILD b/PKGBUILD
index dcdf413..d982feb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,22 +7,26 @@ 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.9.3
-pkgrel=2
+pkgver=2.9.4
+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"
-        'configure.py-objdir-support.diff' 'QScintilla_gpl-2.9.2-qt5.patch')
-md5sums=('3b1cdbce9ef6c28cd868bcc58219f96e'
-         '0a952497a52c85bf5c09dd2ee091e763'
-         'd7b1504fc0c61042a85e44792e462b37')
+        'configure.py-objdir-support.diff' 'QScintilla_gpl-2.9.2-qt5.patch' 'qscintilla-python-infinite-loop.patch')
+md5sums=('e60d61ca1ee1dca8df25fe15d8ca7112'
+         '21d3b42ab64a46dd88c252b0e4c7ff00'
+         'd7b1504fc0c61042a85e44792e462b37'
+         '18892160a8a430e6921ba3014fc619e8')
 
 prepare() {
   (cd QScintilla_gpl-${pkgver}; patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff)
 
+# Fix infinite loop
+  (cd QScintilla_gpl-${pkgver}; patch -p1 -i "${srcdir}"/qscintilla-python-infinite-loop.patch)
+
   cp -a QScintilla_gpl-${pkgver}{,-qt4}
 
   # Patch from Fedora
@@ -30,22 +34,25 @@ prepare() {
 }
 
 build() {
-    cd "$srcdir"/QScintilla_gpl-${pkgver}/Qt4Qt5
+    cd "$srcdir"/QScintilla_gpl-${pkgver}
+    export QMAKEFEATURES=$PWD/Qt4Qt5/features/
+
+    cd Qt4Qt5
     qmake-qt5 qscintilla.pro
     make
 
     cd ../designer-Qt4Qt5
-    QMAKEFEATURES=../Qt4Qt5/features qmake-qt5 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+    qmake-qt5 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
     make
 
     cd ../
     cp -rf Python Python2
     cd Python
-    QMAKEFEATURES=../Qt4Qt5/features python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
+    python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
     make
 
     cd ../Python2
-    QMAKEFEATURES=../Qt4Qt5/features python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
+    python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
     make
 
     cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
@@ -53,17 +60,17 @@ build() {
     make
 
     cd ../designer-Qt4Qt5
-    QMAKEFEATURES=../Qt4Qt5/features qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+    qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
     make
 
     cd ../
     cp -rf Python Python2
     cd Python
-    QMAKEFEATURES=../Qt4Qt5/features python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+    python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
     make
 
     cd ../Python2
-    QMAKEFEATURES=../Qt4Qt5/features python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
     make
 }
 
@@ -86,8 +93,7 @@ package_python-qscintilla-qt5-common() {
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
     # Provided by python-qscintilla
-    rm "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt5/Qsci{.so,.pyi}
-    rmdir "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt5
+    rm -r "${pkgdir}"/usr/lib
 }
 
 package_python-qscintilla-qt5() {
@@ -95,10 +101,10 @@ package_python-qscintilla-qt5() {
     depends=('python-qscintilla-qt5-common' 'python-pyqt5')
 
     cd QScintilla_gpl-${pkgver}/Python
-    install -Dm755 Qsci.so \
-      "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt5/Qsci.so
-    install -Dm755 Qsci.pyi \
-      "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt5/Qsci.pyi
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla-common
+    rm -r "${pkgdir}"/usr/share
 }
 
 package_python2-qscintilla-qt5() {
@@ -106,10 +112,10 @@ package_python2-qscintilla-qt5() {
     depends=('python-qscintilla-qt5-common' 'python2-pyqt5')
 
     cd QScintilla_gpl-${pkgver}/Python2
-    install -Dm755 Qsci.so \
-      "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt5/Qsci.so
-    install -Dm755 Qsci.pyi \
-      "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt5/Qsci.pyi
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla
+    rm -r "${pkgdir}"/usr/share
 }
 
 package_qscintilla-qt4() {
@@ -137,8 +143,7 @@ package_python-qscintilla-qt4-common() {
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
     # Provided by python-qscintilla
-    rm "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt4/Qsci{.so,.pyi}
-    rmdir "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt4
+    rm -r "${pkgdir}"/usr/lib
 }
 
 package_python-qscintilla-qt4() {
@@ -149,10 +154,10 @@ package_python-qscintilla-qt4() {
     provides=("python-qscintilla=$pkgver")
 
     cd QScintilla_gpl-${pkgver}-qt4/Python
-    install -Dm755 Qsci.so \
-      "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt4/Qsci.so
-    install -Dm755 Qsci.pyi \
-      "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt4/Qsci.pyi
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python2-qscintilla-common
+    rm -r "${pkgdir}"/usr/share
 }
 
 package_python2-qscintilla-qt4() {
@@ -163,8 +168,8 @@ package_python2-qscintilla-qt4() {
     provides=("python2-qscintilla=$pkgver")
 
     cd QScintilla_gpl-${pkgver}-qt4/Python2
-    install -Dm755 Qsci.so \
-      "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
-    install -Dm755 Qsci.pyi \
-      "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.pyi
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python2-qscintilla-common
+    rm -r "${pkgdir}"/usr/share
 }
diff --git a/configure.py-objdir-support.diff b/configure.py-objdir-support.diff
index a2de59b..91a24cf 100644
--- a/configure.py-objdir-support.diff
+++ b/configure.py-objdir-support.diff
@@ -16,15 +16,6 @@ Index: qscintilla2-2.8.3+dfsg/Python/configure.py
  
  ###############################################################################
  # 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)
- 
-+        return # Debian: do not check for the installed version, we're good this way.
-+
-         lib_dir = target_configuration.qsci_lib_dir
-         if lib_dir is None:
-             lib_dir = target_configuration.qt_lib_dir
 @@ -264,7 +268,12 @@
          the target configuration.
          """
diff --git a/qscintilla-python-infinite-loop.patch b/qscintilla-python-infinite-loop.patch
new file mode 100644
index 0000000..ddaf0c0
--- /dev/null
+++ b/qscintilla-python-infinite-loop.patch
@@ -0,0 +1,11 @@
+--- 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')