From 6d3c19acfb9ada2dfc6836f8b124ac6c8b39910c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 27 Oct 2021 07:46:58 +0700 Subject: [PATCH 1/5] sip: update to 6.3.1. --- srcpkgs/sip/patches/python310.patch | 8 -------- srcpkgs/sip/template | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 srcpkgs/sip/patches/python310.patch diff --git a/srcpkgs/sip/patches/python310.patch b/srcpkgs/sip/patches/python310.patch deleted file mode 100644 index 066b665a7eb1..000000000000 --- a/srcpkgs/sip/patches/python310.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ./sipbuild/py_versions.py.orig 2021-09-25 21:37:44.381213255 -0400 -+++ ./sipbuild/py_versions.py 2021-09-25 21:38:00.904208911 -0400 -@@ -23,4 +23,4 @@ - - # The first and last supported minor versions of Python v3. - FIRST_SUPPORTED_MINOR = 6 --LAST_SUPPORTED_MINOR = 9 -+LAST_SUPPORTED_MINOR = 10 diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template index ea60d37cab72..bb1ddc10f7d2 100644 --- a/srcpkgs/sip/template +++ b/srcpkgs/sip/template @@ -1,7 +1,7 @@ # Template file for 'sip' pkgname=sip -version=6.1.1 -revision=2 +version=6.3.1 +revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml" makedepends="python3-devel" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-only, GPL-3.0-only, custom:SIP" homepage="https://riverbankcomputing.com/software/sip/intro" distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz" -checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20 +checksum=2f9cd6ce0e19226d53d62ad6ba81a62f624626f14924724eab2a23390d4dc684 lib32disabled=yes replaces="sip5<=${version}_${revision}" provides="sip5-${version}_${revision}" From 5068f85e702384ef023815d0db05d863fdb2eb05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 27 Oct 2021 07:46:56 +0700 Subject: [PATCH 2/5] python3-PyQt-builder: update to 1.12.1. --- srcpkgs/python3-PyQt-builder/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template index 5e9833dbc98d..09f6cfabdda4 100644 --- a/srcpkgs/python3-PyQt-builder/template +++ b/srcpkgs/python3-PyQt-builder/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyQt-builder' pkgname=python3-PyQt-builder -version=1.10.0 -revision=2 +version=1.12.1 +revision=1 wrksrc=PyQt-builder-$version build_style=python3-module hostmakedepends="python3-setuptools sip" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-only, GPL-3.0-only, custom:SIP" homepage="https://www.riverbankcomputing.com/software/pyqt/" distfiles="$PYPI_SITE/P/PyQt-builder/PyQt-builder-$version.tar.gz" -checksum=86bd19fde83d92beaefacdeac1e26c6e1918c300ff78d7ec2a19973bf2cf21b5 +checksum=9a71e9cac134702467bd93ed9c7a5a47dc4386d93501bdcafb14cd08b3041d40 post_install() { rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle From 31185f0e058834b98d010577106fd86d149ed122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 27 Oct 2021 07:47:03 +0700 Subject: [PATCH 3/5] python3-PyQt5: update to 5.15.5. --- srcpkgs/python3-PyQt5/template | 40 +++++----------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template index 37cc00fdcecc..ff7b3ca221b6 100644 --- a/srcpkgs/python3-PyQt5/template +++ b/srcpkgs/python3-PyQt5/template @@ -1,10 +1,12 @@ # Template file for 'python3-PyQt5' pkgname=python3-PyQt5 -version=5.15.4 -revision=2 +version=5.15.5 +revision=1 _sipver=12.8.0 wrksrc="PyQt5-${version}" -build_helper="qemu qmake" +build_style=sip-build +build_helper=qemu +configure_args="--confirm-license" hostmakedepends="pkg-config python3-PyQt-builder qt5-qmake qt5-host-tools python3-dbus" makedepends="qscintilla-qt5-devel python3-sip-PyQt5 @@ -19,10 +21,8 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only" homepage="https://riverbankcomputing.com/software/pyqt/intro" distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz" -checksum=2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be +checksum=b411b7a8fa03901c9feb1dcbac7ea1fc3ce20b9ae682762b777cd5398749ca2b lib32disabled=yes -CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver -CXXFLAGS="$CFLAGS" export INCPATH=$XBPS_CROSS_BASE/usr/include/python$py3_ver @@ -30,38 +30,10 @@ post_extract() { rm -rf pyuic/uic/port_v2 } -do_configure() { - mkdir -p build - sip-build --confirm-license --no-make \ - --api-dir /usr/share/qt5/qsci/api/python \ - --build-dir build - - if [ "$CROSS_BUILD" ]; then - # -I/usr/include/python$py3_ver is set by sip-build :( - find build -name Makefile | - xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g" - fi -} - -do_build() { - make -C build ${makejobs} -} - -do_install() { - make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install - for f in pylupdate5 pyrcc5 pyuic5; do - mv ${DESTDIR}/usr/bin/{,python3-}${f} - done -} - python3-PyQt5-devel-tools_package() { lib32disabled=yes depends="python3-PyQt5>=${version}_${revision}" short_desc+=" - development tools" - alternatives=" - pyqt5:pylupdate5:/usr/bin/python3-pylupdate5 - pyqt5:pyrcc5:/usr/bin/python3-pyrcc5 - pyqt5:pyuic5:/usr/bin/python3-pyuic5" pkg_install() { vmove usr/bin vmove "${py3_sitelib}/PyQt5/pylupdate*" From a2dd17066e934f1edbced53d89fdd274fbc46dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 27 Oct 2021 07:47:06 +0700 Subject: [PATCH 4/5] python3-PyQt5-networkauth: update to 5.15.5. --- srcpkgs/python3-PyQt5-networkauth/template | 29 +++------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/srcpkgs/python3-PyQt5-networkauth/template b/srcpkgs/python3-PyQt5-networkauth/template index 66930f6868d1..c01ee3b1ebb6 100644 --- a/srcpkgs/python3-PyQt5-networkauth/template +++ b/srcpkgs/python3-PyQt5-networkauth/template @@ -1,9 +1,9 @@ # Template file for 'python3-PyQt5-networkauth' pkgname=python3-PyQt5-networkauth -version=5.15.4 -revision=2 +version=5.15.5 +revision=1 wrksrc=PyQtNetworkAuth-$version -build_helper="qmake" +build_style=sip-build hostmakedepends="qt5-qmake python3-PyQt5-devel pkg-config sip python3-PyQt-builder" makedepends="python3-devel python3-PyQt5-devel qt5-networkauth-devel" @@ -13,32 +13,11 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only" homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/" distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz" -checksum=893b9f8afb26a64757e9fa3436261b8bfcb4e696efc2a364a9dc8ac44db67fa7 +checksum=2230b6f56f4c9ad2e88bf5ac648e2f3bee9cd757550de0fb98fe0bcb31217b16 lib32disabled=yes CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver CXXFLAGS="$CFLAGS" -do_configure() { - mkdir -p build - sip-build --no-make \ - --api-dir /usr/share/qt5/qsci/api/python \ - --build-dir build - - if [ "$CROSS_BUILD" ]; then - # -I/usr/include/python$py3_ver is set by sip-build :( - find build -name Makefile | - xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g" - fi -} - -do_build() { - make -C build ${makejobs} -} - -do_install() { - make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install -} - python3-PyQt5-networkauth-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" From 812ddc40b9f5082924d68601470d573408993596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 27 Oct 2021 07:47:11 +0700 Subject: [PATCH 5/5] python3-PyQt5-webengine: update to 5.15.5. --- srcpkgs/python3-PyQt5-webengine/template | 30 ++++-------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template index 84f8d667cc64..b51c73564923 100644 --- a/srcpkgs/python3-PyQt5-webengine/template +++ b/srcpkgs/python3-PyQt5-webengine/template @@ -1,8 +1,9 @@ # Template file for 'python3-PyQt5-webengine' pkgname=python3-PyQt5-webengine -version=5.15.4 -revision=2 +version=5.15.5 +revision=1 wrksrc="PyQtWebEngine-${version}" +build_style=sip-build build_helper="qmake" hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel sip python3-PyQt-builder" @@ -14,10 +15,8 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only" homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro" distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz" -checksum=cedc28f54165f4b8067652145aec7f732a17eadf6736835852868cf76119cc19 +checksum=ab47608dccf2b5e4b950d5a3cc704b17711af035024d07a9b71ad29fc103b941 lib32disabled=yes -CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver" -CXXFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel" if [ "$XBPS_TARGET_ENDIAN" != le ]; then broken="no webengine for big endian" @@ -31,27 +30,6 @@ post_extract() { rm -rf pyuic/uic/port_v2 } -do_configure() { - mkdir -p build - sip-build --no-make \ - --api-dir /usr/share/qt5/qsci/api/python \ - --build-dir build - - if [ "$CROSS_BUILD" ]; then - # -I/usr/include/python$py3_ver is set by sip-build :( - find build -name Makefile | - xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g" - fi -} - -do_build() { - make -C build ${makejobs} -} - -do_install() { - make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install -} - python3-PyQt5-webengine-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}"