[arch-commits] Commit in qscintilla/trunk (PKGBUILD)

[Antonio Rojas]

    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
===================================================================
--- PKGBUILD	2019-12-21 02:41:21 UTC (rev 372012)
+++ PKGBUILD	2019-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
 }