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

Felix Yan fyan at archlinux.org
Wed Nov 19 12:42:19 UTC 2014


    Date: Wednesday, November 19, 2014 @ 13:42:19
  Author: fyan
Revision: 226388

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

Added:
  qscintilla/repos/extra-i686/PKGBUILD
    (from rev 226387, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/extra-i686/configure.py-objdir-support.diff
    (from rev 226387, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/extra-x86_64/PKGBUILD
    (from rev 226387, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff
    (from rev 226387, qscintilla/trunk/configure.py-objdir-support.diff)
Deleted:
  qscintilla/repos/extra-i686/PKGBUILD
  qscintilla/repos/extra-i686/configure.py-objdir-support.diff
  qscintilla/repos/extra-i686/qsci_link.patch
  qscintilla/repos/extra-x86_64/PKGBUILD
  qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff
  qscintilla/repos/extra-x86_64/qsci_link.patch

-----------------------------------------------+
 /PKGBUILD                                     |  166 ++++++++++++++++++++++++
 /configure.py-objdir-support.diff             |   82 +++++++++++
 extra-i686/PKGBUILD                           |   86 ------------
 extra-i686/configure.py-objdir-support.diff   |   41 -----
 extra-i686/qsci_link.patch                    |   16 --
 extra-x86_64/PKGBUILD                         |   86 ------------
 extra-x86_64/configure.py-objdir-support.diff |   41 -----
 extra-x86_64/qsci_link.patch                  |   16 --
 8 files changed, 248 insertions(+), 286 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-11-19 12:37:34 UTC (rev 226387)
+++ extra-i686/PKGBUILD	2014-11-19 12:42:19 UTC (rev 226388)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-
-pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
-         'python-qscintilla-common')
-pkgver=2.8.4
-pkgrel=2
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-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'
-        'qsci_link.patch')
-md5sums=('28aec903ff48ae541295a4fb9c96f8ea'
-         'e304f8cd5e3e7ded61eda15bf56613a8'
-         '3bb99cf0ebbf9bea6a1d0f9067dc7124')
-
-prepare() {
-  cd QScintilla-gpl-${pkgver}
-  patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff
-  patch -p1 -i "${srcdir}"/qsci_link.patch
-}
-
-build() {
-    cd QScintilla-gpl-${pkgver}/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() {
-    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt4')
-
-    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-common() {
-    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
-    depends=('qscintilla')
-
-    cd QScintilla-gpl-${pkgver}/Python
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    # Provided by python-qscintilla
-    rm "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
-}
-
-package_python-qscintilla() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'python-pyqt4')
-
-    cd QScintilla-gpl-${pkgver}/Python
-    install -Dm755 Qsci.so \
-      "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
-}
-
-package_python2-qscintilla() {
-    pkgdesc="Python 2.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'python2-pyqt4')
-
-    cd QScintilla-gpl-${pkgver}/Python2
-    install -Dm755 Qsci.so \
-      "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
-}

Copied: qscintilla/repos/extra-i686/PKGBUILD (from rev 226387, qscintilla/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-11-19 12:42:19 UTC (rev 226388)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+         'python-qscintilla-common')
+pkgver=2.8.4
+pkgrel=3
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
+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')
+
+prepare() {
+  cd QScintilla-gpl-${pkgver}
+  patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff
+}
+
+build() {
+    cd QScintilla-gpl-${pkgver}/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() {
+    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+    depends=('qt4')
+
+    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-common() {
+    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
+    depends=('qscintilla')
+
+    cd QScintilla-gpl-${pkgver}/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla
+    rm "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
+}
+
+package_python-qscintilla() {
+    pkgdesc="Python 3.x bindings for QScintilla2"
+    depends=('python-qscintilla-common' 'python-pyqt4')
+
+    cd QScintilla-gpl-${pkgver}/Python
+    install -Dm755 Qsci.so \
+      "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
+}
+
+package_python2-qscintilla() {
+    pkgdesc="Python 2.x bindings for QScintilla2"
+    depends=('python-qscintilla-common' 'python2-pyqt4')
+
+    cd QScintilla-gpl-${pkgver}/Python2
+    install -Dm755 Qsci.so \
+      "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
+}

Deleted: extra-i686/configure.py-objdir-support.diff
===================================================================
--- extra-i686/configure.py-objdir-support.diff	2014-11-19 12:37:34 UTC (rev 226387)
+++ extra-i686/configure.py-objdir-support.diff	2014-11-19 12:42:19 UTC (rev 226388)
@@ -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 glob
- import optparse
- 
-+src_dir = os.path.dirname(os.path.abspath(__file__))
-+
- try:
-     import sysconfig
- except ImportError:
-@@ -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 226387, qscintilla/trunk/configure.py-objdir-support.diff)
===================================================================
--- extra-i686/configure.py-objdir-support.diff	                        (rev 0)
+++ extra-i686/configure.py-objdir-support.diff	2014-11-19 12:42:19 UTC (rev 226388)
@@ -0,0 +1,41 @@
+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 glob
+ import optparse
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ try:
+     import sysconfig
+ except ImportError:
+@@ -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

Deleted: extra-i686/qsci_link.patch
===================================================================
--- extra-i686/qsci_link.patch	2014-11-19 12:37:34 UTC (rev 226387)
+++ extra-i686/qsci_link.patch	2014-11-19 12:42:19 UTC (rev 226388)
@@ -1,16 +0,0 @@
-Index: qscintilla2-2.8.3+dfsg/Python/configure.py
-===================================================================
---- qscintilla2-2.8.3+dfsg.orig/Python/configure.py	2014-07-05 10:05:48.614827688 -0400
-+++ qscintilla2-2.8.3+dfsg/Python/configure.py	2014-07-05 10:05:48.610827688 -0400
-@@ -1434,7 +1434,10 @@
- 
-     libs = qmake_config.get('LIBS')
-     if libs:
--        pro.write('LIBS += %s\n' % libs)
-+        if target_config.pyqt_package == 'PyQt5':
-+            pro.write('LIBS += %s -lqt5scintilla2\n' % libs)
-+        else:
-+            pro.write('LIBS += %s -lqscintilla2\n' % libs)
- 
-     if not opts.static:
-         pro.write('''

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-11-19 12:37:34 UTC (rev 226387)
+++ extra-x86_64/PKGBUILD	2014-11-19 12:42:19 UTC (rev 226388)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-
-pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
-         'python-qscintilla-common')
-pkgver=2.8.4
-pkgrel=2
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-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'
-        'qsci_link.patch')
-md5sums=('28aec903ff48ae541295a4fb9c96f8ea'
-         'e304f8cd5e3e7ded61eda15bf56613a8'
-         '3bb99cf0ebbf9bea6a1d0f9067dc7124')
-
-prepare() {
-  cd QScintilla-gpl-${pkgver}
-  patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff
-  patch -p1 -i "${srcdir}"/qsci_link.patch
-}
-
-build() {
-    cd QScintilla-gpl-${pkgver}/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() {
-    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt4')
-
-    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-common() {
-    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
-    depends=('qscintilla')
-
-    cd QScintilla-gpl-${pkgver}/Python
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    # Provided by python-qscintilla
-    rm "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
-}
-
-package_python-qscintilla() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'python-pyqt4')
-
-    cd QScintilla-gpl-${pkgver}/Python
-    install -Dm755 Qsci.so \
-      "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
-}
-
-package_python2-qscintilla() {
-    pkgdesc="Python 2.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'python2-pyqt4')
-
-    cd QScintilla-gpl-${pkgver}/Python2
-    install -Dm755 Qsci.so \
-      "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
-}

Copied: qscintilla/repos/extra-x86_64/PKGBUILD (from rev 226387, qscintilla/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-11-19 12:42:19 UTC (rev 226388)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+         'python-qscintilla-common')
+pkgver=2.8.4
+pkgrel=3
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
+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')
+
+prepare() {
+  cd QScintilla-gpl-${pkgver}
+  patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff
+}
+
+build() {
+    cd QScintilla-gpl-${pkgver}/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() {
+    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+    depends=('qt4')
+
+    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-common() {
+    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
+    depends=('qscintilla')
+
+    cd QScintilla-gpl-${pkgver}/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla
+    rm "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
+}
+
+package_python-qscintilla() {
+    pkgdesc="Python 3.x bindings for QScintilla2"
+    depends=('python-qscintilla-common' 'python-pyqt4')
+
+    cd QScintilla-gpl-${pkgver}/Python
+    install -Dm755 Qsci.so \
+      "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
+}
+
+package_python2-qscintilla() {
+    pkgdesc="Python 2.x bindings for QScintilla2"
+    depends=('python-qscintilla-common' 'python2-pyqt4')
+
+    cd QScintilla-gpl-${pkgver}/Python2
+    install -Dm755 Qsci.so \
+      "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
+}

Deleted: extra-x86_64/configure.py-objdir-support.diff
===================================================================
--- extra-x86_64/configure.py-objdir-support.diff	2014-11-19 12:37:34 UTC (rev 226387)
+++ extra-x86_64/configure.py-objdir-support.diff	2014-11-19 12:42:19 UTC (rev 226388)
@@ -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 glob
- import optparse
- 
-+src_dir = os.path.dirname(os.path.abspath(__file__))
-+
- try:
-     import sysconfig
- except ImportError:
-@@ -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 226387, 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	2014-11-19 12:42:19 UTC (rev 226388)
@@ -0,0 +1,41 @@
+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 glob
+ import optparse
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ try:
+     import sysconfig
+ except ImportError:
+@@ -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

Deleted: extra-x86_64/qsci_link.patch
===================================================================
--- extra-x86_64/qsci_link.patch	2014-11-19 12:37:34 UTC (rev 226387)
+++ extra-x86_64/qsci_link.patch	2014-11-19 12:42:19 UTC (rev 226388)
@@ -1,16 +0,0 @@
-Index: qscintilla2-2.8.3+dfsg/Python/configure.py
-===================================================================
---- qscintilla2-2.8.3+dfsg.orig/Python/configure.py	2014-07-05 10:05:48.614827688 -0400
-+++ qscintilla2-2.8.3+dfsg/Python/configure.py	2014-07-05 10:05:48.610827688 -0400
-@@ -1434,7 +1434,10 @@
- 
-     libs = qmake_config.get('LIBS')
-     if libs:
--        pro.write('LIBS += %s\n' % libs)
-+        if target_config.pyqt_package == 'PyQt5':
-+            pro.write('LIBS += %s -lqt5scintilla2\n' % libs)
-+        else:
-+            pro.write('LIBS += %s -lqscintilla2\n' % libs)
- 
-     if not opts.static:
-         pro.write('''


More information about the arch-commits mailing list