[arch-commits] Commit in qscintilla/repos (10 files)
Allan McRae
allan at archlinux.org
Wed Oct 17 10:21:12 UTC 2012
Date: Wednesday, October 17, 2012 @ 06:21:11
Author: allan
Revision: 169036
db-move: moved qscintilla from [testing] to [extra] (i686, x86_64)
Added:
qscintilla/repos/extra-i686/PKGBUILD
(from rev 168989, qscintilla/repos/testing-i686/PKGBUILD)
qscintilla/repos/extra-i686/configure.py-objdir-support.diff
(from rev 168989, qscintilla/repos/testing-i686/configure.py-objdir-support.diff)
qscintilla/repos/extra-x86_64/PKGBUILD
(from rev 168989, qscintilla/repos/testing-x86_64/PKGBUILD)
qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff
(from rev 168989, qscintilla/repos/testing-x86_64/configure.py-objdir-support.diff)
Deleted:
qscintilla/repos/extra-i686/PKGBUILD
qscintilla/repos/extra-i686/configure.py-objdir-support.diff
qscintilla/repos/extra-x86_64/PKGBUILD
qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff
qscintilla/repos/testing-i686/
qscintilla/repos/testing-x86_64/
-----------------------------------------------+
extra-i686/PKGBUILD | 160 ++++++++++++------------
extra-i686/configure.py-objdir-support.diff | 78 +++++------
extra-x86_64/PKGBUILD | 160 ++++++++++++------------
extra-x86_64/configure.py-objdir-support.diff | 78 +++++------
4 files changed, 238 insertions(+), 238 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-10-17 10:21:09 UTC (rev 169035)
+++ extra-i686/PKGBUILD 2012-10-17 10:21:11 UTC (rev 169036)
@@ -1,80 +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.6.2
-pkgrel=2
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt' 'pyqt' 'chrpath')
-source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
- 'configure.py-objdir-support.diff')
-md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
- '8cf9c06252e2f11ab00e62848e322fd3')
-
-build() {
- cd "${srcdir}/QScintilla-gpl-${pkgver}"
- patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
-
- cd Qt4Qt5
- qmake qscintilla.pro
- make
-
- cd ../designer-Qt4
- qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
- make
-
- cd ../
- cp -rf Python Python2
- cd Python
- python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
- make
-
- cd ../Python2
- python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
- make
-}
-
-package_qscintilla() {
- pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
- depends=('qt')
-
- cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
- cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
- 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 "${srcdir}/QScintilla-gpl-${pkgver}"/Python
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
- # Provided by python-qscintilla
- rm "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
-}
-
-package_python-qscintilla() {
- pkgdesc="Python 3.x bindings for QScintilla2"
- depends=('python-qscintilla-common' 'pyqt')
-
- cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
- install -Dm755 Qsci.so \
- "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
-}
-
-package_python2-qscintilla() {
- pkgdesc="Python 2.x bindings for QScintilla2"
- depends=('python-qscintilla-common' 'python2-pyqt')
-
- cd "${srcdir}/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 168989, qscintilla/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-17 10:21:11 UTC (rev 169036)
@@ -0,0 +1,80 @@
+# $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.6.2
+pkgrel=3
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
+makedepends=('python2-pyqt' 'pyqt' 'chrpath')
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
+ 'configure.py-objdir-support.diff')
+md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
+ '8cf9c06252e2f11ab00e62848e322fd3')
+
+build() {
+ cd "${srcdir}/QScintilla-gpl-${pkgver}"
+ patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+
+ cd Qt4Qt5
+ qmake qscintilla.pro
+ make
+
+ cd ../designer-Qt4
+ qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+ make
+
+ cd ../
+ cp -rf Python Python2
+ cd Python
+ python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+ make
+
+ cd ../Python2
+ python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+ make
+}
+
+package_qscintilla() {
+ pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+ depends=('qt')
+
+ cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
+ 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 "${srcdir}/QScintilla-gpl-${pkgver}"/Python
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by python-qscintilla
+ rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
+}
+
+package_python-qscintilla() {
+ pkgdesc="Python 3.x bindings for QScintilla2"
+ depends=('python-qscintilla-common' 'pyqt')
+
+ cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
+ install -Dm755 Qsci.so \
+ "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
+}
+
+package_python2-qscintilla() {
+ pkgdesc="Python 2.x bindings for QScintilla2"
+ depends=('python-qscintilla-common' 'python2-pyqt')
+
+ cd "${srcdir}/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 2012-10-17 10:21:09 UTC (rev 169035)
+++ extra-i686/configure.py-objdir-support.diff 2012-10-17 10:21:11 UTC (rev 169036)
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek <shlomme at debian.org>
-##
-## DP: patch the configure script for the Python bindings to support object dir builds
-
- at DPATCH@
-Index: qscintilla2-2.4.2/Python/configure.py
-===================================================================
---- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
- import glob
- import optparse
-
-+src_dir = os.path.dirname(os.path.abspath(__file__))
-
- # Import SIP's configuration module so that we have access to the error
- # reporting. Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
- if os.access(sciglobal, os.F_OK):
- # Get the QScintilla version string.
- _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
--
-+ return # Debian: do not check for the installed version, we're good this way.
- if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
- # Because we include the Python bindings with the C++ code we can
- # reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
- argv.append(buildfile)
-
- if pyqt.pyqt_version >= 0x040000:
-- argv.append("sip/qscimod4.sip")
-+ argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
- else:
-- argv.append("sip/qscimod3.sip")
-+ argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
-
- os.system(" ".join(argv))
-
Copied: qscintilla/repos/extra-i686/configure.py-objdir-support.diff (from rev 168989, qscintilla/repos/testing-i686/configure.py-objdir-support.diff)
===================================================================
--- extra-i686/configure.py-objdir-support.diff (rev 0)
+++ extra-i686/configure.py-objdir-support.diff 2012-10-17 10:21:11 UTC (rev 169036)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_configure.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## DP: patch the configure script for the Python bindings to support object dir builds
+
+ at DPATCH@
+Index: qscintilla2-2.4.2/Python/configure.py
+===================================================================
+--- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.000000000 +0100
++++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417 +0100
+@@ -33,6 +33,7 @@
+ import glob
+ import optparse
+
++src_dir = os.path.dirname(os.path.abspath(__file__))
+
+ # Import SIP's configuration module so that we have access to the error
+ # reporting. Then try and import the configuration modules for both PyQt3 and
+@@ -162,7 +163,7 @@
+ if os.access(sciglobal, os.F_OK):
+ # Get the QScintilla version string.
+ _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
+-
++ return # Debian: do not check for the installed version, we're good this way.
+ if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
+ # Because we include the Python bindings with the C++ code we can
+ # reasonably force the same version to be used and not bother about
+@@ -232,9 +233,9 @@
+ argv.append(buildfile)
+
+ if pyqt.pyqt_version >= 0x040000:
+- argv.append("sip/qscimod4.sip")
++ argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
+ else:
+- argv.append("sip/qscimod3.sip")
++ argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
+
+ os.system(" ".join(argv))
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-10-17 10:21:09 UTC (rev 169035)
+++ extra-x86_64/PKGBUILD 2012-10-17 10:21:11 UTC (rev 169036)
@@ -1,80 +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.6.2
-pkgrel=2
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt' 'pyqt' 'chrpath')
-source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
- 'configure.py-objdir-support.diff')
-md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
- '8cf9c06252e2f11ab00e62848e322fd3')
-
-build() {
- cd "${srcdir}/QScintilla-gpl-${pkgver}"
- patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
-
- cd Qt4Qt5
- qmake qscintilla.pro
- make
-
- cd ../designer-Qt4
- qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
- make
-
- cd ../
- cp -rf Python Python2
- cd Python
- python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
- make
-
- cd ../Python2
- python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
- make
-}
-
-package_qscintilla() {
- pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
- depends=('qt')
-
- cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
- cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
- 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 "${srcdir}/QScintilla-gpl-${pkgver}"/Python
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
- # Provided by python-qscintilla
- rm "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
-}
-
-package_python-qscintilla() {
- pkgdesc="Python 3.x bindings for QScintilla2"
- depends=('python-qscintilla-common' 'pyqt')
-
- cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
- install -Dm755 Qsci.so \
- "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
-}
-
-package_python2-qscintilla() {
- pkgdesc="Python 2.x bindings for QScintilla2"
- depends=('python-qscintilla-common' 'python2-pyqt')
-
- cd "${srcdir}/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 168989, qscintilla/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-10-17 10:21:11 UTC (rev 169036)
@@ -0,0 +1,80 @@
+# $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.6.2
+pkgrel=3
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
+makedepends=('python2-pyqt' 'pyqt' 'chrpath')
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
+ 'configure.py-objdir-support.diff')
+md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
+ '8cf9c06252e2f11ab00e62848e322fd3')
+
+build() {
+ cd "${srcdir}/QScintilla-gpl-${pkgver}"
+ patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+
+ cd Qt4Qt5
+ qmake qscintilla.pro
+ make
+
+ cd ../designer-Qt4
+ qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+ make
+
+ cd ../
+ cp -rf Python Python2
+ cd Python
+ python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+ make
+
+ cd ../Python2
+ python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+ make
+}
+
+package_qscintilla() {
+ pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+ depends=('qt')
+
+ cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
+ 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 "${srcdir}/QScintilla-gpl-${pkgver}"/Python
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by python-qscintilla
+ rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
+}
+
+package_python-qscintilla() {
+ pkgdesc="Python 3.x bindings for QScintilla2"
+ depends=('python-qscintilla-common' 'pyqt')
+
+ cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
+ install -Dm755 Qsci.so \
+ "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
+}
+
+package_python2-qscintilla() {
+ pkgdesc="Python 2.x bindings for QScintilla2"
+ depends=('python-qscintilla-common' 'python2-pyqt')
+
+ cd "${srcdir}/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 2012-10-17 10:21:09 UTC (rev 169035)
+++ extra-x86_64/configure.py-objdir-support.diff 2012-10-17 10:21:11 UTC (rev 169036)
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek <shlomme at debian.org>
-##
-## DP: patch the configure script for the Python bindings to support object dir builds
-
- at DPATCH@
-Index: qscintilla2-2.4.2/Python/configure.py
-===================================================================
---- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
- import glob
- import optparse
-
-+src_dir = os.path.dirname(os.path.abspath(__file__))
-
- # Import SIP's configuration module so that we have access to the error
- # reporting. Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
- if os.access(sciglobal, os.F_OK):
- # Get the QScintilla version string.
- _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
--
-+ return # Debian: do not check for the installed version, we're good this way.
- if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
- # Because we include the Python bindings with the C++ code we can
- # reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
- argv.append(buildfile)
-
- if pyqt.pyqt_version >= 0x040000:
-- argv.append("sip/qscimod4.sip")
-+ argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
- else:
-- argv.append("sip/qscimod3.sip")
-+ argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
-
- os.system(" ".join(argv))
-
Copied: qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff (from rev 168989, qscintilla/repos/testing-x86_64/configure.py-objdir-support.diff)
===================================================================
--- extra-x86_64/configure.py-objdir-support.diff (rev 0)
+++ extra-x86_64/configure.py-objdir-support.diff 2012-10-17 10:21:11 UTC (rev 169036)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_configure.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## DP: patch the configure script for the Python bindings to support object dir builds
+
+ at DPATCH@
+Index: qscintilla2-2.4.2/Python/configure.py
+===================================================================
+--- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.000000000 +0100
++++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417 +0100
+@@ -33,6 +33,7 @@
+ import glob
+ import optparse
+
++src_dir = os.path.dirname(os.path.abspath(__file__))
+
+ # Import SIP's configuration module so that we have access to the error
+ # reporting. Then try and import the configuration modules for both PyQt3 and
+@@ -162,7 +163,7 @@
+ if os.access(sciglobal, os.F_OK):
+ # Get the QScintilla version string.
+ _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
+-
++ return # Debian: do not check for the installed version, we're good this way.
+ if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
+ # Because we include the Python bindings with the C++ code we can
+ # reasonably force the same version to be used and not bother about
+@@ -232,9 +233,9 @@
+ argv.append(buildfile)
+
+ if pyqt.pyqt_version >= 0x040000:
+- argv.append("sip/qscimod4.sip")
++ argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
+ else:
+- argv.append("sip/qscimod3.sip")
++ argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
+
+ os.system(" ".join(argv))
+
More information about the arch-commits
mailing list