Date: Saturday, November 12, 2011 @ 03:13:52 Author: andrea Revision: 142563
archrelease: copy trunk to extra-i686, extra-x86_64 Added: qscintilla/repos/extra-i686/PKGBUILD (from rev 142562, qscintilla/trunk/PKGBUILD) qscintilla/repos/extra-i686/configure.py-objdir-support.diff (from rev 142562, qscintilla/trunk/configure.py-objdir-support.diff) qscintilla/repos/extra-x86_64/PKGBUILD (from rev 142562, qscintilla/trunk/PKGBUILD) qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff (from rev 142562, 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-x86_64/PKGBUILD qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff -----------------------------------------------+ extra-i686/PKGBUILD | 143 ++++++++++++------------ extra-i686/configure.py-objdir-support.diff | 78 ++++++------- extra-x86_64/PKGBUILD | 143 ++++++++++++------------ extra-x86_64/configure.py-objdir-support.diff | 78 ++++++------- 4 files changed, 228 insertions(+), 214 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-11-12 08:13:27 UTC (rev 142562) +++ extra-i686/PKGBUILD 2011-11-12 08:13:52 UTC (rev 142563) @@ -1,68 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> - -pkgbase=qscintilla -pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.5.1 -pkgrel=2 -license=('GPL') -arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python2-pyqt') -source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" - 'configure.py-objdir-support.diff') -md5sums=('dd7edef5ff674d307057a3c12dbd8fce' - '8cf9c06252e2f11ab00e62848e322fd3') - - -build() { - cd "${srcdir}/QScintilla-gpl-${pkgver}" - patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" - - cd Qt4 - qmake qscintilla.pro - make - - cd ../designer-Qt4 - qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4 - make - - cd ../ - cp -rf Python Python2 - cd Python - python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 - make - - cd ../Python2 - python2 configure.py -n ../Qt4/ -o ../Qt4 -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}/Qt4" - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4" - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -} - -package_python-qscintilla() { - pkgdesc="Python 3 bindings for QScintilla2" - depends=('pyqt' 'qscintilla') - - 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 bindings for QScintilla2" - depends=('python-qscintilla' 'python2-pyqt') - - cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -} Copied: qscintilla/repos/extra-i686/PKGBUILD (from rev 142562, qscintilla/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-11-12 08:13:52 UTC (rev 142563) @@ -0,0 +1,75 @@ +# $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') +pkgver=2.6 +pkgrel=1 +license=('GPL') +arch=('i686' 'x86_64') +url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" +makedepends=('python2-pyqt' 'chrpath') +source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" + 'configure.py-objdir-support.diff') +md5sums=('0605a8006ea752ec2d1d7fc4791d1c75' + '8cf9c06252e2f11ab00e62848e322fd3') + + +build() { + cd "${srcdir}/QScintilla-gpl-${pkgver}" + patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" + + cd Qt4 + qmake qscintilla.pro + make + + cd ../designer-Qt4 + qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4 + make + + cd ../ + cp -rf Python Python2 + cd Python + python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 + make + + cd ../Python2 + python2 configure.py -n ../Qt4/ -o ../Qt4 -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}/Qt4" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install +} + +package_python-qscintilla() { + pkgdesc="Python 3 bindings for QScintilla2" + depends=('pyqt' 'qscintilla') + + cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" + install -Dm755 Qsci.so \ + "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python3.2/site-packages/PyQt4/Qsci.so +} + +package_python2-qscintilla() { + pkgdesc="Python 2 bindings for QScintilla2" + depends=('python-qscintilla' 'python2-pyqt') + + cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Fix RPATH + chrpath -r /usr/lib/ "${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 2011-11-12 08:13:27 UTC (rev 142562) +++ extra-i686/configure.py-objdir-support.diff 2011-11-12 08:13:52 UTC (rev 142563) @@ -1,39 +0,0 @@ -#! /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/extra-i686/configure.py-objdir-support.diff (from rev 142562, qscintilla/trunk/configure.py-objdir-support.diff) =================================================================== --- extra-i686/configure.py-objdir-support.diff (rev 0) +++ extra-i686/configure.py-objdir-support.diff 2011-11-12 08:13:52 UTC (rev 142563) @@ -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)) + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-11-12 08:13:27 UTC (rev 142562) +++ extra-x86_64/PKGBUILD 2011-11-12 08:13:52 UTC (rev 142563) @@ -1,68 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> - -pkgbase=qscintilla -pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.5.1 -pkgrel=2 -license=('GPL') -arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python2-pyqt') -source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" - 'configure.py-objdir-support.diff') -md5sums=('dd7edef5ff674d307057a3c12dbd8fce' - '8cf9c06252e2f11ab00e62848e322fd3') - - -build() { - cd "${srcdir}/QScintilla-gpl-${pkgver}" - patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" - - cd Qt4 - qmake qscintilla.pro - make - - cd ../designer-Qt4 - qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4 - make - - cd ../ - cp -rf Python Python2 - cd Python - python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 - make - - cd ../Python2 - python2 configure.py -n ../Qt4/ -o ../Qt4 -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}/Qt4" - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4" - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -} - -package_python-qscintilla() { - pkgdesc="Python 3 bindings for QScintilla2" - depends=('pyqt' 'qscintilla') - - 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 bindings for QScintilla2" - depends=('python-qscintilla' 'python2-pyqt') - - cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -} Copied: qscintilla/repos/extra-x86_64/PKGBUILD (from rev 142562, qscintilla/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-11-12 08:13:52 UTC (rev 142563) @@ -0,0 +1,75 @@ +# $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') +pkgver=2.6 +pkgrel=1 +license=('GPL') +arch=('i686' 'x86_64') +url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" +makedepends=('python2-pyqt' 'chrpath') +source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" + 'configure.py-objdir-support.diff') +md5sums=('0605a8006ea752ec2d1d7fc4791d1c75' + '8cf9c06252e2f11ab00e62848e322fd3') + + +build() { + cd "${srcdir}/QScintilla-gpl-${pkgver}" + patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" + + cd Qt4 + qmake qscintilla.pro + make + + cd ../designer-Qt4 + qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4 + make + + cd ../ + cp -rf Python Python2 + cd Python + python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 + make + + cd ../Python2 + python2 configure.py -n ../Qt4/ -o ../Qt4 -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}/Qt4" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install +} + +package_python-qscintilla() { + pkgdesc="Python 3 bindings for QScintilla2" + depends=('pyqt' 'qscintilla') + + cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" + install -Dm755 Qsci.so \ + "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python3.2/site-packages/PyQt4/Qsci.so +} + +package_python2-qscintilla() { + pkgdesc="Python 2 bindings for QScintilla2" + depends=('python-qscintilla' 'python2-pyqt') + + cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Fix RPATH + chrpath -r /usr/lib/ "${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 2011-11-12 08:13:27 UTC (rev 142562) +++ extra-x86_64/configure.py-objdir-support.diff 2011-11-12 08:13:52 UTC (rev 142563) @@ -1,39 +0,0 @@ -#! /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/extra-x86_64/configure.py-objdir-support.diff (from rev 142562, 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 2011-11-12 08:13:52 UTC (rev 142563) @@ -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)) +