From bda54e3f9b81ee1ffb407111b2604e86951dec4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 27 Feb 2021 07:41:36 +0700 Subject: [PATCH 1/6] sip: update to 6.0.2. --- srcpkgs/sip/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template index 34d8d632bba..fb967013d77 100644 --- a/srcpkgs/sip/template +++ b/srcpkgs/sip/template @@ -1,6 +1,6 @@ # Template file for 'sip' pkgname=sip -version=6.0.1 +version=6.0.2 revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml" @@ -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=c933e92b24aedc6d5827748bd8167209102b5de1526e86681a2202549027a784 +checksum=38633bfaa479b1dd35df8f414ffc5c5a342f174ca0c6a21d0e8eb359e33c35b9 lib32disabled=yes replaces="sip5<=${version}_${revision}" provides="sip5-${version}_${revision}" From 5f9b9e0b9dd853441e383d76b6bca1a970220d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Feb 2021 21:32:49 +0700 Subject: [PATCH 2/6] python3-PyQt-builder: update to 1.9.0. --- srcpkgs/python3-PyQt-builder/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template index 0bd0436784a..db81ee99716 100644 --- a/srcpkgs/python3-PyQt-builder/template +++ b/srcpkgs/python3-PyQt-builder/template @@ -1,6 +1,6 @@ # Template file for 'python3-PyQt-builder' pkgname=python3-PyQt-builder -version=1.8.0 +version=1.9.0 revision=1 wrksrc=PyQt-builder-$version build_style=python3-module @@ -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=30b5fd3d1bdafeae3131070ebdc55481cf72c6a05a1b73ea2b420678bed2650c +checksum=54520b4d40d6e6d1307f9cebab4730ae78e01873c88866aa1e5192c24801005a post_install() { rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle From 98aea18e76967a8599491c4e1a57358682d73f35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Feb 2021 21:33:16 +0700 Subject: [PATCH 3/6] python3-PyQt5: update to 5.15.3. --- srcpkgs/python3-PyQt5-networkauth | 1 - srcpkgs/python3-PyQt5/template | 26 +++++++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) delete mode 120000 srcpkgs/python3-PyQt5-networkauth diff --git a/srcpkgs/python3-PyQt5-networkauth b/srcpkgs/python3-PyQt5-networkauth deleted file mode 120000 index 75ad8e779a9..00000000000 --- a/srcpkgs/python3-PyQt5-networkauth +++ /dev/null @@ -1 +0,0 @@ -python3-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template index 058095e7c69..6ab4fe59308 100644 --- a/srcpkgs/python3-PyQt5/template +++ b/srcpkgs/python3-PyQt5/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyQt5' pkgname=python3-PyQt5 -version=5.15.2 -revision=3 +version=5.15.3 +revision=1 _sipver=12.8.0 wrksrc="PyQt5-${version}" build_helper=qemu @@ -12,14 +12,14 @@ makedepends="qscintilla-qt5-devel python3-sip-PyQt5 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" + qt5-x11extras-devel qt5-xmlpatterns-devel pulseaudio-devel" depends="python3-sip-PyQt5>=${_sipver}" short_desc="Python 3 bindings for the Qt5 toolkit" 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=372b08dc9321d1201e4690182697c5e7ffb2e0770e6b4a45519025134b12e4fc +checksum=965ba50e7029b37f218a54ace24e87c77db3e5a9f0b83baeb21fb57b4154b838 lib32disabled=yes post_extract() { @@ -161,20 +161,16 @@ do_configure() { 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 - " + xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g" fi } do_build() { - cd build - make ${makejobs} + make -C build ${makejobs} } do_install() { - cd build - make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install + make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install for f in pylupdate5 pyrcc5 pyuic5; do sed -i '1s,python3[.0-9]*,python3,' ${DESTDIR}/usr/bin/${f} mv ${DESTDIR}/usr/bin/{,python3-}${f} @@ -228,14 +224,6 @@ python3-PyQt5-multimedia_package() { vmove "${py3_sitelib}/PyQt5/QtMultimediaWidgets.*" } } -python3-PyQt5-networkauth_package() { - lib32disabled=yes - depends="python3-PyQt5-${version}_${revision}" - short_desc="${short_desc} - networkauth module" - pkg_install() { - vmove "${py3_sitelib}/PyQt5/QtNetworkAuth.*" - } -} python3-PyQt5-opengl_package() { lib32disabled=yes depends="python3-PyQt5-${version}_${revision}" From 6901d8b4264fbd2fc72d2781f093c87a9520fae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Feb 2021 21:33:32 +0700 Subject: [PATCH 4/6] python3-PyQt5-webengine: update to 5.15.3. --- srcpkgs/python3-PyQt5-webengine/template | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template index 7f4cb452f8e..251ee206eb3 100644 --- a/srcpkgs/python3-PyQt5-webengine/template +++ b/srcpkgs/python3-PyQt5-webengine/template @@ -1,26 +1,28 @@ # Template file for 'python3-PyQt5-webengine' pkgname=python3-PyQt5-webengine -version=5.15.2 -revision=2 +version=5.15.3 +revision=1 wrksrc="PyQtWebEngine-${version}" hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel sip python3-PyQt-builder" makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel qt5-webengine-devel python3-devel python3-PyQt5-devel" -depends="python3-PyQt5>=${version}_1 python3-PyQt5-webchannel>=${version}_1" +depends="python3-PyQt5>=${version} python3-PyQt5-webchannel>=${version}" short_desc="Python 3 bindings for the Qt5 toolkit - webengine module" 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=4d72fea774071ce6f76e341a3d2c5d595886c9906a9b9493239c841cce54a634 +checksum=0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6 lib32disabled=yes -case "$XBPS_TARGET_MACHINE" in - ppc64le*) ;; - ppc*) broken="no webengine for big endian ppc";; - arm*) broken="depends on qt5-webengine";; -esac +if [ "$XBPS_TARGET_ENDIAN" != le ]; then + broken="no webengine for big endian" +fi + +if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then + broken="webengine can be built only if word size matches" +fi post_extract() { rm -rf pyuic/uic/port_v2 From 77734c34c7942358bf7ae8caf6f11e17c2b385af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 2 Mar 2021 21:58:54 +0700 Subject: [PATCH 5/6] python3-PyQt5-webengine: split -devel --- srcpkgs/python3-PyQt5-webengine-devel | 1 + srcpkgs/python3-PyQt5-webengine/template | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 120000 srcpkgs/python3-PyQt5-webengine-devel diff --git a/srcpkgs/python3-PyQt5-webengine-devel b/srcpkgs/python3-PyQt5-webengine-devel new file mode 120000 index 00000000000..9187de47966 --- /dev/null +++ b/srcpkgs/python3-PyQt5-webengine-devel @@ -0,0 +1 @@ +python3-PyQt5-webengine \ No newline at end of file diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template index 251ee206eb3..0c08cf8b410 100644 --- a/srcpkgs/python3-PyQt5-webengine/template +++ b/srcpkgs/python3-PyQt5-webengine/template @@ -177,3 +177,11 @@ do_install() { make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install rm -rf ${DESTDIR}/usr/share } + +python3-PyQt5-webengine-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove ${py3_sitelib}/PyQt5/bindings + } +} From 50119bcfca72da672227f403f197ff5b4844bfee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 2 Mar 2021 08:20:45 +0700 Subject: [PATCH 6/6] python3-PyQt5-networkauth: update to 5.15.3 Splited from python3-PyQt5 --- srcpkgs/python3-PyQt5-networkauth-devel | 1 + srcpkgs/python3-PyQt5-networkauth/template | 175 +++++++++++++++++++++ 2 files changed, 176 insertions(+) create mode 120000 srcpkgs/python3-PyQt5-networkauth-devel create mode 100644 srcpkgs/python3-PyQt5-networkauth/template diff --git a/srcpkgs/python3-PyQt5-networkauth-devel b/srcpkgs/python3-PyQt5-networkauth-devel new file mode 120000 index 00000000000..1dd296bda79 --- /dev/null +++ b/srcpkgs/python3-PyQt5-networkauth-devel @@ -0,0 +1 @@ +python3-PyQt5-networkauth \ No newline at end of file diff --git a/srcpkgs/python3-PyQt5-networkauth/template b/srcpkgs/python3-PyQt5-networkauth/template new file mode 100644 index 00000000000..f13bb53298f --- /dev/null +++ b/srcpkgs/python3-PyQt5-networkauth/template @@ -0,0 +1,175 @@ +# Template file for 'python3-PyQt5-networkauth' +pkgname=python3-PyQt5-networkauth +version=5.15.3 +revision=1 +wrksrc=PyQtNetworkAuth-$version +hostmakedepends="qt5-qmake python3-PyQt5-devel" +hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake + python3-PyQt5-devel" +makedepends="python3-devel python3-PyQt5-devel qt5-networkauth-devel" +depends="python3-PyQt5>=$version" +short_desc="Python bindings for the Qt5 Network Authorization library" +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=2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82 + +_cross_prepare() { + local qplatformdefs="/usr/lib/qt5/mkspecs/linux-g++/qplatformdefs.h" + + mkdir -p "${wrksrc}/.target-spec/linux-g++" + cat >"${wrksrc}/.target-spec/linux-g++/qmake.conf" <<-_EOF + MAKEFILE_GENERATOR = UNIX + CONFIG += incremental no_qt_rpath + QMAKE_INCREMENTAL_STYLE = sublib + + include(/usr/lib/qt5/mkspecs/common/linux.conf) + include(/usr/lib/qt5/mkspecs/common/gcc-base-unix.conf) + include(/usr/lib/qt5/mkspecs/common/g++-unix.conf) + + QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri + QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri + QMAKEMODULES = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/modules + QMAKE_CC = ${CC} + QMAKE_CXX = ${CXX} + QMAKE_LINK = ${CXX} + QMAKE_LINK_C = ${CC} + QMAKE_LINK_SHLIB = ${CXX} + + QMAKE_AR = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs + QMAKE_OBJCOPY = ${OBJCOPY} + QMAKE_NM = ${NM} -P + QMAKE_STRIP = ${STRIP} + + QMAKE_CFLAGS = ${CFLAGS} + QMAKE_CXXFLAGS = ${CXXFLAGS} + QMAKE_LFLAGS = ${LDFLAGS} + INCPATH = $XBPS_CROSS_BASE/usr/include/python$py3_ver + load(qt_config) + _EOF + ln -sf ${XBPS_CROSS_BASE}$qplatformdefs ${wrksrc}/.target-spec/linux-g++/ + + mkdir -p "${wrksrc}/.host-spec/linux-g++" + cat > "${wrksrc}/.host-spec/linux-g++/qmake.conf" <<-_EOF + MAKEFILE_GENERATOR = UNIX + CONFIG += incremental no_qt_rpath + QMAKE_INCREMENTAL_STYLE = sublib + + include(/usr/lib/qt5/mkspecs/common/linux.conf) + include(/usr/lib/qt5/mkspecs/common/gcc-base-unix.conf) + include(/usr/lib/qt5/mkspecs/common/g++-unix.conf) + + QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri + QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri + QMAKE_CC = ${CC_FOR_BUILD} + QMAKE_CXX = ${CXX_FOR_BUILD} + QMAKE_LINK = ${CXX_FOR_BUILD} + QMAKE_LINK_C = ${CC_FOR_BUILD} + QMAKE_LINK_SHLIB = ${CXX_FOR_BUILD} + + QMAKE_AR = gcc-ar cqs + QMAKE_OBJCOPY = ${OBJCOPY_FOR_BUILD} + QMAKE_NM = ${NM_FOR_BUILD} -P + QMAKE_STRIP = ${STRIP_FOR_BUILD} + + QMAKE_CFLAGS = ${CFLAGS_FOR_BUILD} + QMAKE_CXXFLAGS = ${CXXFLAGS_FOR_BUILD} + QMAKE_LFLAGS = ${LDFLAGS_FOR_BUILD} + load(qt_config) + _EOF + ln -sf $qplatformdefs ${wrksrc}/.host-spec/linux-g++/ + + cat >"${wrksrc}/qt.conf" <<-_EOF + [Paths] + Sysroot=${XBPS_CROSS_BASE} + Prefix=/usr + ArchData=/usr/lib/qt5 + Data=/usr/share/qt5 + Documentation=/usr/share/doc/qt5 + Headers=${XBPS_CROSS_BASE}/usr/include/qt5 + Libraries=${XBPS_CROSS_BASE}/usr/lib + LibraryExecutables=/usr/lib/qt5/libexec + Binaries=/usr/lib/qt5/bin + Tests=${XBPS_CROSS_BASE}/usr/tests + Plugins=/usr/lib/qt5/plugins + Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports + Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml + Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations + Settings=${XBPS_CROSS_BASE}/etc/xdg + Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples + HostPrefix=/usr + HostData=/usr/lib/qt5 + HostBinaries=/usr/lib/qt5/bin + HostLibraries=/usr/lib + Spec=$wrksrc/.host-spec/linux-g++ + TargetSpec=$wrksrc/.target-spec/linux-g++ + _EOF + + case $XBPS_TARGET_MACHINE in + i686*) _qt_arch=i386;; + x86_64*) _qt_arch=x86_64;; + aarch64*) _qt_arch=arm64;; + arm*) _qt_arch=arm;; + mips*) _qt_arch=mips;; + esac + cat >$XBPS_WRAPPERDIR/qmake <<_EOF +#!/bin/sh +export PREFIX=/usr +export QT_INSTALL_PREFIX=/usr +export LIB=/usr/lib +export QT_TARGET_ARCH=$_qt_arch +export PKG_CONFIG_EXECUTABLE=$XBPS_WRAPPERDIR/$PKG_CONFIG +case " \$* " in +" -query ") + /usr/lib/qt5/bin/qmake "\$@" -qtconf $wrksrc/qt.conf | + sed '/^QT_INSTALL_/s,$XBPS_CROSS_BASE,,' + ;; +*) + exec /usr/lib/qt5/bin/qmake -qtconf $wrksrc/qt.conf "\$@" ;; +esac +_EOF +} + +do_configure() { + if [ "$CROSS_BUILD" ]; then + _cross_prepare + else + cat >$XBPS_WRAPPERDIR/qmake <<-'_EOF' + #!/bin/sh + exec /usr/lib/qt5/bin/qmake "$@" CONFIG+=no_qt_rpath + _EOF + fi + chmod +x $XBPS_WRAPPERDIR/qmake + + 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 + for f in pylupdate5 pyrcc5 pyuic5; do + sed -i '1s,python3[.0-9]*,python3,' ${DESTDIR}/usr/bin/${f} + mv ${DESTDIR}/usr/bin/{,python3-}${f} + done +} + +python3-PyQt5-networkauth-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove ${py3_sitelib}/PyQt5/bindings + } +}