From 6094ae0033831338a473f8f6f56450d614aa06c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 9 Aug 2020 22:35:28 +0700 Subject: [PATCH] python3-PyQt5: update to 5.15.0 * keep python-PyQt5 as 5.13.2 since it's last version supports Python 2 While we're at it: * ship dist-info for python-PyQt5 for setuptools constrain check. --- srcpkgs/python-PyQt5/template | 278 ++++------------------------- srcpkgs/python3-PyQt5 | 1 - srcpkgs/python3-PyQt5-connectivity | 2 +- srcpkgs/python3-PyQt5-dbus | 2 +- srcpkgs/python3-PyQt5-devel | 1 + srcpkgs/python3-PyQt5-devel-tools | 2 +- srcpkgs/python3-PyQt5-location | 2 +- srcpkgs/python3-PyQt5-multimedia | 2 +- srcpkgs/python3-PyQt5-networkauth | 2 +- srcpkgs/python3-PyQt5-opengl | 2 +- srcpkgs/python3-PyQt5-quick | 2 +- srcpkgs/python3-PyQt5-sensors | 2 +- srcpkgs/python3-PyQt5-serialport | 2 +- srcpkgs/python3-PyQt5-sql | 2 +- srcpkgs/python3-PyQt5-svg | 2 +- srcpkgs/python3-PyQt5-tools | 2 +- srcpkgs/python3-PyQt5-webchannel | 2 +- srcpkgs/python3-PyQt5-webkit | 2 +- srcpkgs/python3-PyQt5-websockets | 2 +- srcpkgs/python3-PyQt5-x11extras | 2 +- srcpkgs/python3-PyQt5-xmlpatterns | 2 +- srcpkgs/python3-PyQt5/template | 273 ++++++++++++++++++++++++++++ 22 files changed, 328 insertions(+), 261 deletions(-) delete mode 120000 srcpkgs/python3-PyQt5 create mode 120000 srcpkgs/python3-PyQt5-devel create mode 100644 srcpkgs/python3-PyQt5/template diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template index 29018572a3..11529aa172 100644 --- a/srcpkgs/python-PyQt5/template +++ b/srcpkgs/python-PyQt5/template @@ -1,11 +1,11 @@ # Template file for 'python-PyQt5' pkgname=python-PyQt5 version=5.13.2 -revision=2 +revision=3 _sipver=4.19.19 wrksrc="PyQt5-${version}" hostmakedepends="pkg-config - python-devel python3-devel python-sip-devel python3-sip-devel python-dbus-devel qt5 + python-devel python-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 @@ -13,36 +13,29 @@ hostmakedepends="pkg-config python-enum34" makedepends="${hostmakedepends/pkg-config/}" depends="python-sip-PyQt5>=${_sipver} python-enum34" -short_desc="Python2 bindings for the Qt5 toolkit" -maintainer="Alessio Sergi " +short_desc="Python 2 bindings for the Qt5 toolkit" +maintainer="Orphaned " license="GPL-3.0-only" homepage="https://riverbankcomputing.com/software/pyqt/intro" distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQt5/${version}/PyQt5-${version}.tar.gz" checksum=adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827 lib32disabled=yes -pre_build() { - mkdir -p pyqt5-${py2_ver} - 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 +post_extract() { + rm -rf pyuic/uic/port_v3 } -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 <pyqt5_${XBPS_CROSS_TRIPLET}.cfg <pyqt5_${XBPS_CROSS_TRIPLET}.cfg <