From ed97e3e97706eb90b2c158685d766234a2b34cc5 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Oct 2018 18:29:12 +0000 Subject: [PATCH] extra/pyqt5 to 5.11.3-1 --- extra/pyqt5/PKGBUILD | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD index b15d1a1b8..d04e1708b 100644 --- a/extra/pyqt5/PKGBUILD +++ b/extra/pyqt5/PKGBUILD @@ -1,4 +1,3 @@ -# $Id$ # Maintainer: Felix Yan # Contributor: Andrea Scarpino # Contributor: Yichao Yu @@ -10,8 +9,8 @@ pkgbase=pyqt5 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5') -pkgver=5.11.2 -pkgrel=2.1 +pkgver=5.11.3 +pkgrel=1 arch=('x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') @@ -21,18 +20,10 @@ makedepends=('python-sip-pyqt5' 'python2-sip-pyqt5' 'sip' 'python-opengl' 'pytho makedepends_armv7h=('qt5-webengine') makedepends_aarch64=('qt5-webengine') source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" pyqt-support-new-qt.patch) -sha512sums=('fc60246b5e1ca0d8aeef829fe20de9dd28b77e3c151532f9dbcd92c0deec12d8308cc799901aeec3f84af745e735053d2aaad2866ef64a2426cba343e08bc2c0' - 'b94b707e4265ff8e84d52214cea7b70db33aa436440c74e4918c165a7dfae8949bf3e91491d300e68c1715b26b693ba69eca114cf42ce6114dab1b99d69d417e') +sha512sums=('6f4abb1866ce357263c208121607072e127c8853e9c6bf039b034fefdda4c40e38f917c3b313375f0d692d764ecf26ff3a6b12cda2a2eeb5237db8b5e9443548') prepare() { - # Support new versions of Qt - don't remove, needs to be reapplied after every new Qt release - pushd PyQt5_gpl-$pkgver -# patch -p1 -i ../pyqt-support-new-qt.patch - popd - cp -a PyQt5_gpl-$pkgver{,-py2} -# Remove check for sip from py2, it doesn't work since sip doesn't install __init__.py - sed -e 's|from PyQt5 import sip|pass|g' -i PyQt5_gpl-$pkgver-py2/configure.py } build() { @@ -40,7 +31,6 @@ build() { python configure.py \ --confirm-license \ --no-sip-files \ - --no-dist-info \ --qsci-api make @@ -48,7 +38,6 @@ build() { python2 configure.py \ --confirm-license \ --no-sip-files \ - --no-dist-info \ --qsci-api make } @@ -84,7 +73,7 @@ package_python-pyqt5(){ cd PyQt5_gpl-$pkgver # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR - make DESTDIR="$pkgdir" INSTALL_ROOT="$pkgdir" install + make DESTDIR="$pkgdir" INSTALL_ROOT="$pkgdir" install -j1 # Provided by pyqt-common rm "$pkgdir"/usr/share/qt/qsci/api/python/PyQt5.api @@ -110,7 +99,7 @@ package_python2-pyqt5(){ 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 + make DESTDIR="$pkgdir" INSTALL_ROOT="$pkgdir" install -j1 # Fix conflicts with python-pyqt5 mv "$pkgdir"/usr/bin/{,python2-}pyuic5