[arch-commits] Commit in qscintilla/repos (14 files)

Antonio Rojas arojas at archlinux.org
Fri Feb 3 21:28:03 UTC 2017


    Date: Friday, February 3, 2017 @ 21:28:02
  Author: arojas
Revision: 287999

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qscintilla/repos/extra-i686/PKGBUILD
    (from rev 287998, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/extra-i686/QScintilla_gpl-2.9.2-qt5.patch
    (from rev 287998, qscintilla/trunk/QScintilla_gpl-2.9.2-qt5.patch)
  qscintilla/repos/extra-i686/configure.py-objdir-support.diff
    (from rev 287998, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/extra-i686/qscintilla-python-infinite-loop.patch
    (from rev 287998, qscintilla/trunk/qscintilla-python-infinite-loop.patch)
  qscintilla/repos/extra-x86_64/PKGBUILD
    (from rev 287998, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/extra-x86_64/QScintilla_gpl-2.9.2-qt5.patch
    (from rev 287998, qscintilla/trunk/QScintilla_gpl-2.9.2-qt5.patch)
  qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff
    (from rev 287998, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/extra-x86_64/qscintilla-python-infinite-loop.patch
    (from rev 287998, qscintilla/trunk/qscintilla-python-infinite-loop.patch)
Deleted:
  qscintilla/repos/extra-i686/PKGBUILD
  qscintilla/repos/extra-i686/QScintilla_gpl-2.9.2-qt5.patch
  qscintilla/repos/extra-i686/configure.py-objdir-support.diff
  qscintilla/repos/extra-x86_64/PKGBUILD
  qscintilla/repos/extra-x86_64/QScintilla_gpl-2.9.2-qt5.patch
  qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff

----------------------------------------------------+
 /PKGBUILD                                          |  352 +++++++++++++++++++
 /QScintilla_gpl-2.9.2-qt5.patch                    |   72 +++
 /configure.py-objdir-support.diff                  |   64 +++
 extra-i686/PKGBUILD                                |  171 ---------
 extra-i686/QScintilla_gpl-2.9.2-qt5.patch          |   36 -
 extra-i686/configure.py-objdir-support.diff        |   41 --
 extra-i686/qscintilla-python-infinite-loop.patch   |   11 
 extra-x86_64/PKGBUILD                              |  171 ---------
 extra-x86_64/QScintilla_gpl-2.9.2-qt5.patch        |   36 -
 extra-x86_64/configure.py-objdir-support.diff      |   41 --
 extra-x86_64/qscintilla-python-infinite-loop.patch |   11 
 11 files changed, 510 insertions(+), 496 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-03 21:27:06 UTC (rev 287998)
+++ extra-i686/PKGBUILD	2017-02-03 21:28:02 UTC (rev 287999)
@@ -1,171 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-
-pkgbase=qscintilla
-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
-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')
-
-prepare() {
-  (cd QScintilla_gpl-${pkgver}; patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff)
-
-  cp -a QScintilla_gpl-${pkgver}{,-qt4}
-
-  # Patch from Fedora
-  (cd QScintilla_gpl-${pkgver}; patch -p1 -i "${srcdir}"/QScintilla_gpl-2.9.2-qt5.patch)
-}
-
-build() {
-    cd "$srcdir"/QScintilla_gpl-${pkgver}/Qt4Qt5
-    qmake-qt5 qscintilla.pro
-    make
-
-    cd ../designer-Qt4Qt5
-    QMAKEFEATURES=../Qt4Qt5/features 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
-    make
-
-    cd ../Python2
-    QMAKEFEATURES=../Qt4Qt5/features python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
-    make
-
-    cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
-    qmake-qt4 qscintilla.pro
-    make
-
-    cd ../designer-Qt4Qt5
-    QMAKEFEATURES=../Qt4Qt5/features 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
-    make
-
-    cd ../Python2
-    QMAKEFEATURES=../Qt4Qt5/features python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
-    make
-}
-
-package_qscintilla-qt5() {
-    pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt5-base')
-
-    cd QScintilla_gpl-${pkgver}/Qt4Qt5
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    cd ../designer-Qt4Qt5
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python-qscintilla-qt5-common() {
-    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt5 and python2-qscintilla-qt5"
-    depends=('qscintilla-qt5')
-
-    cd QScintilla_gpl-${pkgver}/Python
-    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
-}
-
-package_python-qscintilla-qt5() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    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
-}
-
-package_python2-qscintilla-qt5() {
-    pkgdesc="Python 2.x bindings for QScintilla2"
-    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
-}
-
-package_qscintilla-qt4() {
-    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt4')
-    replaces=('qscintilla<2.9.1')
-    conflicts=('qscintilla<2.9.1')
-    provides=("qscintilla=$pkgver")
-
-    cd QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    cd ../designer-Qt4Qt5
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python-qscintilla-qt4-common() {
-    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt4 and python2-qscintilla-qt4"
-    depends=('qscintilla-qt4')
-    replaces=('python-qscintilla-common<2.9.1')
-    conflicts=('python-qscintilla-common<2.9.1')
-    provides=("python-qscintilla-common=$pkgver")
-
-    cd QScintilla_gpl-${pkgver}-qt4/Python
-    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
-}
-
-package_python-qscintilla-qt4() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    depends=('python-qscintilla-qt4-common' 'python-pyqt4')
-    replaces=('python-qscintilla<2.9.1')
-    conflicts=('python-qscintilla<2.9.1')
-    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
-}
-
-package_python2-qscintilla-qt4() {
-    pkgdesc="Python 2.x bindings for QScintilla2"
-    depends=('python-qscintilla-qt4-common' 'python2-pyqt4')
-    replaces=('python2-qscintilla<2.9.1')
-    conflicts=('python2-qscintilla<2.9.1')
-    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
-}

Copied: qscintilla/repos/extra-i686/PKGBUILD (from rev 287998, qscintilla/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-03 21:28:02 UTC (rev 287999)
@@ -0,0 +1,176 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+pkgbase=qscintilla
+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.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' '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
+  (cd QScintilla_gpl-${pkgver}; patch -p1 -i "${srcdir}"/QScintilla_gpl-2.9.2-qt5.patch)
+}
+
+build() {
+    cd "$srcdir"/QScintilla_gpl-${pkgver}
+    export QMAKEFEATURES=$PWD/Qt4Qt5/features/
+
+    cd Qt4Qt5
+    qmake-qt5 qscintilla.pro
+    make
+
+    cd ../designer-Qt4Qt5
+    qmake-qt5 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+    make
+
+    cd ../
+    cp -rf Python Python2
+    cd Python
+    python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
+    make
+
+    cd ../Python2
+    python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
+    make
+
+    cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
+    qmake-qt4 qscintilla.pro
+    make
+
+    cd ../designer-Qt4Qt5
+    qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+    make
+
+    cd ../
+    cp -rf Python Python2
+    cd Python
+    python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+    make
+
+    cd ../Python2
+    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+    make
+}
+
+package_qscintilla-qt5() {
+    pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class"
+    depends=('qt5-base')
+
+    cd QScintilla_gpl-${pkgver}/Qt4Qt5
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    cd ../designer-Qt4Qt5
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-qt5-common() {
+    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt5 and python2-qscintilla-qt5"
+    depends=('qscintilla-qt5')
+
+    cd QScintilla_gpl-${pkgver}/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla
+    rm -r "${pkgdir}"/usr/lib
+}
+
+package_python-qscintilla-qt5() {
+    pkgdesc="Python 3.x bindings for QScintilla2"
+    depends=('python-qscintilla-qt5-common' 'python-pyqt5')
+
+    cd QScintilla_gpl-${pkgver}/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla-common
+    rm -r "${pkgdir}"/usr/share
+}
+
+package_python2-qscintilla-qt5() {
+    pkgdesc="Python 2.x bindings for QScintilla2"
+    depends=('python-qscintilla-qt5-common' 'python2-pyqt5')
+
+    cd QScintilla_gpl-${pkgver}/Python2
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla
+    rm -r "${pkgdir}"/usr/share
+}
+
+package_qscintilla-qt4() {
+    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+    depends=('qt4')
+    replaces=('qscintilla<2.9.1')
+    conflicts=('qscintilla<2.9.1')
+    provides=("qscintilla=$pkgver")
+
+    cd QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    cd ../designer-Qt4Qt5
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-qt4-common() {
+    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt4 and python2-qscintilla-qt4"
+    depends=('qscintilla-qt4')
+    replaces=('python-qscintilla-common<2.9.1')
+    conflicts=('python-qscintilla-common<2.9.1')
+    provides=("python-qscintilla-common=$pkgver")
+
+    cd QScintilla_gpl-${pkgver}-qt4/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla
+    rm -r "${pkgdir}"/usr/lib
+}
+
+package_python-qscintilla-qt4() {
+    pkgdesc="Python 3.x bindings for QScintilla2"
+    depends=('python-qscintilla-qt4-common' 'python-pyqt4')
+    replaces=('python-qscintilla<2.9.1')
+    conflicts=('python-qscintilla<2.9.1')
+    provides=("python-qscintilla=$pkgver")
+
+    cd QScintilla_gpl-${pkgver}-qt4/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python2-qscintilla-common
+    rm -r "${pkgdir}"/usr/share
+}
+
+package_python2-qscintilla-qt4() {
+    pkgdesc="Python 2.x bindings for QScintilla2"
+    depends=('python-qscintilla-qt4-common' 'python2-pyqt4')
+    replaces=('python2-qscintilla<2.9.1')
+    conflicts=('python2-qscintilla<2.9.1')
+    provides=("python2-qscintilla=$pkgver")
+
+    cd QScintilla_gpl-${pkgver}-qt4/Python2
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python2-qscintilla-common
+    rm -r "${pkgdir}"/usr/share
+}

Deleted: extra-i686/QScintilla_gpl-2.9.2-qt5.patch
===================================================================
--- extra-i686/QScintilla_gpl-2.9.2-qt5.patch	2017-02-03 21:27:06 UTC (rev 287998)
+++ extra-i686/QScintilla_gpl-2.9.2-qt5.patch	2017-02-03 21:28:02 UTC (rev 287999)
@@ -1,36 +0,0 @@
-diff -up QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf
---- QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5	2016-04-18 04:08:48.000000000 -0500
-+++ QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf	2016-04-18 08:13:23.935665305 -0500
-@@ -19,9 +19,17 @@ CONFIG(debug, debug|release) {
-         win32: {
-             LIBS += -lqscintilla2d
-         } else {
-+        greaterThan(QT_MAJOR_VERSION, 4) {
-+            LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
-+        } else {
-             LIBS += -lqscintilla2
-         }
-+        }
-     }
- } else {
-+greaterThan(QT_MAJOR_VERSION, 4) {
-+    LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
-+} else {
-     LIBS += -lqscintilla2
- }
-+}
-diff -up QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro
---- QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5	2016-04-18 08:13:23.951665381 -0500
-+++ QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro	2016-04-18 08:14:20.807934597 -0500
-@@ -23,7 +23,11 @@
- !win32:VERSION = 12.0.1
- 
- TEMPLATE = lib
-+greaterThan(QT_MAJOR_VERSION, 4) {
-+TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
-+} else {
- TARGET = qscintilla2
-+}
- CONFIG += qt warn_off release thread exceptions hide_symbols
- INCLUDEPATH += . ../include ../lexlib ../src
- 

Copied: qscintilla/repos/extra-i686/QScintilla_gpl-2.9.2-qt5.patch (from rev 287998, qscintilla/trunk/QScintilla_gpl-2.9.2-qt5.patch)
===================================================================
--- extra-i686/QScintilla_gpl-2.9.2-qt5.patch	                        (rev 0)
+++ extra-i686/QScintilla_gpl-2.9.2-qt5.patch	2017-02-03 21:28:02 UTC (rev 287999)
@@ -0,0 +1,36 @@
+diff -up QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf
+--- QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5	2016-04-18 04:08:48.000000000 -0500
++++ QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf	2016-04-18 08:13:23.935665305 -0500
+@@ -19,9 +19,17 @@ CONFIG(debug, debug|release) {
+         win32: {
+             LIBS += -lqscintilla2d
+         } else {
++        greaterThan(QT_MAJOR_VERSION, 4) {
++            LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
++        } else {
+             LIBS += -lqscintilla2
+         }
++        }
+     }
+ } else {
++greaterThan(QT_MAJOR_VERSION, 4) {
++    LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
++} else {
+     LIBS += -lqscintilla2
+ }
++}
+diff -up QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro
+--- QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5	2016-04-18 08:13:23.951665381 -0500
++++ QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro	2016-04-18 08:14:20.807934597 -0500
+@@ -23,7 +23,11 @@
+ !win32:VERSION = 12.0.1
+ 
+ TEMPLATE = lib
++greaterThan(QT_MAJOR_VERSION, 4) {
++TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
++} else {
+ TARGET = qscintilla2
++}
+ CONFIG += qt warn_off release thread exceptions hide_symbols
+ INCLUDEPATH += . ../include ../lexlib ../src
+ 

Deleted: extra-i686/configure.py-objdir-support.diff
===================================================================
--- extra-i686/configure.py-objdir-support.diff	2017-02-03 21:27:06 UTC (rev 287998)
+++ extra-i686/configure.py-objdir-support.diff	2017-02-03 21:28:02 UTC (rev 287999)
@@ -1,41 +0,0 @@
-02_configure.dpatch by Torsten Marek <shlomme at debian.org>
-Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
-<scott at kitterman.com>
-patch the configure script for the Python bindings to support object dir
-builds
-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 optparse
- import sys
- 
-+src_dir = os.path.dirname(os.path.abspath(__file__))
-+
- 
- ###############################################################################
- # 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.
-         """
- 
--        return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
-+        if target_configuration.pyqt_package == 'PyQt5':
-+            return os.path.join(src_dir, 'sip/qscimod5.sip')
-+        else:
-+            return os.path.join(src_dir, 'sip/qscimod4.sip')
-+
-+        #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
- 
-     def get_sip_installs(self, target_configuration):
-         """ Return a tuple of the installation directory of the module's .sip

Copied: qscintilla/repos/extra-i686/configure.py-objdir-support.diff (from rev 287998, qscintilla/trunk/configure.py-objdir-support.diff)
===================================================================
--- extra-i686/configure.py-objdir-support.diff	                        (rev 0)
+++ extra-i686/configure.py-objdir-support.diff	2017-02-03 21:28:02 UTC (rev 287999)
@@ -0,0 +1,32 @@
+02_configure.dpatch by Torsten Marek <shlomme at debian.org>
+Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
+<scott at kitterman.com>
+patch the configure script for the Python bindings to support object dir
+builds
+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 optparse
+ import sys
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ 
+ ###############################################################################
+ # You shouldn't need to modify anything above this line.
+@@ -264,7 +268,12 @@
+         the target configuration.
+         """
+ 
+-        return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
++        if target_configuration.pyqt_package == 'PyQt5':
++            return os.path.join(src_dir, 'sip/qscimod5.sip')
++        else:
++            return os.path.join(src_dir, 'sip/qscimod4.sip')
++
++        #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
+ 
+     def get_sip_installs(self, target_configuration):
+         """ Return a tuple of the installation directory of the module's .sip

Copied: qscintilla/repos/extra-i686/qscintilla-python-infinite-loop.patch (from rev 287998, qscintilla/trunk/qscintilla-python-infinite-loop.patch)
===================================================================
--- extra-i686/qscintilla-python-infinite-loop.patch	                        (rev 0)
+++ extra-i686/qscintilla-python-infinite-loop.patch	2017-02-03 21:28:02 UTC (rev 287999)
@@ -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')

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-02-03 21:27:06 UTC (rev 287998)
+++ extra-x86_64/PKGBUILD	2017-02-03 21:28:02 UTC (rev 287999)
@@ -1,171 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-
-pkgbase=qscintilla
-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
-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')
-
-prepare() {
-  (cd QScintilla_gpl-${pkgver}; patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff)
-
-  cp -a QScintilla_gpl-${pkgver}{,-qt4}
-
-  # Patch from Fedora
-  (cd QScintilla_gpl-${pkgver}; patch -p1 -i "${srcdir}"/QScintilla_gpl-2.9.2-qt5.patch)
-}
-
-build() {
-    cd "$srcdir"/QScintilla_gpl-${pkgver}/Qt4Qt5
-    qmake-qt5 qscintilla.pro
-    make
-
-    cd ../designer-Qt4Qt5
-    QMAKEFEATURES=../Qt4Qt5/features 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
-    make
-
-    cd ../Python2
-    QMAKEFEATURES=../Qt4Qt5/features python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
-    make
-
-    cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
-    qmake-qt4 qscintilla.pro
-    make
-
-    cd ../designer-Qt4Qt5
-    QMAKEFEATURES=../Qt4Qt5/features 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
-    make
-
-    cd ../Python2
-    QMAKEFEATURES=../Qt4Qt5/features python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
-    make
-}
-
-package_qscintilla-qt5() {
-    pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt5-base')
-
-    cd QScintilla_gpl-${pkgver}/Qt4Qt5
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    cd ../designer-Qt4Qt5
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python-qscintilla-qt5-common() {
-    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt5 and python2-qscintilla-qt5"
-    depends=('qscintilla-qt5')
-
-    cd QScintilla_gpl-${pkgver}/Python
-    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
-}
-
-package_python-qscintilla-qt5() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    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
-}
-
-package_python2-qscintilla-qt5() {
-    pkgdesc="Python 2.x bindings for QScintilla2"
-    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
-}
-
-package_qscintilla-qt4() {
-    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt4')
-    replaces=('qscintilla<2.9.1')
-    conflicts=('qscintilla<2.9.1')
-    provides=("qscintilla=$pkgver")
-
-    cd QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    cd ../designer-Qt4Qt5
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python-qscintilla-qt4-common() {
-    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt4 and python2-qscintilla-qt4"
-    depends=('qscintilla-qt4')
-    replaces=('python-qscintilla-common<2.9.1')
-    conflicts=('python-qscintilla-common<2.9.1')
-    provides=("python-qscintilla-common=$pkgver")
-
-    cd QScintilla_gpl-${pkgver}-qt4/Python
-    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
-}
-
-package_python-qscintilla-qt4() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    depends=('python-qscintilla-qt4-common' 'python-pyqt4')
-    replaces=('python-qscintilla<2.9.1')
-    conflicts=('python-qscintilla<2.9.1')
-    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
-}
-
-package_python2-qscintilla-qt4() {
-    pkgdesc="Python 2.x bindings for QScintilla2"
-    depends=('python-qscintilla-qt4-common' 'python2-pyqt4')
-    replaces=('python2-qscintilla<2.9.1')
-    conflicts=('python2-qscintilla<2.9.1')
-    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
-}

Copied: qscintilla/repos/extra-x86_64/PKGBUILD (from rev 287998, qscintilla/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-03 21:28:02 UTC (rev 287999)
@@ -0,0 +1,176 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+pkgbase=qscintilla
+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.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' '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
+  (cd QScintilla_gpl-${pkgver}; patch -p1 -i "${srcdir}"/QScintilla_gpl-2.9.2-qt5.patch)
+}
+
+build() {
+    cd "$srcdir"/QScintilla_gpl-${pkgver}
+    export QMAKEFEATURES=$PWD/Qt4Qt5/features/
+
+    cd Qt4Qt5
+    qmake-qt5 qscintilla.pro
+    make
+
+    cd ../designer-Qt4Qt5
+    qmake-qt5 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+    make
+
+    cd ../
+    cp -rf Python Python2
+    cd Python
+    python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
+    make
+
+    cd ../Python2
+    python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
+    make
+
+    cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
+    qmake-qt4 qscintilla.pro
+    make
+
+    cd ../designer-Qt4Qt5
+    qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+    make
+
+    cd ../
+    cp -rf Python Python2
+    cd Python
+    python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+    make
+
+    cd ../Python2
+    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+    make
+}
+
+package_qscintilla-qt5() {
+    pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class"
+    depends=('qt5-base')
+
+    cd QScintilla_gpl-${pkgver}/Qt4Qt5
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    cd ../designer-Qt4Qt5
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-qt5-common() {
+    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt5 and python2-qscintilla-qt5"
+    depends=('qscintilla-qt5')
+
+    cd QScintilla_gpl-${pkgver}/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla
+    rm -r "${pkgdir}"/usr/lib
+}
+
+package_python-qscintilla-qt5() {
+    pkgdesc="Python 3.x bindings for QScintilla2"
+    depends=('python-qscintilla-qt5-common' 'python-pyqt5')
+
+    cd QScintilla_gpl-${pkgver}/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla-common
+    rm -r "${pkgdir}"/usr/share
+}
+
+package_python2-qscintilla-qt5() {
+    pkgdesc="Python 2.x bindings for QScintilla2"
+    depends=('python-qscintilla-qt5-common' 'python2-pyqt5')
+
+    cd QScintilla_gpl-${pkgver}/Python2
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla
+    rm -r "${pkgdir}"/usr/share
+}
+
+package_qscintilla-qt4() {
+    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+    depends=('qt4')
+    replaces=('qscintilla<2.9.1')
+    conflicts=('qscintilla<2.9.1')
+    provides=("qscintilla=$pkgver")
+
+    cd QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    cd ../designer-Qt4Qt5
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-qt4-common() {
+    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt4 and python2-qscintilla-qt4"
+    depends=('qscintilla-qt4')
+    replaces=('python-qscintilla-common<2.9.1')
+    conflicts=('python-qscintilla-common<2.9.1')
+    provides=("python-qscintilla-common=$pkgver")
+
+    cd QScintilla_gpl-${pkgver}-qt4/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla
+    rm -r "${pkgdir}"/usr/lib
+}
+
+package_python-qscintilla-qt4() {
+    pkgdesc="Python 3.x bindings for QScintilla2"
+    depends=('python-qscintilla-qt4-common' 'python-pyqt4')
+    replaces=('python-qscintilla<2.9.1')
+    conflicts=('python-qscintilla<2.9.1')
+    provides=("python-qscintilla=$pkgver")
+
+    cd QScintilla_gpl-${pkgver}-qt4/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python2-qscintilla-common
+    rm -r "${pkgdir}"/usr/share
+}
+
+package_python2-qscintilla-qt4() {
+    pkgdesc="Python 2.x bindings for QScintilla2"
+    depends=('python-qscintilla-qt4-common' 'python2-pyqt4')
+    replaces=('python2-qscintilla<2.9.1')
+    conflicts=('python2-qscintilla<2.9.1')
+    provides=("python2-qscintilla=$pkgver")
+
+    cd QScintilla_gpl-${pkgver}-qt4/Python2
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python2-qscintilla-common
+    rm -r "${pkgdir}"/usr/share
+}

Deleted: extra-x86_64/QScintilla_gpl-2.9.2-qt5.patch
===================================================================
--- extra-x86_64/QScintilla_gpl-2.9.2-qt5.patch	2017-02-03 21:27:06 UTC (rev 287998)
+++ extra-x86_64/QScintilla_gpl-2.9.2-qt5.patch	2017-02-03 21:28:02 UTC (rev 287999)
@@ -1,36 +0,0 @@
-diff -up QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf
---- QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5	2016-04-18 04:08:48.000000000 -0500
-+++ QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf	2016-04-18 08:13:23.935665305 -0500
-@@ -19,9 +19,17 @@ CONFIG(debug, debug|release) {
-         win32: {
-             LIBS += -lqscintilla2d
-         } else {
-+        greaterThan(QT_MAJOR_VERSION, 4) {
-+            LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
-+        } else {
-             LIBS += -lqscintilla2
-         }
-+        }
-     }
- } else {
-+greaterThan(QT_MAJOR_VERSION, 4) {
-+    LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
-+} else {
-     LIBS += -lqscintilla2
- }
-+}
-diff -up QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro
---- QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5	2016-04-18 08:13:23.951665381 -0500
-+++ QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro	2016-04-18 08:14:20.807934597 -0500
-@@ -23,7 +23,11 @@
- !win32:VERSION = 12.0.1
- 
- TEMPLATE = lib
-+greaterThan(QT_MAJOR_VERSION, 4) {
-+TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
-+} else {
- TARGET = qscintilla2
-+}
- CONFIG += qt warn_off release thread exceptions hide_symbols
- INCLUDEPATH += . ../include ../lexlib ../src
- 

Copied: qscintilla/repos/extra-x86_64/QScintilla_gpl-2.9.2-qt5.patch (from rev 287998, qscintilla/trunk/QScintilla_gpl-2.9.2-qt5.patch)
===================================================================
--- extra-x86_64/QScintilla_gpl-2.9.2-qt5.patch	                        (rev 0)
+++ extra-x86_64/QScintilla_gpl-2.9.2-qt5.patch	2017-02-03 21:28:02 UTC (rev 287999)
@@ -0,0 +1,36 @@
+diff -up QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf
+--- QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5	2016-04-18 04:08:48.000000000 -0500
++++ QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf	2016-04-18 08:13:23.935665305 -0500
+@@ -19,9 +19,17 @@ CONFIG(debug, debug|release) {
+         win32: {
+             LIBS += -lqscintilla2d
+         } else {
++        greaterThan(QT_MAJOR_VERSION, 4) {
++            LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
++        } else {
+             LIBS += -lqscintilla2
+         }
++        }
+     }
+ } else {
++greaterThan(QT_MAJOR_VERSION, 4) {
++    LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
++} else {
+     LIBS += -lqscintilla2
+ }
++}
+diff -up QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro
+--- QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5	2016-04-18 08:13:23.951665381 -0500
++++ QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro	2016-04-18 08:14:20.807934597 -0500
+@@ -23,7 +23,11 @@
+ !win32:VERSION = 12.0.1
+ 
+ TEMPLATE = lib
++greaterThan(QT_MAJOR_VERSION, 4) {
++TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
++} else {
+ TARGET = qscintilla2
++}
+ CONFIG += qt warn_off release thread exceptions hide_symbols
+ INCLUDEPATH += . ../include ../lexlib ../src
+ 

Deleted: extra-x86_64/configure.py-objdir-support.diff
===================================================================
--- extra-x86_64/configure.py-objdir-support.diff	2017-02-03 21:27:06 UTC (rev 287998)
+++ extra-x86_64/configure.py-objdir-support.diff	2017-02-03 21:28:02 UTC (rev 287999)
@@ -1,41 +0,0 @@
-02_configure.dpatch by Torsten Marek <shlomme at debian.org>
-Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
-<scott at kitterman.com>
-patch the configure script for the Python bindings to support object dir
-builds
-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 optparse
- import sys
- 
-+src_dir = os.path.dirname(os.path.abspath(__file__))
-+
- 
- ###############################################################################
- # 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.
-         """
- 
--        return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
-+        if target_configuration.pyqt_package == 'PyQt5':
-+            return os.path.join(src_dir, 'sip/qscimod5.sip')
-+        else:
-+            return os.path.join(src_dir, 'sip/qscimod4.sip')
-+
-+        #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
- 
-     def get_sip_installs(self, target_configuration):
-         """ Return a tuple of the installation directory of the module's .sip

Copied: qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff (from rev 287998, qscintilla/trunk/configure.py-objdir-support.diff)
===================================================================
--- extra-x86_64/configure.py-objdir-support.diff	                        (rev 0)
+++ extra-x86_64/configure.py-objdir-support.diff	2017-02-03 21:28:02 UTC (rev 287999)
@@ -0,0 +1,32 @@
+02_configure.dpatch by Torsten Marek <shlomme at debian.org>
+Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
+<scott at kitterman.com>
+patch the configure script for the Python bindings to support object dir
+builds
+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 optparse
+ import sys
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ 
+ ###############################################################################
+ # You shouldn't need to modify anything above this line.
+@@ -264,7 +268,12 @@
+         the target configuration.
+         """
+ 
+-        return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
++        if target_configuration.pyqt_package == 'PyQt5':
++            return os.path.join(src_dir, 'sip/qscimod5.sip')
++        else:
++            return os.path.join(src_dir, 'sip/qscimod4.sip')
++
++        #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
+ 
+     def get_sip_installs(self, target_configuration):
+         """ Return a tuple of the installation directory of the module's .sip

Copied: qscintilla/repos/extra-x86_64/qscintilla-python-infinite-loop.patch (from rev 287998, qscintilla/trunk/qscintilla-python-infinite-loop.patch)
===================================================================
--- extra-x86_64/qscintilla-python-infinite-loop.patch	                        (rev 0)
+++ extra-x86_64/qscintilla-python-infinite-loop.patch	2017-02-03 21:28:02 UTC (rev 287999)
@@ -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')



More information about the arch-commits mailing list