Date: Wednesday, June 27, 2012 @ 16:02:58 Author: andrea Revision: 162672
archrelease: copy trunk to staging-i686, staging-x86_64 Added: qscintilla/repos/staging-i686/ qscintilla/repos/staging-i686/PKGBUILD (from rev 162671, qscintilla/trunk/PKGBUILD) qscintilla/repos/staging-i686/configure.py-objdir-support.diff (from rev 162671, qscintilla/trunk/configure.py-objdir-support.diff) qscintilla/repos/staging-x86_64/ qscintilla/repos/staging-x86_64/PKGBUILD (from rev 162671, qscintilla/trunk/PKGBUILD) qscintilla/repos/staging-x86_64/configure.py-objdir-support.diff (from rev 162671, qscintilla/trunk/configure.py-objdir-support.diff) -------------------------------------------------+ staging-i686/PKGBUILD | 81 ++++++++++++++++++++++ staging-i686/configure.py-objdir-support.diff | 39 ++++++++++ staging-x86_64/PKGBUILD | 81 ++++++++++++++++++++++ staging-x86_64/configure.py-objdir-support.diff | 39 ++++++++++ 4 files changed, 240 insertions(+) Copied: qscintilla/repos/staging-i686/PKGBUILD (from rev 162671, qscintilla/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2012-06-27 20:02:58 UTC (rev 162672) @@ -0,0 +1,81 @@ +# $Id$ +# Maintainer: +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> + +pkgbase=qscintilla +pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' + 'python-qscintilla-common') +pkgver=2.6.2 +pkgrel=1 +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() { + pkgdest="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/staging-i686/configure.py-objdir-support.diff (from rev 162671, qscintilla/trunk/configure.py-objdir-support.diff) =================================================================== --- staging-i686/configure.py-objdir-support.diff (rev 0) +++ staging-i686/configure.py-objdir-support.diff 2012-06-27 20:02:58 UTC (rev 162672) @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_configure.dpatch by Torsten Marek <shlo...@debian.org> +## +## DP: patch the configure script for the Python bindings to support object dir builds + +@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/staging-x86_64/PKGBUILD (from rev 162671, qscintilla/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2012-06-27 20:02:58 UTC (rev 162672) @@ -0,0 +1,81 @@ +# $Id$ +# Maintainer: +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> + +pkgbase=qscintilla +pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' + 'python-qscintilla-common') +pkgver=2.6.2 +pkgrel=1 +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() { + pkgdest="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/staging-x86_64/configure.py-objdir-support.diff (from rev 162671, qscintilla/trunk/configure.py-objdir-support.diff) =================================================================== --- staging-x86_64/configure.py-objdir-support.diff (rev 0) +++ staging-x86_64/configure.py-objdir-support.diff 2012-06-27 20:02:58 UTC (rev 162672) @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_configure.dpatch by Torsten Marek <shlo...@debian.org> +## +## DP: patch the configure script for the Python bindings to support object dir builds + +@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)) +