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

[Antonio Rojas]

    Date: Friday, December 13, 2019 @ 23:41:11
  Author: arojas
Revision: 371387

Build with sip 5 for python3

Modified:
  pyqtwebengine/trunk/PKGBUILD

----------+
 PKGBUILD |   41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-13 23:22:59 UTC (rev 371386)
+++ PKGBUILD	2019-12-13 23:41:11 UTC (rev 371387)
@@ -2,13 +2,13 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgbase=pyqtwebengine
-pkgname=(python-pyqtwebengine python2-pyqtwebengine pyqtwebengine-common)
+pkgname=(python-pyqtwebengine python2-pyqtwebengine)
 pkgver=5.13.2
-pkgrel=3
+pkgrel=4
 arch=(x86_64)
 url="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
 license=(GPL)
-makedepends=(sip qt5-webengine python-pyqt5 python2-pyqt5)
+makedepends=(sip sip5 pyqt-builder qt5-webengine python-pyqt5 python2-pyqt5)
 source=("https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/$pkgver/PyQtWebEngine-$pkgver.tar.gz")
 sha256sums=('4264911b5847c75721d8c9c30af92e58a216bd25ceef37f7abf921005c1d45a9')
 
@@ -18,43 +18,30 @@
 
 build() {
   cd "$srcdir"/PyQtWebEngine-$pkgver
-  python configure.py
+  sip-build \
+    --no-make
+  cd build
   make
 
   cd "$srcdir"/PyQtWebEngine-$pkgver-py2
-  python2 configure.py
+  python2 configure.py \
+    --sip='/usr/bin/sip'
   make
 }
 
-package_pyqtwebengine-common(){
-  pkgdesc="Common files shared between python-pyqtwebengine and python2-pyqtwebengine"
-  depends=(qt5-webengine)
-
-  cd PyQtWebEngine-$pkgver
-  install -Dm644 PyQtWebEngine.api -t "$pkgdir"/usr/share/qt/qsci/api/python
-
-  install -d "$pkgdir"/usr/share/sip/PyQt5
-  cp -a sip/* "$pkgdir"/usr/share/sip/PyQt5
-}
-
-package_python-pyqtwebengine(){
+package_python-pyqtwebengine() {
   pkgdesc="Python 3 bindings for QtWebEngine"
-  depends=(python-pyqt5 pyqtwebengine-common)
+  depends=(python-pyqt5 qt5-webengine)
 
-  cd PyQtWebEngine-$pkgver
+  cd PyQtWebEngine-$pkgver/build
   make INSTALL_ROOT="$pkgdir" install -j1
-
-  # Provided by pyqtwebengine-common
-  rm -r "$pkgdir"/usr/share
 }
 
-package_python2-pyqtwebengine(){
+package_python2-pyqtwebengine() {
   pkgdesc="Python 2 bindings for QtWebEngine"
-  depends=(python2-pyqt5 pyqtwebengine-common)
+  depends=(python2-pyqt5 qt5-webengine)
+  conflicts=(pyqtwebengine-common)
 
   cd PyQtWebEngine-$pkgver-py2
   make INSTALL_ROOT="$pkgdir" install -j1
-
-  # Provided by pyqtwebengine-common
-  rm -r "$pkgdir"/usr/share
 }