[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, December 2, 2020 @ 19:53:15 Author: arojas Revision: 402822 Update to 2.11.6 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-12-02 19:49:40 UTC (rev 402821) +++ PKGBUILD2020-12-02 19:53:15 UTC (rev 402822) @@ -5,14 +5,14 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') -pkgver=2.11.5 -pkgrel=3 +pkgver=2.11.6 +pkgrel=1 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro; makedepends=('python-pyqt5' 'qt5-tools' 'sip5' 'pyqt-builder') source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz;) -sha256sums=('9361e26fd7fb7b5819a7eb92c5c1880a18de9bd3ed9dd2eb008e57388696716b') +sha256sums=('e7346057db47d2fb384467fafccfcb13aa0741373c5d593bc72b55b2f0dd20a7') build() { cd QScintilla-${pkgver}
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Thursday, November 12, 2020 @ 13:25:31 Author: foutrelis Revision: 400558 upgpkg: qscintilla 2.11.5-3: Python 3.9 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-11-12 13:23:18 UTC (rev 400557) +++ PKGBUILD2020-11-12 13:25:31 UTC (rev 400558) @@ -6,7 +6,7 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') pkgver=2.11.5 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, November 10, 2020 @ 04:12:17 Author: foutrelis Revision: 399963 upgpkg: qscintilla 2.11.5-2: Python 3.9 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-11-10 04:04:43 UTC (rev 399962) +++ PKGBUILD2020-11-10 04:12:17 UTC (rev 399963) @@ -6,7 +6,7 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') pkgver=2.11.5 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, June 10, 2020 @ 12:34:12 Author: arojas Revision: 388744 Update to 2.11.5 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 15 --- 1 file changed, 4 insertions(+), 11 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-06-10 12:22:52 UTC (rev 388743) +++ PKGBUILD2020-06-10 12:34:12 UTC (rev 388744) @@ -5,22 +5,15 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') -pkgver=2.11.4 -pkgrel=3 +pkgver=2.11.5 +pkgrel=1 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro; makedepends=('python-pyqt5' 'qt5-tools' 'sip5' 'pyqt-builder') -source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz; - qscintilla-sip-5.3.patch) -sha256sums=('723f8f1d1686d9fc8f204cd855347e984322dd5cd727891d324d0d7d187bee20' -'917b57158deaf83682d8d383a2295e46c5510a629de8f3df775b941f3ab8b023') +source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz;) +sha256sums=('9361e26fd7fb7b5819a7eb92c5c1880a18de9bd3ed9dd2eb008e57388696716b') -prepare() { - cd QScintilla-$pkgver - patch -p1 -i ../qscintilla-sip-5.3.patch # Fix build with sip 5.3 -} - build() { cd QScintilla-${pkgver} export QMAKEFEATURES=$PWD/Qt4Qt5/features/
[arch-commits] Commit in qscintilla/trunk (PKGBUILD qscintilla-sip-5.3.patch)
Date: Wednesday, June 10, 2020 @ 06:48:44 Author: arojas Revision: 388711 Fix build with sip 5.3 (FS#66951) Added: qscintilla/trunk/qscintilla-sip-5.3.patch Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 15 +++ qscintilla-sip-5.3.patch | 24 2 files changed, 35 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-06-10 06:32:01 UTC (rev 388710) +++ PKGBUILD2020-06-10 06:48:44 UTC (rev 388711) @@ -6,16 +6,23 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') pkgver=2.11.4 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro; makedepends=('python-pyqt5' 'qt5-tools' 'sip5' 'pyqt-builder') -source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz;) -sha256sums=('723f8f1d1686d9fc8f204cd855347e984322dd5cd727891d324d0d7d187bee20') +source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz; + qscintilla-sip-5.3.patch) +sha256sums=('723f8f1d1686d9fc8f204cd855347e984322dd5cd727891d324d0d7d187bee20' +'917b57158deaf83682d8d383a2295e46c5510a629de8f3df775b941f3ab8b023') +prepare() { + cd QScintilla-$pkgver + patch -p1 -i ../qscintilla-sip-5.3.patch # Fix build with sip 5.3 +} + build() { - cd "$srcdir"/QScintilla-${pkgver} + cd QScintilla-${pkgver} export QMAKEFEATURES=$PWD/Qt4Qt5/features/ cd Qt4Qt5 Added: qscintilla-sip-5.3.patch === --- qscintilla-sip-5.3.patch(rev 0) +++ qscintilla-sip-5.3.patch2020-06-10 06:48:44 UTC (rev 388711) @@ -0,0 +1,24 @@ +diff -ru QScintilla-2.11.5.dev2005091235/Python/sip/qsciabstractapis.sip QScintilla-2.11.5.dev2006091431/Python/sip/qsciabstractapis.sip +--- QScintilla-2.11.5.dev2005091235/Python/sip/qsciabstractapis.sip 2020-06-09 03:34:50.0 +0200 QScintilla-2.11.5.dev2006091431/Python/sip/qsciabstractapis.sip 2020-06-10 03:34:31.0 +0200 +@@ -25,7 +25,7 @@ + %End + + public: +-QsciAbstractAPIs(QsciLexer *lexer /TransferThis/ = 0); ++QsciAbstractAPIs(QsciLexer *lexer /TransferThis/); + virtual ~QsciAbstractAPIs(); + + QsciLexer *lexer() const; +diff -ru QScintilla-2.11.5.dev2005091235/Python/sip/qsciapis.sip QScintilla-2.11.5.dev2006091431/Python/sip/qsciapis.sip +--- QScintilla-2.11.5.dev2005091235/Python/sip/qsciapis.sip2020-06-09 03:34:50.0 +0200 QScintilla-2.11.5.dev2006091431/Python/sip/qsciapis.sip2020-06-10 03:34:31.0 +0200 +@@ -25,7 +25,7 @@ + %End + + public: +-QsciAPIs(QsciLexer *lexer /TransferThis/ = 0); ++QsciAPIs(QsciLexer *lexer /TransferThis/); + virtual ~QsciAPIs(); + + void add(const QString );
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Thursday, June 4, 2020 @ 21:50:28 Author: arojas Revision: 388306 Rebuild with Qt 5.15 (FS#66887) Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-06-04 21:47:09 UTC (rev 388305) +++ PKGBUILD2020-06-04 21:50:28 UTC (rev 388306) @@ -6,13 +6,13 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') pkgver=2.11.4 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro; makedepends=('python-pyqt5' 'qt5-tools' 'sip5' 'pyqt-builder') source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz;) -sha256sums=('fab209d7112b75046b2eefabb1572f7671557271911eec18617b8cbf397e1c29') +sha256sums=('723f8f1d1686d9fc8f204cd855347e984322dd5cd727891d324d0d7d187bee20') build() { cd "$srcdir"/QScintilla-${pkgver}
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, December 21, 2019 @ 12:49:51 Author: arojas Revision: 372019 Fix features dir Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-12-21 12:12:23 UTC (rev 372018) +++ PKGBUILD2019-12-21 12:49:51 UTC (rev 372019) @@ -29,12 +29,11 @@ cd .. sip-build \ --no-make \ ---qsci-features-dir Qt4Qt5 \ +--qsci-features-dir Qt4Qt5/features \ --qsci-include-dir Qt4Qt5 \ --qsci-library-dir Qt4Qt5 \ --api-dir /usr/share/qt/qsci/api/python cd build - echo "QT += widgets" >> Qsci/Qsci.pro make }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, December 21, 2019 @ 08:52:18 Author: arojas Revision: 372013 Update to 2.11.4 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 60 +--- 1 file changed, 33 insertions(+), 27 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-12-21 02:41:21 UTC (rev 372012) +++ PKGBUILD2019-12-21 08:52:18 UTC (rev 372013) @@ -5,49 +5,55 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') -pkgver=2.11.3 -pkgrel=7 +pkgver=2.11.4 +pkgrel=1 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro; -makedepends=('python-pyqt5' 'qt5-tools' 'sip5') -options=('!buildflags') # Fix Qt Designer plugin +makedepends=('python-pyqt5' 'qt5-tools' 'sip5' 'pyqt-builder') source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz;) -sha256sums=('cfadbb7f32fb8a9404fbe5db0ad14ac02229ebdf30a519141236080236ae2dd6') +sha256sums=('fab209d7112b75046b2eefabb1572f7671557271911eec18617b8cbf397e1c29') build() { -cd "$srcdir"/QScintilla-${pkgver} -export QMAKEFEATURES=$PWD/Qt4Qt5/features/ + cd "$srcdir"/QScintilla-${pkgver} + export QMAKEFEATURES=$PWD/Qt4Qt5/features/ -cd Qt4Qt5 -qmake-qt5 -make + cd Qt4Qt5 + qmake-qt5 + make -cd ../designer-Qt4Qt5 -qmake-qt5 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 -make + cd ../designer-Qt4Qt5 + qmake-qt5 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 + make -cd ../Python -python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -make + cd .. + sip-build \ +--no-make \ +--qsci-features-dir Qt4Qt5 \ +--qsci-include-dir Qt4Qt5 \ +--qsci-library-dir Qt4Qt5 \ +--api-dir /usr/share/qt/qsci/api/python + cd build + echo "QT += widgets" >> Qsci/Qsci.pro + make } package_qscintilla-qt5() { -pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class" -depends=(qt5-base) + pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class" + depends=(qt5-base) -cd QScintilla-${pkgver}/Qt4Qt5 -make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + cd QScintilla-${pkgver}/Qt4Qt5 + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -cd ../designer-Qt4Qt5 -make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + cd ../designer-Qt4Qt5 + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install } package_python-qscintilla-qt5() { -pkgdesc="Python bindings for QScintilla2" -depends=(qscintilla-qt5 python-pyqt5) -replaces=(python-qscintilla-qt5-common) + pkgdesc="Python bindings for QScintilla2" + depends=(qscintilla-qt5 python-pyqt5) + replaces=(python-qscintilla-qt5-common) -cd QScintilla-${pkgver}/Python -make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 + cd QScintilla-${pkgver}/build + make INSTALL_ROOT="$pkgdir" install -j1 }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, December 15, 2019 @ 23:05:01 Author: arojas Revision: 371553 Build python bindings with sip5 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-12-15 22:53:31 UTC (rev 371552) +++ PKGBUILD2019-12-15 23:05:01 UTC (rev 371553) @@ -6,11 +6,11 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') pkgver=2.11.3 -pkgrel=6 +pkgrel=7 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro; -makedepends=('python-pyqt5' 'qt5-tools' 'sip') +makedepends=('python-pyqt5' 'qt5-tools' 'sip5') options=('!buildflags') # Fix Qt Designer plugin source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz;) sha256sums=('cfadbb7f32fb8a9404fbe5db0ad14ac02229ebdf30a519141236080236ae2dd6') @@ -28,7 +28,7 @@ make cd ../Python -python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 +python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ make }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, December 15, 2019 @ 22:53:31 Author: arojas Revision: 371552 Rebuild to move sip files to the new location Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-12-15 21:40:22 UTC (rev 371551) +++ PKGBUILD2019-12-15 22:53:31 UTC (rev 371552) @@ -6,7 +6,7 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') pkgver=2.11.3 -pkgrel=5 +pkgrel=6 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro; @@ -49,5 +49,5 @@ replaces=(python-qscintilla-qt5-common) cd QScintilla-${pkgver}/Python -make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install +make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, November 9, 2019 @ 12:38:29 Author: arojas Revision: 367241 python 3.8 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-11-09 12:36:55 UTC (rev 367240) +++ PKGBUILD2019-11-09 12:38:29 UTC (rev 367241) @@ -6,7 +6,7 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') pkgver=2.11.3 -pkgrel=4 +pkgrel=5 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, November 9, 2019 @ 12:36:37 Author: arojas Revision: 367239 Drop python2 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 52 +++- 1 file changed, 11 insertions(+), 41 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-11-09 12:12:28 UTC (rev 367238) +++ PKGBUILD2019-11-09 12:36:37 UTC (rev 367239) @@ -1,16 +1,16 @@ # Maintainer: Felix Yan +# Maintainer: Antonio Rojas # Contributor: Andrea Scarpino # Contributor: Douglas Soares de Andrade pkgbase=qscintilla -pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' - 'python-qscintilla-qt5-common') +pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') pkgver=2.11.3 -pkgrel=3 +pkgrel=4 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro; -makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip') +makedepends=('python-pyqt5' 'qt5-tools' 'sip') options=('!buildflags') # Fix Qt Designer plugin source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz;) sha256sums=('cfadbb7f32fb8a9404fbe5db0ad14ac02229ebdf30a519141236080236ae2dd6') @@ -27,57 +27,27 @@ qmake-qt5 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make -cd ../ -cp -rf Python Python2 -cd Python +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 } package_qscintilla-qt5() { pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class" -depends=('qt5-base') +depends=(qt5-base) cd QScintilla-${pkgver}/Qt4Qt5 -make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 +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-${pkgver}/Python -make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 - -# 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') +pkgdesc="Python bindings for QScintilla2" +depends=(qscintilla-qt5 python-pyqt5) +replaces=(python-qscintilla-qt5-common) cd QScintilla-${pkgver}/Python -make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 - -# Provided by python-qscintilla-common -rm -r "${pkgdir}"/usr/share +make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install } - -package_python2-qscintilla-qt5() { -pkgdesc="Python 2.x bindings for QScintilla2" -depends=('python-qscintilla-qt5-common' 'python2-pyqt5') - -cd QScintilla-${pkgver}/Python2 -make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 - -# Provided by python-qscintilla -rm -r "${pkgdir}"/usr/share -}
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, November 3, 2019 @ 21:58:19 Author: felixonmars Revision: 366615 Python 3.8 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-11-03 21:55:04 UTC (rev 366614) +++ PKGBUILD2019-11-03 21:58:19 UTC (rev 366615) @@ -6,7 +6,7 @@ pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') pkgver=2.11.3 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, November 3, 2019 @ 18:45:38 Author: arojas Revision: 366561 Python 3.8 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-11-03 18:42:56 UTC (rev 366560) +++ PKGBUILD2019-11-03 18:45:38 UTC (rev 366561) @@ -6,7 +6,7 @@ pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') pkgver=2.11.3 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, November 3, 2019 @ 18:35:35 Author: arojas Revision: 366555 Update to 2.11.3 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-11-03 18:31:11 UTC (rev 366554) +++ PKGBUILD2019-11-03 18:35:35 UTC (rev 366555) @@ -5,18 +5,18 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.11.2 -pkgrel=2 +pkgver=2.11.3 +pkgrel=1 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro; makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip') options=('!buildflags') # Fix Qt Designer plugin -source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla_gpl-$pkgver.tar.gz;) -sha256sums=('029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1') +source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz;) +sha256sums=('cfadbb7f32fb8a9404fbe5db0ad14ac02229ebdf30a519141236080236ae2dd6') build() { -cd "$srcdir"/QScintilla_gpl-${pkgver} +cd "$srcdir"/QScintilla-${pkgver} export QMAKEFEATURES=$PWD/Qt4Qt5/features/ cd Qt4Qt5 @@ -42,7 +42,7 @@ pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class" depends=('qt5-base') -cd QScintilla_gpl-${pkgver}/Qt4Qt5 +cd QScintilla-${pkgver}/Qt4Qt5 make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 cd ../designer-Qt4Qt5 @@ -53,7 +53,7 @@ pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt5 and python2-qscintilla-qt5" depends=('qscintilla-qt5') -cd QScintilla_gpl-${pkgver}/Python +cd QScintilla-${pkgver}/Python make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 # Provided by python-qscintilla @@ -64,7 +64,7 @@ pkgdesc="Python 3.x bindings for QScintilla2" depends=('python-qscintilla-qt5-common' 'python-pyqt5') -cd QScintilla_gpl-${pkgver}/Python +cd QScintilla-${pkgver}/Python make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 # Provided by python-qscintilla-common @@ -75,7 +75,7 @@ pkgdesc="Python 2.x bindings for QScintilla2" depends=('python-qscintilla-qt5-common' 'python2-pyqt5') -cd QScintilla_gpl-${pkgver}/Python2 +cd QScintilla-${pkgver}/Python2 make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 # Provided by python-qscintilla
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, October 26, 2019 @ 14:58:03 Author: foutrelis Revision: 365856 Python 3.8 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-10-26 14:54:48 UTC (rev 365855) +++ PKGBUILD2019-10-26 14:58:03 UTC (rev 365856) @@ -6,7 +6,7 @@ pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') pkgver=2.11.2 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('x86_64') url="https://www.riverbankcomputing.com/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, June 29, 2019 @ 06:59:05 Author: arojas Revision: 357033 Update to 2.11.2 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-06-29 06:43:25 UTC (rev 357032) +++ PKGBUILD2019-06-29 06:59:05 UTC (rev 357033) @@ -5,7 +5,7 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.11.1 +pkgver=2.11.2 pkgrel=1 license=('GPL') arch=('x86_64') @@ -13,7 +13,7 @@ makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip') options=('!buildflags') # Fix Qt Designer plugin source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla_gpl-$pkgver.tar.gz;) -sha256sums=('dae54d19e43dba5a3f98ac084fc0bcfa6fb713fa851f1783a01404397fd722f5') +sha256sums=('029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1') build() { cd "$srcdir"/QScintilla_gpl-${pkgver}
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Friday, April 12, 2019 @ 17:49:22 Author: arojas Revision: 350637 https Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-04-12 17:49:12 UTC (rev 350636) +++ PKGBUILD2019-04-12 17:49:22 UTC (rev 350637) @@ -9,7 +9,7 @@ pkgrel=1 license=('GPL') arch=('x86_64') -url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro; +url="https://www.riverbankcomputing.com/software/qscintilla/intro; makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip') options=('!buildflags') # Fix Qt Designer plugin source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla_gpl-$pkgver.tar.gz;)
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Thursday, March 28, 2019 @ 07:30:46 Author: arojas Revision: 349327 Fix source URL Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-03-28 07:30:19 UTC (rev 349326) +++ PKGBUILD2019-03-28 07:30:46 UTC (rev 349327) @@ -12,7 +12,7 @@ url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro; makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip') options=('!buildflags') # Fix Qt Designer plugin -source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/QScintilla_gpl-$pkgver.tar.gz;) +source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla_gpl-$pkgver.tar.gz;) sha256sums=('dae54d19e43dba5a3f98ac084fc0bcfa6fb713fa851f1783a01404397fd722f5') build() {
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Thursday, February 14, 2019 @ 16:29:31 Author: arojas Revision: 346273 Update to 2.11.1 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-02-14 15:39:05 UTC (rev 346272) +++ PKGBUILD2019-02-14 16:29:31 UTC (rev 346273) @@ -5,7 +5,7 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.11 +pkgver=2.11.1 pkgrel=1 license=('GPL') arch=('x86_64') @@ -13,7 +13,7 @@ makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip') options=('!buildflags') # Fix Qt Designer plugin source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/QScintilla_gpl-$pkgver.tar.gz;) -sha256sums=('c2c0f097522c5aea16c71dc79deefc7f0416a17c091cf264cbe48846a29204a6') +sha256sums=('dae54d19e43dba5a3f98ac084fc0bcfa6fb713fa851f1783a01404397fd722f5') build() { cd "$srcdir"/QScintilla_gpl-${pkgver} @@ -43,7 +43,7 @@ depends=('qt5-base') cd QScintilla_gpl-${pkgver}/Qt4Qt5 -make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install +make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 cd ../designer-Qt4Qt5 make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install @@ -54,7 +54,7 @@ depends=('qscintilla-qt5') cd QScintilla_gpl-${pkgver}/Python -make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install +make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 # Provided by python-qscintilla rm -r "${pkgdir}"/usr/lib
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, October 3, 2018 @ 11:35:50 Author: arojas Revision: 335672 Update to 2.10.8, install dist files Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-10-03 11:31:46 UTC (rev 335671) +++ PKGBUILD2018-10-03 11:35:50 UTC (rev 335672) @@ -5,8 +5,8 @@ pkgbase=qscintilla pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.10.7 -pkgrel=3 +pkgver=2.10.8 +pkgrel=1 license=('GPL') arch=('x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -13,7 +13,7 @@ makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip') options=('!buildflags') # Fix Qt Designer plugin source=("http://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz;) -sha256sums=('670458de71dd4205e92d8f3b7bad9f667afece925703cde9df6d04bc23331a1a') +sha256sums=('46cd5b4e609ca5e13130ba8cc7028d44fd1dc5b037f97c492899006ed0c992eb') build() { cd "$srcdir"/QScintilla_gpl-${pkgver} @@ -30,11 +30,11 @@ cd ../ cp -rf Python Python2 cd Python -python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 --no-dist-info +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 --no-dist-info +python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 make }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Friday, August 24, 2018 @ 07:36:01 Author: arojas Revision: 332927 Drop Qt4 support Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 86 ++--- 1 file changed, 3 insertions(+), 83 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-08-24 07:22:04 UTC (rev 332926) +++ PKGBUILD2018-08-24 07:36:01 UTC (rev 332927) @@ -4,24 +4,18 @@ # Contributor: Douglas Soares de Andrade pkgbase=qscintilla -pkgname=('qscintilla-qt4' 'python-qscintilla-qt4' 'python2-qscintilla-qt4' - 'python-qscintilla-qt4-common' - 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' +pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') pkgver=2.10.7 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -makedepends=('python-pyqt4' 'python2-pyqt4' 'python-pyqt5' 'python2-pyqt5' 'qt5-tools') +makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip') options=('!buildflags') # Fix Qt Designer plugin source=("http://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz;) sha256sums=('670458de71dd4205e92d8f3b7bad9f667afece925703cde9df6d04bc23331a1a') -prepare() { - cp -a QScintilla_gpl-${pkgver}{,-qt4} -} - build() { cd "$srcdir"/QScintilla_gpl-${pkgver} export QMAKEFEATURES=$PWD/Qt4Qt5/features/ @@ -43,24 +37,6 @@ cd ../Python2 python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 --no-dist-info make - -cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5 -qmake-qt4 -make - -cd ../designer-Qt4Qt5 -qmake-qt4 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 --no-dist-info -make - -cd ../Python2 -python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 --no-dist-info -make } package_qscintilla-qt5() { @@ -106,59 +82,3 @@ # 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 -}
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Monday, July 23, 2018 @ 08:08:33 Author: felixonmars Revision: 329397 Python 3.7 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-07-23 08:07:34 UTC (rev 329396) +++ PKGBUILD2018-07-23 08:08:33 UTC (rev 329397) @@ -9,7 +9,7 @@ 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') pkgver=2.10.7 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, July 8, 2018 @ 19:40:26 Author: arojas Revision: 328113 Update to 2.10.7 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-07-08 19:38:41 UTC (rev 328112) +++ PKGBUILD2018-07-08 19:40:26 UTC (rev 328113) @@ -8,7 +8,7 @@ 'python-qscintilla-qt4-common' 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.10.4 +pkgver=2.10.7 pkgrel=1 license=('GPL') arch=('x86_64') @@ -16,7 +16,7 @@ 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;) -sha256sums=('0353e694a67081e2ecdd7c80e1a848cf79a36dbba78b2afa36009482149b022d') +sha256sums=('670458de71dd4205e92d8f3b7bad9f667afece925703cde9df6d04bc23331a1a') prepare() { cp -a QScintilla_gpl-${pkgver}{,-qt4} @@ -37,11 +37,11 @@ cd ../ cp -rf Python Python2 cd Python -python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 +python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 --no-dist-info make cd ../Python2 -python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 +python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 --no-dist-info make cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5 @@ -55,11 +55,11 @@ cd ../ cp -rf Python Python2 cd Python -python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 +python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 --no-dist-info make cd ../Python2 -python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 +python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 --no-dist-info make }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, April 10, 2018 @ 14:02:53 Author: arojas Revision: 321469 Update to 2.10.4 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-04-10 13:45:40 UTC (rev 321468) +++ PKGBUILD2018-04-10 14:02:53 UTC (rev 321469) @@ -8,7 +8,7 @@ 'python-qscintilla-qt4-common' 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.10.3 +pkgver=2.10.4 pkgrel=1 license=('GPL') arch=('x86_64') @@ -16,7 +16,7 @@ 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;) -sha256sums=('d2657a68e7699d37209ff97db965de7c67884d99b33066d0ba457e6f39b581e7') +sha256sums=('0353e694a67081e2ecdd7c80e1a848cf79a36dbba78b2afa36009482149b022d') prepare() { cp -a QScintilla_gpl-${pkgver}{,-qt4} @@ -45,7 +45,7 @@ make cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5 -qmake-qt4 QMAKE_CXXFLAGS+=-DQT_NO_ACCESSIBILITY +qmake-qt4 make cd ../designer-Qt4Qt5
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, February 28, 2018 @ 08:06:49 Author: arojas Revision: 317610 Update to 2.10.3 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-02-27 22:49:26 UTC (rev 317609) +++ PKGBUILD2018-02-28 08:06:49 UTC (rev 317610) @@ -8,7 +8,7 @@ 'python-qscintilla-qt4-common' 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.10.2 +pkgver=2.10.3 pkgrel=1 license=('GPL') arch=('x86_64') @@ -16,7 +16,7 @@ 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;) -md5sums=('0d2b25ad607f93453c37478e83ec4640') +sha256sums=('d2657a68e7699d37209ff97db965de7c67884d99b33066d0ba457e6f39b581e7') prepare() { cp -a QScintilla_gpl-${pkgver}{,-qt4} @@ -27,11 +27,11 @@ export QMAKEFEATURES=$PWD/Qt4Qt5/features/ cd Qt4Qt5 -qmake-qt5 qscintilla.pro +qmake-qt5 make cd ../designer-Qt4Qt5 -qmake-qt5 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 +qmake-qt5 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make cd ../ @@ -45,11 +45,11 @@ make cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5 -qmake-qt4 qscintilla.pro +qmake-qt4 QMAKE_CXXFLAGS+=-DQT_NO_ACCESSIBILITY make cd ../designer-Qt4Qt5 -qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 +qmake-qt4 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make cd ../
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Friday, November 24, 2017 @ 15:25:27 Author: arojas Revision: 310814 Update to 2.10.2 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-11-24 15:16:22 UTC (rev 310813) +++ PKGBUILD2017-11-24 15:25:27 UTC (rev 310814) @@ -8,7 +8,7 @@ 'python-qscintilla-qt4-common' 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.10.1 +pkgver=2.10.2 pkgrel=1 license=('GPL') arch=('x86_64') @@ -16,7 +16,7 @@ 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;) -md5sums=('e6d74c445bae69ba335acef65d526260') +md5sums=('0d2b25ad607f93453c37478e83ec4640') prepare() { cp -a QScintilla_gpl-${pkgver}{,-qt4}
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, February 25, 2017 @ 11:07:22 Author: arojas Revision: 289523 Update to 2.10 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 14 +++--- 1 file changed, 3 insertions(+), 11 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-02-25 10:57:26 UTC (rev 289522) +++ PKGBUILD2017-02-25 11:07:22 UTC (rev 289523) @@ -8,7 +8,7 @@ 'python-qscintilla-qt4-common' 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.9.4 +pkgver=2.10 pkgrel=1 license=('GPL') arch=('i686' 'x86_64') @@ -15,23 +15,15 @@ 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' +source=("http://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz; 'qscintilla-python-infinite-loop.patch') +md5sums=('a61eb0d598b6787de18450574c2ad3b4' '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() {
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, December 27, 2016 @ 06:46:59 Author: felixonmars Revision: 284833 Python 3.6 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-12-27 06:46:54 UTC (rev 284832) +++ PKGBUILD2016-12-27 06:46:59 UTC (rev 284833) @@ -9,7 +9,7 @@ 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') pkgver=2.9.3 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -87,8 +87,8 @@ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install # Provided by python-qscintilla -rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5/Qsci{.so,.pyi} -rmdir "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5 +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() { @@ -97,9 +97,9 @@ cd QScintilla_gpl-${pkgver}/Python install -Dm755 Qsci.so \ - "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5/Qsci.so + "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt5/Qsci.so install -Dm755 Qsci.pyi \ - "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5/Qsci.pyi + "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt5/Qsci.pyi } package_python2-qscintilla-qt5() { @@ -138,8 +138,8 @@ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install # Provided by python-qscintilla -rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci{.so,.pyi} -rmdir "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4 +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() { @@ -151,9 +151,9 @@ cd QScintilla_gpl-${pkgver}-qt4/Python install -Dm755 Qsci.so \ - "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so + "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt4/Qsci.so install -Dm755 Qsci.pyi \ - "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.pyi + "${pkgdir}"/usr/lib/python3.6/site-packages/PyQt4/Qsci.pyi } package_python2-qscintilla-qt4() {
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, September 17, 2016 @ 02:44:27 Author: felixonmars Revision: 276552 upgpkg: qscintilla 2.9.3-1 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-09-17 02:33:38 UTC (rev 276551) +++ PKGBUILD2016-09-17 02:44:27 UTC (rev 276552) @@ -8,7 +8,7 @@ 'python-qscintilla-qt4-common' 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.9.2 +pkgver=2.9.3 pkgrel=1 license=('GPL') arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ 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=('db260651a5e086cc4eee6417172e27e8' +md5sums=('3b1cdbce9ef6c28cd868bcc58219f96e' '0a952497a52c85bf5c09dd2ee091e763' 'd7b1504fc0c61042a85e44792e462b37')
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, February 2, 2016 @ 17:39:05 Author: fyan Revision: 258791 upgpkg: qscintilla 2.9.1-3 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-02-02 16:03:33 UTC (rev 258790) +++ PKGBUILD2016-02-02 16:39:05 UTC (rev 258791) @@ -9,7 +9,7 @@ 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') pkgver=2.9.1 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Thursday, January 14, 2016 @ 10:10:16 Author: fyan Revision: 258286 upgpkg: qscintilla 2.9.1-2 fix replaces/conflicts/provides array for python-qscintilla-qt4-common Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-01-14 08:57:29 UTC (rev 258285) +++ PKGBUILD2016-01-14 09:10:16 UTC (rev 258286) @@ -9,7 +9,7 @@ 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') pkgver=2.9.1 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -126,9 +126,9 @@ package_python-qscintilla-qt4-common() { pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt4 and python2-qscintilla-qt4" depends=('qscintilla-qt4') -replaces=('qscintilla-common<2.9.1') -conflicts=('qscintilla-common<2.9.1') -provides=("qscintilla-common=$pkgver") +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
[arch-commits] Commit in qscintilla/trunk (PKGBUILD QScintilla-gpl-2.9.1-qt5.patch)
Date: Thursday, January 14, 2016 @ 09:56:53 Author: fyan Revision: 258284 upgpkg: qscintilla 2.9.1-1 add qt5 counterpart and rename the qt4 one Added: qscintilla/trunk/QScintilla-gpl-2.9.1-qt5.patch Modified: qscintilla/trunk/PKGBUILD + PKGBUILD | 125 +++ QScintilla-gpl-2.9.1-qt5.patch | 37 +++ 2 files changed, 139 insertions(+), 23 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-01-14 08:14:52 UTC (rev 258283) +++ PKGBUILD2016-01-14 08:56:53 UTC (rev 258284) @@ -4,27 +4,52 @@ # Contributor: Douglas Soares de Andradepkgbase=qscintilla -pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' - 'python-qscintilla-common') -pkgver=2.9 -pkgrel=3 +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.1 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') +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') -md5sums=('24659879edf9786f41a9b9268ce3c817' - '0a952497a52c85bf5c09dd2ee091e763') +'configure.py-objdir-support.diff' 'QScintilla-gpl-2.9.1-qt5.patch') +md5sums=('38e6248cb970adf6d05aea7d94f1288e' + '0a952497a52c85bf5c09dd2ee091e763' + '9a47f9f990a8a1a8752e144f3351af0a') prepare() { - cd QScintilla-gpl-${pkgver} - patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff + (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.1-qt5.patch) } build() { -cd QScintilla-gpl-${pkgver}/Qt4Qt5 +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 @@ -43,9 +68,9 @@ make } -package_qscintilla() { -pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class" -depends=('qt4') +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 @@ -54,31 +79,85 @@ 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') +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.5/site-packages/PyQt4/Qsci.so +rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5/Qsci.so +rmdir "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5 } -package_python-qscintilla() { +package_python-qscintilla-qt5() { pkgdesc="Python 3.x bindings for QScintilla2" -depends=('python-qscintilla-common' 'python-pyqt4') +depends=('python-qscintilla-qt5-common' 'python-pyqt5') cd QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ - "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so + "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5/Qsci.so } -package_python2-qscintilla() { +package_python2-qscintilla-qt5() { pkgdesc="Python 2.x bindings for QScintilla2" -depends=('python-qscintilla-common' 'python2-pyqt4') +depends=('python-qscintilla-qt5-common' 'python2-pyqt5') cd QScintilla-gpl-${pkgver}/Python2 install -Dm755 Qsci.so \ +
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 23:47:04 Author: foutrelis Revision: 253058 C++11 ABI rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-06 22:37:10 UTC (rev 253057) +++ PKGBUILD2015-12-06 22:47:04 UTC (rev 253058) @@ -7,7 +7,7 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.9 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, September 20, 2015 @ 05:30:31 Author: fyan Revision: 246722 upgpkg: qscintilla 2.9-2 rebuild for python 3.5 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-09-20 03:11:01 UTC (rev 246721) +++ PKGBUILD2015-09-20 03:30:31 UTC (rev 246722) @@ -7,7 +7,7 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.9 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -62,7 +62,7 @@ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install # Provided by python-qscintilla -rm "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so +rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so } package_python-qscintilla() { @@ -71,7 +71,7 @@ cd QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ - "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so + "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() {
[arch-commits] Commit in qscintilla/trunk (PKGBUILD configure.py-objdir-support.diff)
Date: Wednesday, April 29, 2015 @ 11:27:33 Author: fyan Revision: 238242 upgpkg: qscintilla 2.9-1 Modified: qscintilla/trunk/PKGBUILD qscintilla/trunk/configure.py-objdir-support.diff --+ PKGBUILD | 11 ++- configure.py-objdir-support.diff |8 2 files changed, 10 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-04-29 08:52:14 UTC (rev 238241) +++ PKGBUILD2015-04-29 09:27:33 UTC (rev 238242) @@ -1,12 +1,13 @@ # $Id$ -# Maintainer: Andrea Scarpino and...@archlinux.org +# Maintainer: Felix Yan felixonm...@archlinux.org +# 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.8.4 -pkgrel=3 +pkgver=2.9 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -14,8 +15,8 @@ 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') +md5sums=('24659879edf9786f41a9b9268ce3c817' + '0a952497a52c85bf5c09dd2ee091e763') prepare() { cd QScintilla-gpl-${pkgver} Modified: configure.py-objdir-support.diff === --- configure.py-objdir-support.diff2015-04-29 08:52:14 UTC (rev 238241) +++ configure.py-objdir-support.diff2015-04-29 09:27:33 UTC (rev 238242) @@ -8,14 +8,14 @@ --- qscintilla2-2.8.3+dfsg.orig/Python/configure.py2014-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 + import sys +src_dir = os.path.dirname(os.path.abspath(__file__)) + - try: - import sysconfig - except ImportError: + + ### + # 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)
[arch-commits] Commit in qscintilla/trunk (PKGBUILD qsci_link.patch)
Date: Wednesday, November 19, 2014 @ 13:37:34 Author: fyan Revision: 226387 upgpkg: qscintilla 2.8.4-3 use QMAKEFEATURES as suggested Modified: qscintilla/trunk/PKGBUILD Deleted: qscintilla/trunk/qsci_link.patch -+ PKGBUILD| 15 ++- qsci_link.patch | 16 2 files changed, 6 insertions(+), 25 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-11-19 10:16:35 UTC (rev 226386) +++ PKGBUILD2014-11-19 12:37:34 UTC (rev 226387) @@ -6,7 +6,7 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.8.4 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -13,16 +13,13 @@ 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') +'configure.py-objdir-support.diff') md5sums=('28aec903ff48ae541295a4fb9c96f8ea' - 'e304f8cd5e3e7ded61eda15bf56613a8' - '3bb99cf0ebbf9bea6a1d0f9067dc7124') + 'e304f8cd5e3e7ded61eda15bf56613a8') prepare() { cd QScintilla-gpl-${pkgver} patch -p1 -i ${srcdir}/configure.py-objdir-support.diff - patch -p1 -i ${srcdir}/qsci_link.patch } build() { @@ -31,17 +28,17 @@ make cd ../designer-Qt4Qt5 -qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 +QMAKEFEATURES=../Qt4Qt5/features 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 +QMAKEFEATURES=../Qt4Qt5/features 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 +QMAKEFEATURES=../Qt4Qt5/features python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make } Deleted: qsci_link.patch === --- qsci_link.patch 2014-11-19 10:16:35 UTC (rev 226386) +++ qsci_link.patch 2014-11-19 12:37:34 UTC (rev 226387) @@ -1,16 +0,0 @@ -Index: qscintilla2-2.8.3+dfsg/Python/configure.py -=== qscintilla2-2.8.3+dfsg.orig/Python/configure.py2014-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('''
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, October 4, 2014 @ 09:51:14 Author: andrea Revision: 223853 upgpkg: qscintilla 2.8.4-2 Fix Qt Designer plugin Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-10-04 05:15:52 UTC (rev 223852) +++ PKGBUILD2014-10-04 07:51:14 UTC (rev 223853) @@ -6,11 +6,12 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.8.4 -pkgrel=1 +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')
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, September 13, 2014 @ 09:52:18 Author: andrea Revision: 221527 upgpkg: qscintilla 2.8.4-1 Upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-09-13 07:48:41 UTC (rev 221526) +++ PKGBUILD2014-09-13 07:52:18 UTC (rev 221527) @@ -5,8 +5,8 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.8.3 -pkgrel=4 +pkgver=2.8.4 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -14,7 +14,7 @@ source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff' 'qsci_link.patch') -md5sums=('bbf6944a9d3b089a79763ca4e6486b9d' +md5sums=('28aec903ff48ae541295a4fb9c96f8ea' 'e304f8cd5e3e7ded61eda15bf56613a8' '3bb99cf0ebbf9bea6a1d0f9067dc7124')
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, July 15, 2014 @ 09:14:20 Author: andrea Revision: 216898 upgpkg: qscintilla 2.8.3-3 Packages needs a rebuild, see FS#41103 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-07-14 21:16:07 UTC (rev 216897) +++ PKGBUILD2014-07-15 07:14:20 UTC (rev 216898) @@ -6,7 +6,7 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.8.3 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, July 5, 2014 @ 19:31:50 Author: andrea Revision: 216550 upgpkg: qscintilla 2.8.3-2 pyqt rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-07-05 16:05:54 UTC (rev 216549) +++ PKGBUILD2014-07-05 17:31:50 UTC (rev 216550) @@ -6,7 +6,7 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.8.3 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD configure.py-objdir-support.diff)
Date: Thursday, July 3, 2014 @ 22:25:54 Author: andrea Revision: 216433 upgpkg: qscintilla 2.8.3-1 Upstream release Modified: qscintilla/trunk/PKGBUILD Deleted: qscintilla/trunk/configure.py-objdir-support.diff --+ PKGBUILD | 15 --- configure.py-objdir-support.diff | 21 - 2 files changed, 4 insertions(+), 32 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-07-03 20:25:44 UTC (rev 216432) +++ PKGBUILD2014-07-03 20:25:54 UTC (rev 216433) @@ -5,23 +5,16 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.8.1 -pkgrel=2 +pkgver=2.8.3 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') options=('!buildflags') -source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz; -'configure.py-objdir-support.diff') -md5sums=('bbf4725583ee9817f89413dca6cd38d2' - 'eae1bd23117c5f1f7f172a1c1e11f600') +source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz;) +md5sums=('bbf6944a9d3b089a79763ca4e6486b9d') -prepare() { -cd QScintilla-gpl-${pkgver} -patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff -} - build() { cd QScintilla-gpl-${pkgver}/Qt4Qt5 qmake-qt4 qscintilla.pro Deleted: configure.py-objdir-support.diff === --- configure.py-objdir-support.diff2014-07-03 20:25:44 UTC (rev 216432) +++ configure.py-objdir-support.diff2014-07-03 20:25:54 UTC (rev 216433) @@ -1,21 +0,0 @@ QScintilla-gpl-2.7.1/Python/configure.py~ 2013-03-07 08:09:00.678704222 + -+++ QScintilla-gpl-2.7.1/Python/configure.py 2013-03-07 08:11:48.860880852 + -@@ -29,6 +29,8 @@ - import glob - import optparse - -+src_dir = os.path.dirname(os.path.abspath(__file__)) -+ - try: - import sysconfig - except ImportError: -@@ -455,6 +457,9 @@ - - # Get the QScintilla version string. - sciversstr = read_define(sciglobal, 'QSCINTILLA_VERSION_STR') -+ -+return # Debian: do not check for the installed version, we're good this way. -+ - if sciversstr is None: - error( - The QScintilla version number could not be determined by
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Monday, April 14, 2014 @ 09:20:45 Author: andrea Revision: 210310 upgpkg: qscintilla 2.8.1-2 Fix broken symbols (FS#39672) Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-04-14 07:16:09 UTC (rev 210309) +++ PKGBUILD2014-04-14 07:20:45 UTC (rev 210310) @@ -6,11 +6,12 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.8.1 -pkgrel=1 +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') source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') md5sums=('bbf4725583ee9817f89413dca6cd38d2'
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Monday, March 17, 2014 @ 15:12:55 Author: andrea Revision: 208067 upgpkg: qscintilla 2.8.1-1 Upstream release; python 3.4 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-03-17 14:04:42 UTC (rev 208066) +++ PKGBUILD2014-03-17 14:12:55 UTC (rev 208067) @@ -5,7 +5,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.8 +pkgver=2.8.1 pkgrel=1 license=('GPL') arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') -md5sums=('02c406d8cd5db661f127303e91775c0b' +md5sums=('bbf4725583ee9817f89413dca6cd38d2' 'eae1bd23117c5f1f7f172a1c1e11f600') prepare() { @@ -60,7 +60,7 @@ make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install # Provided by python-qscintilla -rm ${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so +rm ${pkgdir}/usr/lib/python3.4/site-packages/PyQt4/Qsci.so } package_python-qscintilla() { @@ -69,7 +69,7 @@ cd QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ - ${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so + ${pkgdir}/usr/lib/python3.4/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() {
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, November 9, 2013 @ 08:16:19 Author: andrea Revision: 199275 upgpkg: qscintilla 2.8-1 Upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 36 +++- 1 file changed, 19 insertions(+), 17 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-11-09 05:21:55 UTC (rev 199274) +++ PKGBUILD2013-11-09 07:16:19 UTC (rev 199275) @@ -5,8 +5,8 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.7.2 -pkgrel=3 +pkgver=2.8 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -13,17 +13,19 @@ makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') -md5sums=('0fbfb06078f206a241a62c94861cce21' +md5sums=('02c406d8cd5db661f127303e91775c0b' 'eae1bd23117c5f1f7f172a1c1e11f600') -build() { -cd ${srcdir}/QScintilla-gpl-${pkgver} +prepare() { +cd QScintilla-gpl-${pkgver} patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff +} -cd Qt4Qt5 +build() { +cd QScintilla-gpl-${pkgver}/Qt4Qt5 qmake-qt4 qscintilla.pro make - + cd ../designer-Qt4Qt5 qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make @@ -36,7 +38,7 @@ cd ../Python2 python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 -make +make } package_qscintilla() { @@ -43,10 +45,10 @@ pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class depends=('qt4') -cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5 +cd QScintilla-gpl-${pkgver}/Qt4Qt5 make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install -cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4Qt5 +cd ../designer-Qt4Qt5 make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install } @@ -54,11 +56,11 @@ pkgdesc=Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla depends=('qscintilla') -cd ${srcdir}/QScintilla-gpl-${pkgver}/Python +cd 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 +rm ${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so } package_python-qscintilla() { @@ -65,9 +67,9 @@ pkgdesc=Python 3.x bindings for QScintilla2 depends=('python-qscintilla-common' 'python-pyqt4') -cd ${srcdir}/QScintilla-gpl-${pkgver}/Python +cd QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ - ${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so + ${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() { @@ -74,7 +76,7 @@ pkgdesc=Python 2.x bindings for QScintilla2 depends=('python-qscintilla-common' 'python2-pyqt4') -cd ${srcdir}/QScintilla-gpl-${pkgver}/Python2 +cd QScintilla-gpl-${pkgver}/Python2 install -Dm755 Qsci.so \ - ${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so + ${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Monday, August 26, 2013 @ 15:32:36 Author: andrea Revision: 193633 upgpkg: qscintilla 2.7.2-3 PyQt rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-08-26 12:24:23 UTC (rev 193632) +++ PKGBUILD2013-08-26 13:32:36 UTC (rev 193633) @@ -6,7 +6,7 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.7.2 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, June 18, 2013 @ 14:21:46 Author: andrea Revision: 188707 upgpkg: qscintilla 2.7.2-2 PyQt4 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-06-18 11:16:37 UTC (rev 188706) +++ PKGBUILD2013-06-18 12:21:46 UTC (rev 188707) @@ -6,11 +6,11 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.7.2 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -makedepends=('python2-pyqt' 'pyqt' 'chrpath') +makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') md5sums=('0fbfb06078f206a241a62c94861cce21' @@ -63,7 +63,7 @@ package_python-qscintilla() { pkgdesc=Python 3.x bindings for QScintilla2 -depends=('python-qscintilla-common' 'pyqt') +depends=('python-qscintilla-common' 'python-pyqt4') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ @@ -72,7 +72,7 @@ package_python2-qscintilla() { pkgdesc=Python 2.x bindings for QScintilla2 -depends=('python-qscintilla-common' 'python2-pyqt') +depends=('python-qscintilla-common' 'python2-pyqt4') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python2 install -Dm755 Qsci.so \
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Monday, June 17, 2013 @ 20:07:01 Author: andrea Revision: 188679 upgpkg: qscintilla 2.7.2-1 Upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-06-17 18:06:55 UTC (rev 188678) +++ PKGBUILD2013-06-17 18:07:01 UTC (rev 188679) @@ -5,7 +5,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=1 license=('GPL') arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('python2-pyqt' 'pyqt' 'chrpath') source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') -md5sums=('da8939b5679a075e30c6632e54dc5abf' +md5sums=('0fbfb06078f206a241a62c94861cce21' 'eae1bd23117c5f1f7f172a1c1e11f600') build() { @@ -21,21 +21,21 @@ patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff cd Qt4Qt5 -qmake qscintilla.pro +qmake-qt4 qscintilla.pro make cd ../designer-Qt4Qt5 -qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 +qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make cd ../ cp -rf Python Python2 cd Python -python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c +python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make cd ../Python2 -python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c +python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD configure.py-objdir-support.diff)
Date: Thursday, March 7, 2013 @ 09:19:38 Author: andrea Revision: 179561 upgpkg: qscintilla 2.7.1-1 Upstream release Modified: qscintilla/trunk/PKGBUILD qscintilla/trunk/configure.py-objdir-support.diff --+ PKGBUILD | 18 + configure.py-objdir-support.diff | 50 +++-- 2 files changed, 24 insertions(+), 44 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-07 08:19:05 UTC (rev 179560) +++ PKGBUILD2013-03-07 08:19:38 UTC (rev 179561) @@ -5,20 +5,18 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.7 -pkgrel=2 +pkgver=2.7.1 +pkgrel=1 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=('a3857d75a2b332e0460131e0aa4cc4b5' - '8cf9c06252e2f11ab00e62848e322fd3') +md5sums=('da8939b5679a075e30c6632e54dc5abf' + 'eae1bd23117c5f1f7f172a1c1e11f600') build() { -. /etc/profile.d/qt4.sh - cd ${srcdir}/QScintilla-gpl-${pkgver} patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff @@ -26,18 +24,18 @@ qmake qscintilla.pro make -cd ../designer-Qt4 +cd ../designer-Qt4Qt5 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 +python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c make cd ../Python2 -python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 +python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c make } @@ -48,7 +46,7 @@ cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5 make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install -cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4 +cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4Qt5 make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install } Modified: configure.py-objdir-support.diff === --- configure.py-objdir-support.diff2013-03-07 08:19:05 UTC (rev 179560) +++ configure.py-objdir-support.diff2013-03-07 08:19:38 UTC (rev 179561) @@ -1,39 +1,21 @@ -#! /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.0 +0100 -+++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417 +0100 -@@ -33,6 +33,7 @@ +--- QScintilla-gpl-2.7.1/Python/configure.py~ 2013-03-07 08:09:00.678704222 + QScintilla-gpl-2.7.1/Python/configure.py 2013-03-07 08:11:48.860880852 + +@@ -29,6 +29,8 @@ import glob import optparse +src_dir = os.path.dirname(os.path.abspath(__file__)) ++ + try: + import sysconfig + except ImportError: +@@ -455,6 +457,9 @@ - # 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 = 0x04: --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)) - + # Get the QScintilla version string. + sciversstr = read_define(sciglobal, 'QSCINTILLA_VERSION_STR') ++ ++return # Debian: do not check for the installed version, we're good this way. ++ + if sciversstr is None: + error( + The QScintilla version number could not be determined by
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, February 26, 2013 @ 11:25:07 Author: andrea Revision: 178695 upgpkg: qscintilla 2.7-2 qt4 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-02-26 10:20:09 UTC (rev 178694) +++ PKGBUILD2013-02-26 10:25:07 UTC (rev 178695) @@ -6,7 +6,7 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.7 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -17,7 +17,9 @@ '8cf9c06252e2f11ab00e62848e322fd3') build() { -cd ${srcdir}/QScintilla-gpl-${pkgver} +. /etc/profile.d/qt4.sh + +cd ${srcdir}/QScintilla-gpl-${pkgver} patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff cd Qt4Qt5 @@ -41,7 +43,7 @@ package_qscintilla() { pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class -depends=('qt') +depends=('qt4') cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5 make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, December 9, 2012 @ 10:31:16 Author: andrea Revision: 173041 upgpkg: qscintilla 2.7-1 Upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-12-09 15:29:07 UTC (rev 173040) +++ PKGBUILD2012-12-09 15:31:16 UTC (rev 173041) @@ -5,15 +5,15 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.6.2 -pkgrel=3 +pkgver=2.7 +pkgrel=1 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' +md5sums=('a3857d75a2b332e0460131e0aa4cc4b5' '8cf9c06252e2f11ab00e62848e322fd3') build() {
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, October 3, 2012 @ 16:21:48 Author: andrea Revision: 167918 upgpkg: qscintilla 2.6.2-3 Python rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-10-03 20:04:09 UTC (rev 167917) +++ PKGBUILD2012-10-03 20:21:48 UTC (rev 167918) @@ -6,12 +6,12 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.6.2 -pkgrel=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://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz; +source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9' '8cf9c06252e2f11ab00e62848e322fd3') @@ -31,7 +31,7 @@ cd ../ cp -rf Python Python2 cd Python -python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 +python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 make cd ../Python2 @@ -58,7 +58,7 @@ make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install # Provided by python-qscintilla -rm ${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so +rm ${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so } package_python-qscintilla() { @@ -67,7 +67,7 @@ cd ${srcdir}/QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ - ${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so + ${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() {
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Thursday, September 6, 2012 @ 15:14:11 Author: andrea Revision: 166342 Fix description Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-09-06 18:04:29 UTC (rev 166341) +++ PKGBUILD2012-09-06 19:14:11 UTC (rev 166342) @@ -52,7 +52,7 @@ } package_python-qscintilla-common() { -pkgdest=Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla +pkgdesc=Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla depends=('qscintilla') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Thursday, September 6, 2012 @ 17:53:44 Author: andrea Revision: 166360 upgpkg: qscintilla 2.6.2-2 bump pkgrel to fill python-qscintilla-common desc Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-09-06 21:43:48 UTC (rev 166359) +++ PKGBUILD2012-09-06 21:53:44 UTC (rev 166360) @@ -1,13 +1,12 @@ # $Id$ -# Maintainer: -# Contributor: Andrea Scarpino and...@archlinux.org +# Maintainer: 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 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, June 27, 2012 @ 15:56:06 Author: andrea Revision: 162669 Upstream release; remove the python3 dependence from the python2 bindings package Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 41 +++-- 1 file changed, 27 insertions(+), 14 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-06-27 19:36:01 UTC (rev 162668) +++ PKGBUILD2012-06-27 19:56:06 UTC (rev 162669) @@ -4,38 +4,39 @@ # Contributor: Douglas Soares de Andrade d...@aur.archlinux.org pkgbase=qscintilla -pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.6.1 +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' 'chrpath') +makedepends=('python2-pyqt' 'pyqt' 'chrpath') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') -md5sums=('39a1d0567a20b416177eb1a8afe225a7' +md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9' '8cf9c06252e2f11ab00e62848e322fd3') build() { cd ${srcdir}/QScintilla-gpl-${pkgver} patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff -cd Qt4 +cd Qt4Qt5 qmake qscintilla.pro make cd ../designer-Qt4 -qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4 +qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make cd ../ cp -rf Python Python2 cd Python -python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 +python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 make cd ../Python2 -python2 configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 +python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 make } @@ -43,16 +44,27 @@ pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class depends=('qt') -cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4 +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 bindings for QScintilla2 -depends=('pyqt' 'qscintilla') +pkgdesc=Python 3.x bindings for QScintilla2 +depends=('python-qscintilla-common' 'pyqt') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ @@ -60,9 +72,10 @@ } package_python2-qscintilla() { -pkgdesc=Python 2 bindings for QScintilla2 -depends=('python-qscintilla' 'python2-pyqt') +pkgdesc=Python 2.x bindings for QScintilla2 +depends=('python-qscintilla-common' 'python2-pyqt') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python2 -make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install +install -Dm755 Qsci.so \ + ${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Monday, February 13, 2012 @ 06:40:26 Author: eric Revision: 150136 upgpkg: qscintilla 2.6.1-1 Upstream update Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-02-13 11:01:23 UTC (rev 150135) +++ PKGBUILD2012-02-13 11:40:26 UTC (rev 150136) @@ -5,18 +5,17 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.6 -pkgrel=2 +pkgver=2.6.1 +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' +md5sums=('39a1d0567a20b416177eb1a8afe225a7' '8cf9c06252e2f11ab00e62848e322fd3') - build() { cd ${srcdir}/QScintilla-gpl-${pkgver} patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Friday, December 23, 2011 @ 15:53:50 Author: andrea Revision: 145610 upgpkg: qscintilla 2.6-2 PyQt rebuild, fix (FS#27690) Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-12-23 17:39:17 UTC (rev 145609) +++ PKGBUILD2011-12-23 20:53:50 UTC (rev 145610) @@ -6,7 +6,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') pkgver=2.6 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -58,9 +58,6 @@ 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() { @@ -69,7 +66,4 @@ 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 }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, November 12, 2011 @ 03:13:27 Author: andrea Revision: 142562 upgpkg: qscintilla 2.6-1 Upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 17 - 1 file changed, 12 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-11-12 07:58:37 UTC (rev 142561) +++ PKGBUILD2011-11-12 08:13:27 UTC (rev 142562) @@ -1,18 +1,19 @@ # $Id$ -# Maintainer: Andrea Scarpino and...@archlinux.org +# 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.5.1 -pkgrel=2 +pkgver=2.6 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -makedepends=('python2-pyqt') +makedepends=('python2-pyqt' 'chrpath') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') -md5sums=('dd7edef5ff674d307057a3c12dbd8fce' +md5sums=('0605a8006ea752ec2d1d7fc4791d1c75' '8cf9c06252e2f11ab00e62848e322fd3') @@ -57,6 +58,9 @@ 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() { @@ -65,4 +69,7 @@ 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 }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, May 7, 2011 @ 19:41:27 Author: andrea Revision: 123072 upgpkg: qscintilla 2.5.1-2 fix dependencies Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-05-07 23:28:51 UTC (rev 123071) +++ PKGBUILD2011-05-07 23:41:27 UTC (rev 123072) @@ -5,11 +5,11 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') pkgver=2.5.1 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -makedepends=('python-qt') +makedepends=('python2-pyqt') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') md5sums=('dd7edef5ff674d307057a3c12dbd8fce' @@ -52,7 +52,7 @@ package_python-qscintilla() { pkgdesc=Python 3 bindings for QScintilla2 -depends=('python-qt' 'python2-qscintilla') +depends=('pyqt' 'qscintilla') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ @@ -61,7 +61,7 @@ package_python2-qscintilla() { pkgdesc=Python 2 bindings for QScintilla2 -depends=('qscintilla' 'python2-qt') +depends=('python-qscintilla' 'python2-pyqt') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python2 make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, April 17, 2011 @ 07:43:04 Author: andrea Revision: 119950 upgpkg: qscintilla 2.5.1-1 upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-17 10:34:47 UTC (rev 119949) +++ PKGBUILD2011-04-17 11:43:04 UTC (rev 119950) @@ -4,7 +4,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.5 +pkgver=2.5.1 pkgrel=1 license=('GPL') arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('python-qt') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') -md5sums=('c4677b837c16bcb9d806ff04d5a727b8' +md5sums=('dd7edef5ff674d307057a3c12dbd8fce' '8cf9c06252e2f11ab00e62848e322fd3')
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Thursday, March 31, 2011 @ 17:19:18 Author: andrea Revision: 117371 upstream release; merged python2-qscintilla Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-03-31 21:18:56 UTC (rev 117370) +++ PKGBUILD2011-03-31 21:19:18 UTC (rev 117371) @@ -3,16 +3,16 @@ # Contributor: Douglas Soares de Andrade d...@aur.archlinux.org pkgbase=qscintilla -pkgname=('qscintilla' 'python-qscintilla') -pkgver=2.4.6 -pkgrel=8 +pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') +pkgver=2.5 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; makedepends=('python-qt') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') -md5sums=('424a89736b900e6ca5bc6d929cdafaf8' +md5sums=('c4677b837c16bcb9d806ff04d5a727b8' '8cf9c06252e2f11ab00e62848e322fd3') @@ -28,9 +28,15 @@ qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4 make -cd ../Python +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() { @@ -52,3 +58,11 @@ install -Dm755 Qsci.so \ ${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so } + +package_python2-qscintilla() { +pkgdesc=Python 2 bindings for QScintilla2 +depends=('qscintilla' 'python2-qt') + +cd ${srcdir}/QScintilla-gpl-${pkgver}/Python2 +make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install +}
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, February 22, 2011 @ 13:04:04 Author: andrea Revision: 110817 Fix to install the library into /usr/lib/python3.2 Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-22 16:52:20 UTC (rev 110816) +++ PKGBUILD2011-02-22 18:04:04 UTC (rev 110817) @@ -5,7 +5,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla') pkgver=2.4.6 -pkgrel=7 +pkgrel=8 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -50,5 +50,5 @@ cd ${srcdir}/QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ - ${pkgdir}/usr/lib/python3.1/site-packages/PyQt4/Qsci.so + ${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Monday, February 21, 2011 @ 07:43:44 Author: andrea Revision: 110676 upgpkg: qscintilla 2.4.6-7 python 3.2 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-02-21 12:43:41 UTC (rev 110675) +++ PKGBUILD2011-02-21 12:43:44 UTC (rev 110676) @@ -5,7 +5,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla') pkgver=2.4.6 -pkgrel=6 +pkgrel=7 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, January 29, 2011 @ 07:31:00 Author: andrea Revision: 108083 upgpkg: qscintilla 2.4.6-6 needs a rebuild for new pyqt (FS#22646) Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-01-29 12:21:16 UTC (rev 108082) +++ PKGBUILD2011-01-29 12:31:00 UTC (rev 108083) @@ -5,7 +5,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla') pkgver=2.4.6 -pkgrel=5 +pkgrel=6 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, January 22, 2011 @ 08:42:16 Author: andrea Revision: 107199 upgpkg: qscintilla 2.4.6-5 move python stuff again in python2-qscintilla Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 16 +--- 1 file changed, 5 insertions(+), 11 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-01-22 10:37:28 UTC (rev 107198) +++ PKGBUILD2011-01-22 13:42:16 UTC (rev 107199) @@ -5,7 +5,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla') pkgver=2.4.6 -pkgrel=4 +pkgrel=5 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -17,7 +17,7 @@ build() { -cd $srcdir/QScintilla-gpl-$pkgver +cd ${srcdir}/QScintilla-gpl-${pkgver} patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff cd Qt4 @@ -37,17 +37,11 @@ pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class depends=('qt') -cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4 +cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4 make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install -cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4 +cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4 make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install - -cd ${srcdir}/QScintilla-gpl-${pkgver}/Python -make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install - -# Provided by python-qscintilla -rm ${pkgdir}/usr/lib/python3.1/site-packages/PyQt4/Qsci.so } package_python-qscintilla() { @@ -56,5 +50,5 @@ cd ${srcdir}/QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ - ${pkgdir}/usr/lib/python3.1/site-packages/PyQt4/Qsci.so + ${pkgdir}/usr/lib/python3.1/site-packages/PyQt4/Qsci.so }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, January 22, 2011 @ 08:44:56 Author: andrea Revision: 107204 fix python-qscintilla dependencies Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-01-22 13:43:07 UTC (rev 107203) +++ PKGBUILD2011-01-22 13:44:56 UTC (rev 107204) @@ -46,7 +46,7 @@ package_python-qscintilla() { pkgdesc=Python 3 bindings for QScintilla2 -depends=('qscintilla' 'python-qt') +depends=('python-qt' 'python2-qscintilla') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, January 19, 2011 @ 12:24:26 Author: andrea Revision: 106881 upgpkg: qscintilla 2.4.6-3 add qscintilla python 3 library; split out python 2 library in a new package and install common files into the qscintilla package Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 26 -- 1 file changed, 12 insertions(+), 14 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-01-19 17:20:07 UTC (rev 106880) +++ PKGBUILD2011-01-19 17:24:26 UTC (rev 106881) @@ -3,13 +3,13 @@ # Contributor: Douglas Soares de Andrade d...@aur.archlinux.org pkgbase=qscintilla -pkgname=('qscintilla' 'python2-qscintilla') +pkgname=('qscintilla' 'python-qscintilla') pkgver=2.4.6 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -makedepends=('python2-qt') +makedepends=('python-qt') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz; 'configure.py-objdir-support.diff') md5sums=('424a89736b900e6ca5bc6d929cdafaf8' @@ -29,15 +29,12 @@ make cd ../Python -python2 configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 +python 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 -provides=('qscintilla2') -conflicts=('qscintilla2') -replaces=('qscintilla2') depends=('qt') cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4 @@ -45,15 +42,16 @@ cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4 make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install + +cd ${srcdir}/QScintilla-gpl-${pkgver}/Python +make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install } -package_python2-qscintilla() { -pkgdesc=Python bindings for QScintilla2 -provides=(python-qscintilla=${pkgver}) -conflicts=('python-qscintilla2' 'python-qscintilla') -replaces=('python-qscintilla2' 'python-qscintilla') -depends=('qscintilla' 'python2-qt') +package_python-qscintilla() { +pkgdesc=Python 3 bindings for QScintilla2 +depends=('qscintilla' 'python-qt') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python -make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install +install -Dm755 Qsci.so \ + ${pkgdir}/usr/lib/python3.1/site-packages/PyQt4/Qsci.so }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, January 19, 2011 @ 16:48:43 Author: andrea Revision: 106969 upgpkg: qscintilla 2.4.6-4 fix conlicts (FS#22514) Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |5 - 1 file changed, 4 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-01-19 21:37:10 UTC (rev 106968) +++ PKGBUILD2011-01-19 21:48:43 UTC (rev 106969) @@ -5,7 +5,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla') pkgver=2.4.6 -pkgrel=3 +pkgrel=4 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; @@ -45,6 +45,9 @@ cd ${srcdir}/QScintilla-gpl-${pkgver}/Python make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install + +# Provided by python-qscintilla +rm ${pkgdir}/usr/lib/python3.1/site-packages/PyQt4/Qsci.so } package_python-qscintilla() {
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Monday, January 10, 2011 @ 21:24:38 Author: andrea Revision: 105739 upgpkg: qscintilla 2.4.6-2 rename python-qscintilla as python2-qscintilla Modified: qscintilla/trunk/PKGBUILD (contents, properties) --+ PKGBUILD | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-01-11 02:12:08 UTC (rev 105738) +++ PKGBUILD2011-01-11 02:24:38 UTC (rev 105739) @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 46926 2009-07-22 04:56:17Z pierre $ +# $Id$ # Maintainer: Andrea Scarpino and...@archlinux.org # Contributor: Douglas Soares de Andrade d...@aur.archlinux.org -# Contributor: Michal Krenek mi...@sg1.cz -# Contributor: DaNiMoTh jjdanimoth@gmail.com pkgbase=qscintilla -pkgname=(qscintilla python-qscintilla) +pkgname=('qscintilla' 'python2-qscintilla') pkgver=2.4.6 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -makedepends=('pyqt') -source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz -configure.py-objdir-support.diff) +makedepends=('python2-qt') +source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz; +'configure.py-objdir-support.diff') md5sums=('424a89736b900e6ca5bc6d929cdafaf8' '8cf9c06252e2f11ab00e62848e322fd3') @@ -49,11 +47,12 @@ make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install } -package_python-qscintilla() { +package_python2-qscintilla() { pkgdesc=Python bindings for QScintilla2 -conflicts=('python-qscintilla2') -replaces=('python-qscintilla2') -depends=('qscintilla' 'pyqt') +provides=(python-qscintilla=${pkgver}) +conflicts=('python-qscintilla2' 'python-qscintilla') +replaces=('python-qscintilla2' 'python-qscintilla') +depends=('qscintilla' 'python2-qt') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install Property changes on: qscintilla/trunk/PKGBUILD ___ Added: svn:keywords + Id
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Friday, December 24, 2010 @ 11:07:40 Author: andrea Revision: 103969 upgpkg: qscintilla 2.4.6-1 upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-12-24 15:30:00 UTC (rev 103968) +++ PKGBUILD2010-12-24 16:07:40 UTC (rev 103969) @@ -6,15 +6,15 @@ pkgbase=qscintilla pkgname=(qscintilla python-qscintilla) -pkgver=2.4.5 -pkgrel=4 +pkgver=2.4.6 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -makedepends=('pyqt' 'qscintilla') +makedepends=('pyqt') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz configure.py-objdir-support.diff) -md5sums=('8063f8f933513959432c27c5ffecf56b' +md5sums=('424a89736b900e6ca5bc6d929cdafaf8' '8cf9c06252e2f11ab00e62848e322fd3')
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, October 23, 2010 @ 20:37:21 Author: andrea Revision: 96676 upgpkg: qscintilla 2.4.5-4 pyqt rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-10-23 20:27:22 UTC (rev 96675) +++ PKGBUILD2010-10-24 00:37:21 UTC (rev 96676) @@ -7,11 +7,11 @@ pkgbase=qscintilla pkgname=(qscintilla python-qscintilla) pkgver=2.4.5 -pkgrel=3 +pkgrel=4 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -makedepends=('qt' 'pyqt') +makedepends=('pyqt' 'qscintilla') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz configure.py-objdir-support.diff) md5sums=('8063f8f933513959432c27c5ffecf56b'
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, October 6, 2010 @ 16:51:05 Author: andrea Revision: 94358 upgpkg: qscintilla 2.4.5-2 upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2010-10-06 20:49:19 UTC (rev 94357) +++ PKGBUILD2010-10-06 20:51:05 UTC (rev 94358) @@ -7,7 +7,7 @@ pkgbase=qscintilla pkgname=(qscintilla python-qscintilla) pkgver=2.4.5 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, October 6, 2010 @ 16:59:11 Author: andrea Revision: 94369 python 2.7 rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2010-10-06 20:58:29 UTC (rev 94368) +++ PKGBUILD2010-10-06 20:59:11 UTC (rev 94369) @@ -7,7 +7,7 @@ pkgbase=qscintilla pkgname=(qscintilla python-qscintilla) pkgver=2.4.5 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Saturday, September 4, 2010 @ 01:30:53 Author: remy Revision: 89791 upgpkg: qscintilla 2.4.5-1 Upstream update (old sources not available). Rebuild for python2. Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-09-04 05:26:17 UTC (rev 89790) +++ PKGBUILD2010-09-04 05:30:53 UTC (rev 89791) @@ -6,15 +6,15 @@ pkgbase=qscintilla pkgname=(qscintilla python-qscintilla) -pkgver=2.4.4 -pkgrel=2 +pkgver=2.4.5 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; makedepends=('qt' 'pyqt') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz configure.py-objdir-support.diff) -md5sums=('db5f21723ea976ddd78c4c3662a21f9c' +md5sums=('8063f8f933513959432c27c5ffecf56b' '8cf9c06252e2f11ab00e62848e322fd3') @@ -31,7 +31,7 @@ make cd ../Python -python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 +python2 configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 make }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD configure.py-objdir-support.diff)
Date: Wednesday, July 14, 2010 @ 09:39:20 Author: jgc Revision: 85482 Add patch from Debian to build python-qscintilla and qscintilla from one PKGBUILD. Clean up build and use INSTALL_ROOT instead of copying and hacking things around. Changes qsci.path due to the removed sed operations, the old one was invalid Added: qscintilla/trunk/configure.py-objdir-support.diff Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 63 - configure.py-objdir-support.diff | 39 ++ 2 files changed, 74 insertions(+), 28 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-07-14 10:52:35 UTC (rev 85481) +++ PKGBUILD2010-07-14 13:39:20 UTC (rev 85482) @@ -4,48 +4,55 @@ # Contributor: Michal Krenek mi...@sg1.cz # Contributor: DaNiMoTh jjdanimoth@gmail.com -pkgname=qscintilla +pkgbase=qscintilla +pkgname=(qscintilla python-qscintilla) pkgver=2.4.4 -pkgrel=1 +pkgrel=2 license=('GPL') -pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -depends=('qt') -provides=('qscintilla2') -conflicts=('qscintilla2') -replaces=('qscintilla2') -source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz;) -md5sums=('db5f21723ea976ddd78c4c3662a21f9c') +makedepends=('qt' 'pyqt') +source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz +configure.py-objdir-support.diff) +md5sums=('db5f21723ea976ddd78c4c3662a21f9c' + '8cf9c06252e2f11ab00e62848e322fd3') build() { -cd $srcdir/QScintilla-gpl-$pkgver/Qt4 -sed -i s|header.path = .*|header.path = $pkgdir/usr/include|g qscintilla.pro -sed -i s|trans.path = .*|trans.path = $pkgdir/usr/share/qt/translations|g qscintilla.pro -sed -i s|qsci.path = .*|qsci.path = $pkgdir/usr/share/qt/translations|g qscintilla.pro +cd $srcdir/QScintilla-gpl-$pkgver +patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff +cd Qt4 qmake qscintilla.pro -sed -i 's|$(MOVE) $(TARGET)|$(COPY) $(TARGET)|g' Makefile make -# Qt4 designer qscintilla2 plugin cd ../designer-Qt4 -install -d ${pkgdir}/usr/lib/qt/plugins/designer -echo INCPATH += ../Qt4 designer.pro -sed -i s|LIBS.*|LIBS += -L../Qt4 -lqscintilla2|g designer.pro -qmake designer.pro +qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4 make + +cd ../Python +python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4 +make } -package() { - cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4 - make DESTDIR=${pkgdir} install - cp libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/ - ln -s libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/libqscintilla2.so - ln -s libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/libqscintilla2.so.5 - ln -s libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/libqscintilla2.so.5.4 +package_qscintilla() { +pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class +provides=('qscintilla2') +conflicts=('qscintilla2') +replaces=('qscintilla2') +depends=('qt') - cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4 - cp libqscintillaplugin.so ${pkgdir}/usr/lib/qt/plugins/designer/ +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 bindings for QScintilla2 +depends=('qscintilla' 'pyqt') + +cd ${srcdir}/QScintilla-gpl-${pkgver}/Python +make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install +} Added: configure.py-objdir-support.diff === --- configure.py-objdir-support.diff(rev 0) +++ configure.py-objdir-support.diff2010-07-14 13:39:20 UTC (rev 85482) @@ -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.0 +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. +
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Wednesday, July 14, 2010 @ 09:41:49 Author: jgc Revision: 85483 Add conflicts/replaces that were present in python-qscintilla PKGBUILD Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 ++ 1 file changed, 2 insertions(+) Modified: PKGBUILD === --- PKGBUILD2010-07-14 13:39:20 UTC (rev 85482) +++ PKGBUILD2010-07-14 13:41:49 UTC (rev 85483) @@ -51,6 +51,8 @@ package_python-qscintilla() { pkgdesc=Python bindings for QScintilla2 +conflicts=('python-qscintilla2') +replaces=('python-qscintilla2') depends=('qscintilla' 'pyqt') cd ${srcdir}/QScintilla-gpl-${pkgver}/Python
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, July 13, 2010 @ 15:27:29 Author: andrea Revision: 85459 upgpkg: qscintilla 2.4.4-1 upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-07-13 18:40:04 UTC (rev 85458) +++ PKGBUILD2010-07-13 19:27:29 UTC (rev 85459) @@ -5,7 +5,7 @@ # Contributor: DaNiMoTh jjdanimoth@gmail.com pkgname=qscintilla -pkgver=2.4.3 +pkgver=2.4.4 pkgrel=1 license=('GPL') pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class @@ -16,8 +16,9 @@ conflicts=('qscintilla2') replaces=('qscintilla2') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz;) -md5sums=('b1c83d42398493bedb22f4df1868627d') +md5sums=('db5f21723ea976ddd78c4c3662a21f9c') + build() { cd $srcdir/QScintilla-gpl-$pkgver/Qt4 sed -i s|header.path = .*|header.path = $pkgdir/usr/include|g qscintilla.pro @@ -26,7 +27,7 @@ qmake qscintilla.pro sed -i 's|$(MOVE) $(TARGET)|$(COPY) $(TARGET)|g' Makefile -make DESTDIR=${pkgdir} || return 1 +make # Qt4 designer qscintilla2 plugin cd ../designer-Qt4 @@ -34,17 +35,17 @@ echo INCPATH += ../Qt4 designer.pro sed -i s|LIBS.*|LIBS += -L../Qt4 -lqscintilla2|g designer.pro qmake designer.pro -make || return 1 +make } package() { cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4 - make DESTDIR=${pkgdir} install || return 1 - cp libqscintilla2.so.5.3.0 ${pkgdir}/usr/lib/ || return 1 - ln -s libqscintilla2.so.5.3.0 ${pkgdir}/usr/lib/libqscintilla2.so - ln -s libqscintilla2.so.5.3.0 ${pkgdir}/usr/lib/libqscintilla2.so.5 - ln -s libqscintilla2.so.5.3.0 ${pkgdir}/usr/lib/libqscintilla2.so.5.3 + make DESTDIR=${pkgdir} install + cp libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/ + ln -s libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/libqscintilla2.so + ln -s libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/libqscintilla2.so.5 + ln -s libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/libqscintilla2.so.5.4 cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4 - cp libqscintillaplugin.so ${pkgdir}/usr/lib/qt/plugins/designer/ || return 1 + cp libqscintillaplugin.so ${pkgdir}/usr/lib/qt/plugins/designer/ }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, March 21, 2010 @ 17:40:23 Author: andrea Revision: 73031 upgpkg: qscintilla 2.4.3-1 upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-03-21 21:40:19 UTC (rev 73030) +++ PKGBUILD2010-03-21 21:40:23 UTC (rev 73031) @@ -5,7 +5,7 @@ # Contributor: DaNiMoTh jjdanimoth@gmail.com pkgname=qscintilla -pkgver=2.4.2 +pkgver=2.4.3 pkgrel=1 license=('GPL') pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class @@ -16,7 +16,7 @@ conflicts=('qscintilla2') replaces=('qscintilla2') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz;) -md5sums=('316dc8b53ec02548cae1c0d5acfa8ace') +md5sums=('b1c83d42398493bedb22f4df1868627d') build() { cd $srcdir/QScintilla-gpl-$pkgver/Qt4 @@ -40,10 +40,10 @@ package() { cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4 make DESTDIR=${pkgdir} install || return 1 - cp libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/ || return 1 - ln -s libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/libqscintilla2.so - ln -s libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/libqscintilla2.so.5 - ln -s libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/libqscintilla2.so.5.2 + cp libqscintilla2.so.5.3.0 ${pkgdir}/usr/lib/ || return 1 + ln -s libqscintilla2.so.5.3.0 ${pkgdir}/usr/lib/libqscintilla2.so + ln -s libqscintilla2.so.5.3.0 ${pkgdir}/usr/lib/libqscintilla2.so.5 + ln -s libqscintilla2.so.5.3.0 ${pkgdir}/usr/lib/libqscintilla2.so.5.3 cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4 cp libqscintillaplugin.so ${pkgdir}/usr/lib/qt/plugins/designer/ || return 1
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, February 9, 2010 @ 23:30:30 Author: andrea Revision: 67966 upgpkg: qscintilla 2.4.2-1 upstream release Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 41 ++--- 1 file changed, 18 insertions(+), 23 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-10 03:49:51 UTC (rev 67965) +++ PKGBUILD2010-02-10 04:30:30 UTC (rev 67966) @@ -5,51 +5,46 @@ # Contributor: DaNiMoTh jjdanimoth@gmail.com pkgname=qscintilla -pkgver=2.4.1 +pkgver=2.4.2 pkgrel=1 license=('GPL') pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro; -depends=('qt=4.6.0') +depends=('qt') provides=('qscintilla2') conflicts=('qscintilla2') -replaces=('qscintilla2') -source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-$pkgver.tar.gz) -md5sums=('2815ea8b7f15d857d657743d023dcbc3') -options=('force') +creplaces=('qscintilla2') +source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz;) +md5sums=('316dc8b53ec02548cae1c0d5acfa8ace') build() { cd $srcdir/QScintilla-gpl-$pkgver/Qt4 -sed -i s|DESTDIR = .*|DESTDIR = $pkgdir/usr/lib|g qscintilla.pro sed -i s|header.path = .*|header.path = $pkgdir/usr/include|g qscintilla.pro sed -i s|trans.path = .*|trans.path = $pkgdir/usr/share/qt/translations|g qscintilla.pro sed -i s|qsci.path = .*|qsci.path = $pkgdir/usr/share/qt/translations|g qscintilla.pro qmake qscintilla.pro sed -i 's|$(MOVE) $(TARGET)|$(COPY) $(TARGET)|g' Makefile -make || return 1 -make DESTDIR=$pkgdir install +make DESTDIR=${pkgdir} || return 1 -cd ../designer-Qt4 - # Qt4 designer qscintilla2 plugin -mkdir -p $pkgdir/usr/lib/qt/plugins/designer - +cd ../designer-Qt4 +install -d ${pkgdir}/usr/lib/qt/plugins/designer echo INCPATH += ../Qt4 designer.pro sed -i s|LIBS.*|LIBS += -L../Qt4 -lqscintilla2|g designer.pro qmake designer.pro make || return 1 -cp libqscintillaplugin.so $pkgdir/usr/lib/qt/plugins/designer/ || return 1 +} -msg Installing the libs to the right place +package() { + cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4 + make DESTDIR=${pkgdir} install || return 1 + cp libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/ || return 1 + ln -s libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/libqscintilla2.so + ln -s libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/libqscintilla2.so.5 + ln -s libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/libqscintilla2.so.5.2 -cd ../Qt4 -cp libqscintilla2.so.5.2.0 $pkgdir/usr/lib/ || return 1 - -pushd $pkgdir/usr/lib/ -ln -s libqscintilla2.so.5.2.0 libqscintilla2.so -ln -s libqscintilla2.so.5.2.0 libqscintilla2.so.5 -ln -s libqscintilla2.so.5.2.0 libqscintilla2.so.5.2 -popd + cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4 + cp libqscintillaplugin.so ${pkgdir}/usr/lib/qt/plugins/designer/ || return 1 }
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Tuesday, February 9, 2010 @ 23:33:55 Author: andrea Revision: 67969 typo Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2010-02-10 04:32:04 UTC (rev 67968) +++ PKGBUILD2010-02-10 04:33:55 UTC (rev 67969) @@ -14,7 +14,7 @@ depends=('qt') provides=('qscintilla2') conflicts=('qscintilla2') -creplaces=('qscintilla2') +replaces=('qscintilla2') source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz;) md5sums=('316dc8b53ec02548cae1c0d5acfa8ace')
[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Date: Sunday, January 17, 2010 @ 07:01:12 Author: andrea Revision: 63357 upgpkg: qscintilla 2.4.0-2 libpng rebuild Modified: qscintilla/trunk/PKGBUILD --+ PKGBUILD | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-01-17 11:59:37 UTC (rev 63356) +++ PKGBUILD2010-01-17 12:01:12 UTC (rev 63357) @@ -1,17 +1,18 @@ # $Id$ -# Maintainer: Douglas Soares de Andrade d...@aur.archlinux.org +# Maintainer: Andrea Scarpino and...@archlinux.org +# Contributor: Douglas Soares de Andrade d...@aur.archlinux.org # Contributor: Michal Krenek mi...@sg1.cz -# Bug #8577 Modifications made by DaNiMoTh jjdanimoth@gmail.com +# Contributor: DaNiMoTh jjdanimoth@gmail.com pkgname=qscintilla pkgver=2.4.0 _pkgver=2.4 -pkgrel=1 +pkgrel=2 license=('GPL') -pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class. +pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class arch=('i686' 'x86_64') url=http://www.riverbankcomputing.co.uk/software/qscintilla/download; -depends=('qt') +depends=('qt=4.5.3-4') provides=('qscintilla2') conflicts=('qscintilla2') replaces=('qscintilla2')