Date: Wednesday, June 10, 2020 @ 06:49:00 Author: arojas Revision: 388712
archrelease: copy trunk to extra-x86_64 Added: qscintilla/repos/extra-x86_64/PKGBUILD (from rev 388711, qscintilla/trunk/PKGBUILD) qscintilla/repos/extra-x86_64/qscintilla-sip-5.3.patch (from rev 388711, qscintilla/trunk/qscintilla-sip-5.3.patch) Deleted: qscintilla/repos/extra-x86_64/PKGBUILD --------------------------+ PKGBUILD | 123 +++++++++++++++++++++++---------------------- qscintilla-sip-5.3.patch | 24 ++++++++ 2 files changed, 89 insertions(+), 58 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-06-10 06:48:44 UTC (rev 388711) +++ PKGBUILD 2020-06-10 06:49:00 UTC (rev 388712) @@ -1,58 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> - -pkgbase=qscintilla -pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') -pkgver=2.11.4 -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=('723f8f1d1686d9fc8f204cd855347e984322dd5cd727891d324d0d7d187bee20') - -build() { - cd "$srcdir"/QScintilla-${pkgver} - export QMAKEFEATURES=$PWD/Qt4Qt5/features/ - - cd Qt4Qt5 - qmake-qt5 - make - - cd ../designer-Qt4Qt5 - qmake-qt5 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 - make - - cd .. - sip-build \ - --no-make \ - --qsci-features-dir Qt4Qt5/features \ - --qsci-include-dir Qt4Qt5 \ - --qsci-library-dir Qt4Qt5 \ - --api-dir /usr/share/qt/qsci/api/python - cd build - make -} - -package_qscintilla-qt5() { - 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 ../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) - - cd QScintilla-${pkgver}/build - make INSTALL_ROOT="$pkgdir" install -j1 -} Copied: qscintilla/repos/extra-x86_64/PKGBUILD (from rev 388711, qscintilla/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-06-10 06:49:00 UTC (rev 388712) @@ -0,0 +1,65 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> + +pkgbase=qscintilla +pkgname=('qscintilla-qt5' 'python-qscintilla-qt5') +pkgver=2.11.4 +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" + 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 QScintilla-${pkgver} + export QMAKEFEATURES=$PWD/Qt4Qt5/features/ + + cd Qt4Qt5 + qmake-qt5 + make + + cd ../designer-Qt4Qt5 + qmake-qt5 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 + make + + cd .. + sip-build \ + --no-make \ + --qsci-features-dir Qt4Qt5/features \ + --qsci-include-dir Qt4Qt5 \ + --qsci-library-dir Qt4Qt5 \ + --api-dir /usr/share/qt/qsci/api/python + cd build + make +} + +package_qscintilla-qt5() { + 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 ../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) + + cd QScintilla-${pkgver}/build + make INSTALL_ROOT="$pkgdir" install -j1 +} Copied: qscintilla/repos/extra-x86_64/qscintilla-sip-5.3.patch (from rev 388711, qscintilla/trunk/qscintilla-sip-5.3.patch) =================================================================== --- qscintilla-sip-5.3.patch (rev 0) +++ qscintilla-sip-5.3.patch 2020-06-10 06:49:00 UTC (rev 388712) @@ -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.000000000 +0200 ++++ QScintilla-2.11.5.dev2006091431/Python/sip/qsciabstractapis.sip 2020-06-10 03:34:31.000000000 +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.sip 2020-06-09 03:34:50.000000000 +0200 ++++ QScintilla-2.11.5.dev2006091431/Python/sip/qsciapis.sip 2020-06-10 03:34:31.000000000 +0200 +@@ -25,7 +25,7 @@ + %End + + public: +- QsciAPIs(QsciLexer *lexer /TransferThis/ = 0); ++ QsciAPIs(QsciLexer *lexer /TransferThis/); + virtual ~QsciAPIs(); + + void add(const QString &entry);