From 1623d4a625a0bfb4421ddfa59df4963da3c4482d Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Fri, 12 Jul 2019 19:43:50 -0400 Subject: [PATCH 1/3] sip: update to 4.19.18. --- srcpkgs/sip/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template index 6f031eb8edbdfb..9d09b823bb6b2b 100644 --- a/srcpkgs/sip/template +++ b/srcpkgs/sip/template @@ -1,7 +1,7 @@ # Template file for 'sip' pkgname=sip -version=4.19.13 -revision=3 +version=4.19.18 +revision=1 wrksrc="sip-${version}" hostmakedepends="python-devel python3-devel" makedepends="${hostmakedepends}" @@ -9,8 +9,8 @@ short_desc="Python extension module generator for C/C++ libraries" maintainer="Alessio Sergi " license="GPL-2.0-only, GPL-3.0-only, SIP" homepage="https://riverbankcomputing.com/software/sip/intro" -distfiles="${SOURCEFORGE_SITE}/pyqt/sip/sip-${version}/sip-${version}.tar.gz" -checksum=e353a7056599bf5fbd5d3ff9842a6ab2ea3cf4e0304a0f925ec5862907c0d15e +distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz" +checksum=c0bd863800ed9b15dcad477c4017cdb73fa805c25908b0240564add74d697e1e pre_build() { mkdir -p sip-${py2_ver} From 54e90b3b3d93e4e3244f77b726f3a0f2bdf13b2d Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Fri, 12 Jul 2019 19:44:33 -0400 Subject: [PATCH 2/3] python-PyQt5: update to 5.13.0. As of 5.12.0, QtWebEngine is no longer included in python-PyQt5: https://www.riverbankcomputing.com/software/pyqtwebengine/intro --- srcpkgs/python-PyQt5/template | 40 ++++++----------------------------- 1 file changed, 7 insertions(+), 33 deletions(-) diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template index 9e26b4583568f4..d42f0a84194868 100644 --- a/srcpkgs/python-PyQt5/template +++ b/srcpkgs/python-PyQt5/template @@ -1,8 +1,8 @@ # Template file for 'python-PyQt5' pkgname=python-PyQt5 -version=5.11.3 -revision=3 -_sipver=4.19.13 +version=5.13.0 +revision=1 +_sipver=4.19.18 lib32disabled=yes wrksrc="PyQt5_gpl-${version}" pycompile_module="PyQt5" @@ -10,7 +10,7 @@ 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-webengine-devel qt5-webkit-devel qt5-websockets-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/}" @@ -19,8 +19,8 @@ short_desc="Python2 bindings for the Qt5 toolkit" maintainer="Alessio Sergi " homepage="https://riverbankcomputing.com/software/pyqt/intro" license="GPL-3.0-only" -distfiles="${SOURCEFORGE_SITE}/pyqt/PyQt5_gpl-${version}.tar.gz" -checksum=c9b57d15601d436faf35dacf8e0acefa220194829a653e771e80b189b3261073 +distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQt5/${version}/PyQt5_gpl-${version}.tar.gz" +checksum=0cdbffe5135926527b61cc3692dd301cd0328dd87eeaf1313e610787c46faff9 pre_build() { mkdir -p pyqt5-${py2_ver} @@ -54,8 +54,7 @@ pyqt_modules = QtCore QtGui QtHelp QtMultimedia QtSql QtSvg QtTest QtWebKit QtWebKitWidgets QtWidgets QtXml QtXmlPatterns QtDesigner QtDBus QtSensors QtSerialPort QtX11Extras QtBluetooth QtPositioning QtQuickWidgets QtWebSockets - QtWebChannel QtWebEngineWidgets QtLocation QtNfc QtWebEngineCore - QtWebEngine QtNetworkAuth + QtWebChannel QtLocation QtNfc QtNetworkAuth EOF _sysroot="--sysroot $XBPS_CROSS_BASE" @@ -240,17 +239,6 @@ python-PyQt5-webchannel_package() { vmove ${py2_sitelib}/PyQt5/QtWebChannel.so } } -python-PyQt5-webengine_package() { - lib32disabled=yes - depends="${sourcepkg}-${version}_${revision} - python-PyQt5-webchannel-${version}_${revision}" - short_desc+=" - webengine module" - pkg_install() { - vmove ${py2_sitelib}/PyQt5/QtWebEngine.so - vmove ${py2_sitelib}/PyQt5/QtWebEngineCore.so - vmove ${py2_sitelib}/PyQt5/QtWebEngineWidgets.so - } -} python-PyQt5-webkit_package() { lib32disabled=yes depends="${sourcepkg}-${version}_${revision}" @@ -426,20 +414,6 @@ python3-PyQt5-webchannel_package() { vmove ${py3_sitelib}/PyQt5/QtWebChannel.so } } -python3-PyQt5-webengine_package() { - lib32disabled=yes - depends="python3-PyQt5-${version}_${revision} - python3-PyQt5-webchannel-${version}_${revision}" - short_desc="${short_desc/Python2/Python3} - webengine module" - pkg_install() { - vmove ${py3_sitelib}/PyQt5/QtWebEngine.pyi - vmove ${py3_sitelib}/PyQt5/QtWebEngine.so - vmove ${py3_sitelib}/PyQt5/QtWebEngineCore.pyi - vmove ${py3_sitelib}/PyQt5/QtWebEngineCore.so - vmove ${py3_sitelib}/PyQt5/QtWebEngineWidgets.pyi - vmove ${py3_sitelib}/PyQt5/QtWebEngineWidgets.so - } -} python3-PyQt5-webkit_package() { lib32disabled=yes depends="python3-PyQt5-${version}_${revision}" From 5a3ce1eb839ae02ab586f87d1808440dd3bd49c3 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Fri, 12 Jul 2019 19:48:37 -0400 Subject: [PATCH 3/3] python-PyQt5-webengine: update to 5.13.0 Introduce as separate template since the module is not longer included in PyQt5. --- srcpkgs/python-PyQt5-webengine | 1 - srcpkgs/python-PyQt5-webengine/template | 90 +++++++++++++++++++++++++ srcpkgs/python-PyQt5-webengine/update | 1 + srcpkgs/python3-PyQt5-webengine | 2 +- 4 files changed, 92 insertions(+), 2 deletions(-) delete mode 120000 srcpkgs/python-PyQt5-webengine create mode 100644 srcpkgs/python-PyQt5-webengine/template create mode 100644 srcpkgs/python-PyQt5-webengine/update diff --git a/srcpkgs/python-PyQt5-webengine b/srcpkgs/python-PyQt5-webengine deleted file mode 120000 index 7e24798936ce1b..00000000000000 --- a/srcpkgs/python-PyQt5-webengine +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template new file mode 100644 index 00000000000000..07cae0ada434da --- /dev/null +++ b/srcpkgs/python-PyQt5-webengine/template @@ -0,0 +1,90 @@ +# Template file for 'python-PyQt5' +pkgname=python-PyQt5-webengine +version=5.13.0 +revision=1 +lib32disabled=yes +wrksrc="PyQtWebEngine_gpl-${version}" +pycompile_module="PyQt5WebEngine" +hostmakedepends="pkg-config qt5-qmake + qt5-declarative-devel qt5-webchannel-devel qt5-location-devel + python-devel python3-devel python-PyQt5-devel + qt5-webengine-devel" +makedepends="${hostmakedepends/pkg-config/}" +depends="python-PyQt5" +short_desc="Python2 bindings for the Qt5 toolkit - webengine module" +maintainer="Alessio Sergi " +homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro" +license="GPL-3.0-only" +distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine_gpl-${version}.tar.gz" +checksum=bb6cabcc454ed1394aedfb42eb35dbee3ca324cf582e8c0ca5e8c8af0b00e325 + +pre_build() { + mkdir -p pyqt5-${py2_ver} + mv * pyqt5-${py2_ver} || 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 +} +do_build() { + local _sysroot= _configuration= py_abiver= qt_version + for pyver in $py2_ver $py3_ver; do + if [ "$pyver" = "$py3_ver" ]; then + py_abiver="$py3_abiver" + fi + + cd $wrksrc/pyqt5-$pyver + if [ "$CROSS_BUILD" ]; then + qt_version=$(qmake -query QT_VERSION) +cat > pyqt5_${XBPS_CROSS_TRIPLET}.cfg <