From 80d9f01c80d9f9901d3ec34c815487a5c117ec10 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Tue, 19 May 2020 13:15:20 +1000 Subject: [PATCH 1/3] python-pyQt5: require qt5 in hostmakedepends Otherwise it errors out with an ugly qmake cannot find qt5 error. --- srcpkgs/python-PyQt5/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template index a39f7d5f160..b6d55dd90b3 100644 --- a/srcpkgs/python-PyQt5/template +++ b/srcpkgs/python-PyQt5/template @@ -7,10 +7,10 @@ lib32disabled=yes wrksrc="PyQt5-${version}" pycompile_module="PyQt5" hostmakedepends="pkg-config - python-devel python3-devel python-sip-devel python3-sip-devel python-dbus-devel - qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel - qt5-multimedia-devel qt5-sensors-devel qt5-serialport-devel qt5-svg-devel - qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel + python-devel python3-devel python-sip-devel python3-sip-devel python-dbus-devel qt5 + qt5-devel qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel + qt5-multimedia-devel qt5-qmake qt5-sensors-devel qt5-serialport-devel + qt5-svg-devel qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel qt5-x11extras-devel qt5-xmlpatterns-devel qt5-networkauth-devel pulseaudio-devel python-enum34" makedepends="${hostmakedepends/pkg-config/}" From f54ec206f43d216bdbad01e15ecb4ba9949e196e Mon Sep 17 00:00:00 2001 From: fosslinux Date: Tue, 19 May 2020 13:16:49 +1000 Subject: [PATCH 2/3] python-PyQt5: hide 'error' message It isn't really an error but looks ominous. --- srcpkgs/python-PyQt5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template index b6d55dd90b3..10a67618d68 100644 --- a/srcpkgs/python-PyQt5/template +++ b/srcpkgs/python-PyQt5/template @@ -24,7 +24,7 @@ checksum=adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827 pre_build() { mkdir -p pyqt5-${py2_ver} - mv * pyqt5-${py2_ver} || true + mv * pyqt5-${py2_ver} 2>/dev/null || true cp -a pyqt5-${py2_ver} pyqt5-${py3_ver} rm -rf pyqt5-${py2_ver}/pyuic/uic/port_v3 rm -rf pyqt5-${py3_ver}/pyuic/uic/port_v2 From cc92022b696a4bb4693d6ec357f12437a5131f9f Mon Sep 17 00:00:00 2001 From: fosslinux Date: Tue, 19 May 2020 13:18:24 +1000 Subject: [PATCH 3/3] python-PyQt5: make xlint happy --- srcpkgs/python-PyQt5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template index 10a67618d68..977e6362f9d 100644 --- a/srcpkgs/python-PyQt5/template +++ b/srcpkgs/python-PyQt5/template @@ -3,7 +3,6 @@ pkgname=python-PyQt5 version=5.13.2 revision=2 _sipver=4.19.19 -lib32disabled=yes wrksrc="PyQt5-${version}" pycompile_module="PyQt5" hostmakedepends="pkg-config @@ -21,6 +20,7 @@ homepage="https://riverbankcomputing.com/software/pyqt/intro" license="GPL-3.0-only" distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQt5/${version}/PyQt5-${version}.tar.gz" checksum=adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827 +lib32disabled=yes pre_build() { mkdir -p pyqt5-${py2_ver}