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

[Felix Yan]

    Date: Wednesday, April 27, 2016 @ 20:36:04
  Author: fyan
Revision: 266303

upgpkg: pyqt5 5.6-1

Modified:
  pyqt5/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-27 18:28:26 UTC (rev 266302)
+++ PKGBUILD	2016-04-27 18:36:04 UTC (rev 266303)
@@ -7,9 +7,9 @@
 
 pkgbase=pyqt5
 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.5.1
+pkgver=5.6
 _pkgver=$pkgver
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
@@ -17,14 +17,19 @@
              'python2-dbus' 'python-dbus' 'qt5-connectivity' 'qt5-enginio'
              'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
              'qt5-webengine' 'qt5-websockets' 'qt5-x11extras')
-source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt-gpl-$pkgver.tar.gz")
-md5sums=('586ed481b734c665b52fbb4f32161ff7')
+source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz")
+md5sums=('dbfc885c0548e024ba5260c4f44e0481')
 
+prepare() {
+  # The additional include path was removed due to this line, I don't really know why they are doing this...
+  sed -i '/target_config.dbus_inc_dirs = \[\]/d' PyQt5_gpl-${_pkgver}/configure.py
+
+  cp -a PyQt5_gpl-${_pkgver}{,-py2}
+}
+
 build() {
-  cp -a PyQt-gpl-${_pkgver} Py2Qt-gpl-${_pkgver}
-
-  cd PyQt-gpl-${_pkgver}
-  python3 configure.py \
+  cd "$srcdir"/PyQt5_gpl-${_pkgver}
+  python configure.py \
     --confirm-license \
     --no-sip-files \
     --qsci-api \
@@ -35,8 +40,7 @@
 
   make
 
-  ### Python2 version ###
-  cd ../Py2Qt-gpl-${_pkgver}
+  cd "$srcdir"/PyQt5_gpl-${_pkgver}-py2
   python2 configure.py \
     --confirm-license \
     --no-sip-files \
@@ -53,7 +57,7 @@
   pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5"
   depends=('qt5-base')
 
-  cd PyQt-gpl-${_pkgver}
+  cd PyQt5_gpl-${_pkgver}
   make -C pyrcc DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
   make -C pylupdate DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
@@ -76,7 +80,7 @@
               'qt5-declarative: QtQml, qmlplugin'
               'qt5-serialport: QtSerialPort')
 
-  cd PyQt-gpl-${_pkgver}
+  cd PyQt5_gpl-${_pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
@@ -98,7 +102,7 @@
               'qt5-declarative: QtQml, qmlplugin'
               'qt5-serialport: QtSerialPort')
 
-  cd Py2Qt-gpl-${_pkgver}
+  cd PyQt5_gpl-${_pkgver}-py2
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install