* [PR PATCH] New build-style: sip-build for PyQt stack, update to 5.15.3
@ 2021-03-02 14:44 sgn
2021-03-02 15:09 ` [PR PATCH] [Updated] " sgn
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: sgn @ 2021-03-02 14:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1646 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages new-build-style-sip-build-for-PyQt-stack
https://github.com/void-linux/void-packages/pull/29178
New build-style: sip-build for PyQt stack, update to 5.15.3
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29178.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-build-style-sip-build-for-PyQt-stack-29178.patch --]
[-- Type: text/x-diff, Size: 26283 bytes --]
From 95c10bfbc35dd1f2cfd67c7e173ac9d7045e7e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 27 Feb 2021 07:41:36 +0700
Subject: [PATCH 1/8] 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 <congdanhqx@gmail.com>"
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 8c6ed02f3dbdbf0f12c69271abf2bbb965911a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:32:49 +0700
Subject: [PATCH 2/8] 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 <congdanhqx@gmail.com>"
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 feec20c0b3782634b1017fb5edd82b469f6ea68b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 09:03:44 +0700
Subject: [PATCH 3/8] New build-style: sip-build
---
common/build-style/sip-build.sh | 149 ++++++++++++++++++++
common/environment/build-style/sip-build.sh | 1 +
2 files changed, 150 insertions(+)
create mode 100644 common/build-style/sip-build.sh
create mode 100644 common/environment/build-style/sip-build.sh
diff --git a/common/build-style/sip-build.sh b/common/build-style/sip-build.sh
new file mode 100644
index 00000000000..81d9622ec09
--- /dev/null
+++ b/common/build-style/sip-build.sh
@@ -0,0 +1,149 @@
+#
+# This helper is for templates using sip-build.
+#
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ 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;;
+ ppc64*) _qt_arch=power64 ;;
+ ppc*) _qt_arch=power ;;
+ 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
+ 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 ${configure_args}
+
+ 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_cmd:=make}
+ ${make_cmd} -C build ${makejobs}
+}
+
+do_install() {
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
+ ${make_cmd} -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} ${make_install_target}
+}
+
diff --git a/common/environment/build-style/sip-build.sh b/common/environment/build-style/sip-build.sh
new file mode 100644
index 00000000000..52049d21d2f
--- /dev/null
+++ b/common/environment/build-style/sip-build.sh
@@ -0,0 +1 @@
+hostmakedepends+=" pkg-config python3-PyQt-builder qt5-qmake qt5-host-tools"
From f42c32a2a491aff6dddea58ca1c2276a47b9adc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:16 +0700
Subject: [PATCH 4/8] python3-PyQt5: update to 5.15.3.
---
srcpkgs/python3-PyQt5-networkauth | 1 -
srcpkgs/python3-PyQt5/template | 16 ++++------------
2 files changed, 4 insertions(+), 13 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..8aa3ea86158 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 <congdanhqx@gmail.com>"
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() {
@@ -228,14 +228,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 8b94d7674624dbaaa9af40eb4d8f879bc1de8b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:13:23 +0700
Subject: [PATCH 5/8] python3-PyQt5: build with sip-build
---
srcpkgs/python3-PyQt5/template | 153 +--------------------------------
1 file changed, 3 insertions(+), 150 deletions(-)
diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index 8aa3ea86158..d751ae04758 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -4,7 +4,9 @@ version=5.15.3
revision=1
_sipver=12.8.0
wrksrc="PyQt5-${version}"
+build_style=sip-build
build_helper=qemu
+configure_args="--confirm-license"
hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake
python3-dbus"
makedepends="qscintilla-qt5-devel python3-sip-PyQt5
@@ -26,157 +28,8 @@ post_extract() {
rm -rf pyuic/uic/port_v2
}
-_cross_configure() {
- 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_configure
- 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 --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() {
- cd build
- make ${makejobs}
-}
-
-do_install() {
- cd build
- make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+post_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
}
From c336efce448dd7e58eb91e136c4e3f7a9e4f10ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 08:20:45 +0700
Subject: [PATCH 6/8] python3-PyQt5-networkauth: update to 5.15.3
Splited from python3-PyQt5
---
srcpkgs/python3-PyQt5-networkauth/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/python3-PyQt5-networkauth/template
diff --git a/srcpkgs/python3-PyQt5-networkauth/template b/srcpkgs/python3-PyQt5-networkauth/template
new file mode 100644
index 00000000000..52f9889f85b
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-PyQt5-networkauth'
+pkgname=python3-PyQt5-networkauth
+version=5.15.3
+revision=1
+wrksrc=PyQtNetworkAuth-$version
+build_style=sip-build
+hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel sip
+ python3-PyQt-builder"
+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 <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
+distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz"
+checksum=2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82
From 2ceae2c5acefd873bebc1ecd1bcec8ad0023203c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:32 +0700
Subject: [PATCH 7/8] python3-PyQt5-webengine: update to 5.15.3.
---
srcpkgs/python3-PyQt5-webengine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 7f4cb452f8e..8817d131a53 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,7 +1,7 @@
# 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"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
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
From f765084d17701419faf6de051513543845ed553e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:18:17 +0700
Subject: [PATCH 8/8] python3-PyQt5-webengine: build with sip-build
---
srcpkgs/python3-PyQt5-webengine/template | 166 ++---------------------
1 file changed, 12 insertions(+), 154 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 8817d131a53..c547fcf412e 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -3,11 +3,12 @@ pkgname=python3-PyQt5-webengine
version=5.15.3
revision=1
wrksrc="PyQtWebEngine-${version}"
+build_style=sip-build
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 <congdanhqx@gmail.com>"
license="GPL-3.0-only"
@@ -15,163 +16,20 @@ homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
checksum=0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6
lib32disabled=yes
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel"
-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
}
-_cross_configure() {
- 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
- INCPATH += $XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel
- 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 <<EOF >$XBPS_WRAPPERDIR/qmake
-#!/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_configure
- 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
- # Fix location of python include
- find build -name Makefile |
- xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
- fi
-}
-
-do_build() {
- cd build
- make ${makejobs}
-}
-
-do_install() {
- cd build
- make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
- rm -rf ${DESTDIR}/usr/share
+post_install() {
+ : rm -rf ${DESTDIR}/usr/share
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] New build-style: sip-build for PyQt stack, update to 5.15.3
2021-03-02 14:44 [PR PATCH] New build-style: sip-build for PyQt stack, update to 5.15.3 sgn
@ 2021-03-02 15:09 ` sgn
2021-03-02 15:14 ` sgn
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-03-02 15:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages new-build-style-sip-build-for-PyQt-stack
https://github.com/void-linux/void-packages/pull/29178
New build-style: sip-build for PyQt stack, update to 5.15.3
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29178.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-build-style-sip-build-for-PyQt-stack-29178.patch --]
[-- Type: text/x-diff, Size: 28115 bytes --]
From b0d1eb41990f2b1dde773484d18f1e8217c7435b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 27 Feb 2021 07:41:36 +0700
Subject: [PATCH 1/9] 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 <congdanhqx@gmail.com>"
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 38902df5b37269a992b8837b3135f8340feec424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:32:49 +0700
Subject: [PATCH 2/9] 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 <congdanhqx@gmail.com>"
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 ce4bbc3b0d36da7ef665e8f4ec2a766cd77385cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 09:03:44 +0700
Subject: [PATCH 3/9] New build-style: sip-build
---
common/build-style/sip-build.sh | 149 ++++++++++++++++++++
common/environment/build-style/sip-build.sh | 1 +
2 files changed, 150 insertions(+)
create mode 100644 common/build-style/sip-build.sh
create mode 100644 common/environment/build-style/sip-build.sh
diff --git a/common/build-style/sip-build.sh b/common/build-style/sip-build.sh
new file mode 100644
index 00000000000..81d9622ec09
--- /dev/null
+++ b/common/build-style/sip-build.sh
@@ -0,0 +1,149 @@
+#
+# This helper is for templates using sip-build.
+#
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ 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;;
+ ppc64*) _qt_arch=power64 ;;
+ ppc*) _qt_arch=power ;;
+ 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
+ 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 ${configure_args}
+
+ 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_cmd:=make}
+ ${make_cmd} -C build ${makejobs}
+}
+
+do_install() {
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
+ ${make_cmd} -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} ${make_install_target}
+}
+
diff --git a/common/environment/build-style/sip-build.sh b/common/environment/build-style/sip-build.sh
new file mode 100644
index 00000000000..52049d21d2f
--- /dev/null
+++ b/common/environment/build-style/sip-build.sh
@@ -0,0 +1 @@
+hostmakedepends+=" pkg-config python3-PyQt-builder qt5-qmake qt5-host-tools"
From 23f301ef72865d018ddbe77709723e392138de7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:16 +0700
Subject: [PATCH 4/9] python3-PyQt5: update to 5.15.3.
---
srcpkgs/python3-PyQt5-networkauth | 1 -
srcpkgs/python3-PyQt5/template | 16 ++++------------
2 files changed, 4 insertions(+), 13 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..8aa3ea86158 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 <congdanhqx@gmail.com>"
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() {
@@ -228,14 +228,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 7f3efba7b12e1370c46d9687516b5f44e09e956d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:13:23 +0700
Subject: [PATCH 5/9] python3-PyQt5: build with sip-build
---
srcpkgs/python3-PyQt5/template | 153 +--------------------------------
1 file changed, 3 insertions(+), 150 deletions(-)
diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index 8aa3ea86158..d751ae04758 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -4,7 +4,9 @@ version=5.15.3
revision=1
_sipver=12.8.0
wrksrc="PyQt5-${version}"
+build_style=sip-build
build_helper=qemu
+configure_args="--confirm-license"
hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake
python3-dbus"
makedepends="qscintilla-qt5-devel python3-sip-PyQt5
@@ -26,157 +28,8 @@ post_extract() {
rm -rf pyuic/uic/port_v2
}
-_cross_configure() {
- 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_configure
- 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 --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() {
- cd build
- make ${makejobs}
-}
-
-do_install() {
- cd build
- make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+post_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
}
From afcdefa4bdf6297ae449381c7cfa1633678afe43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:32 +0700
Subject: [PATCH 6/9] python3-PyQt5-webengine: update to 5.15.3.
---
srcpkgs/python3-PyQt5-webengine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 7f4cb452f8e..8817d131a53 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,7 +1,7 @@
# 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"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
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
From fa3526cc28926dd39847a9bf25beda1231fbdbdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:18:17 +0700
Subject: [PATCH 7/9] python3-PyQt5-webengine: build with sip-build
---
srcpkgs/python3-PyQt5-webengine/template | 166 ++---------------------
1 file changed, 12 insertions(+), 154 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 8817d131a53..c547fcf412e 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -3,11 +3,12 @@ pkgname=python3-PyQt5-webengine
version=5.15.3
revision=1
wrksrc="PyQtWebEngine-${version}"
+build_style=sip-build
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 <congdanhqx@gmail.com>"
license="GPL-3.0-only"
@@ -15,163 +16,20 @@ homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
checksum=0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6
lib32disabled=yes
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel"
-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
}
-_cross_configure() {
- 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
- INCPATH += $XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel
- 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 <<EOF >$XBPS_WRAPPERDIR/qmake
-#!/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_configure
- 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
- # Fix location of python include
- find build -name Makefile |
- xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
- fi
-}
-
-do_build() {
- cd build
- make ${makejobs}
-}
-
-do_install() {
- cd build
- make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
- rm -rf ${DESTDIR}/usr/share
+post_install() {
+ : rm -rf ${DESTDIR}/usr/share
}
From 975be676917675d23c0e4dd5e096e2b13069f550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:58:54 +0700
Subject: [PATCH 8/9] 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 c547fcf412e..2a7aeafd3dd 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -33,3 +33,11 @@ post_extract() {
post_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 d0c8fa8deb429c8639803c68d2ad4cb85bd66cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 08:20:45 +0700
Subject: [PATCH 9/9] python3-PyQt5-networkauth: update to 5.15.3
Splited from python3-PyQt5
---
srcpkgs/python3-PyQt5-networkauth-devel | 1 +
srcpkgs/python3-PyQt5-networkauth/template | 24 ++++++++++++++++++++++
2 files changed, 25 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..93f998acc7b
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-PyQt5-networkauth'
+pkgname=python3-PyQt5-networkauth
+version=5.15.3
+revision=1
+wrksrc=PyQtNetworkAuth-$version
+build_style=sip-build
+hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel sip
+ python3-PyQt-builder"
+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 <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
+distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz"
+checksum=2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82
+
+python3-PyQt5-networkauth-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] New build-style: sip-build for PyQt stack, update to 5.15.3
2021-03-02 14:44 [PR PATCH] New build-style: sip-build for PyQt stack, update to 5.15.3 sgn
2021-03-02 15:09 ` [PR PATCH] [Updated] " sgn
@ 2021-03-02 15:14 ` sgn
2021-03-05 0:55 ` sgn
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-03-02 15:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages new-build-style-sip-build-for-PyQt-stack
https://github.com/void-linux/void-packages/pull/29178
New build-style: sip-build for PyQt stack, update to 5.15.3
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29178.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-build-style-sip-build-for-PyQt-stack-29178.patch --]
[-- Type: text/x-diff, Size: 28289 bytes --]
From b0d1eb41990f2b1dde773484d18f1e8217c7435b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 27 Feb 2021 07:41:36 +0700
Subject: [PATCH 1/9] 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 <congdanhqx@gmail.com>"
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 38902df5b37269a992b8837b3135f8340feec424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:32:49 +0700
Subject: [PATCH 2/9] 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 <congdanhqx@gmail.com>"
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 27055bb7b3b855df569e218235e22e4bf49a15e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 09:03:44 +0700
Subject: [PATCH 3/9] New build-style: sip-build
---
common/build-style/sip-build.sh | 149 ++++++++++++++++++++
common/environment/build-style/sip-build.sh | 1 +
2 files changed, 150 insertions(+)
create mode 100644 common/build-style/sip-build.sh
create mode 100644 common/environment/build-style/sip-build.sh
diff --git a/common/build-style/sip-build.sh b/common/build-style/sip-build.sh
new file mode 100644
index 00000000000..81d9622ec09
--- /dev/null
+++ b/common/build-style/sip-build.sh
@@ -0,0 +1,149 @@
+#
+# This helper is for templates using sip-build.
+#
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ 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;;
+ ppc64*) _qt_arch=power64 ;;
+ ppc*) _qt_arch=power ;;
+ 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
+ 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 ${configure_args}
+
+ 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_cmd:=make}
+ ${make_cmd} -C build ${makejobs}
+}
+
+do_install() {
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
+ ${make_cmd} -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} ${make_install_target}
+}
+
diff --git a/common/environment/build-style/sip-build.sh b/common/environment/build-style/sip-build.sh
new file mode 100644
index 00000000000..b3cd76b6dfa
--- /dev/null
+++ b/common/environment/build-style/sip-build.sh
@@ -0,0 +1 @@
+hostmakedepends+=" pkg-config python3-PyQt-builder"
From 45ecb2f53fedb913b7f478db353e686c9e7ab829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:16 +0700
Subject: [PATCH 4/9] python3-PyQt5: update to 5.15.3.
---
srcpkgs/python3-PyQt5-networkauth | 1 -
srcpkgs/python3-PyQt5/template | 16 ++++------------
2 files changed, 4 insertions(+), 13 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..8aa3ea86158 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 <congdanhqx@gmail.com>"
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() {
@@ -228,14 +228,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 33a7a43124c19812f93ddd1818d985a3581a8873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:13:23 +0700
Subject: [PATCH 5/9] python3-PyQt5: build with sip-build
---
srcpkgs/python3-PyQt5/template | 156 +--------------------------------
1 file changed, 4 insertions(+), 152 deletions(-)
diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index 8aa3ea86158..a528a111d86 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -4,9 +4,10 @@ version=5.15.3
revision=1
_sipver=12.8.0
wrksrc="PyQt5-${version}"
+build_style=sip-build
build_helper=qemu
-hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake
- python3-dbus"
+configure_args="--confirm-license"
+hostmakedepends="python3-dbus qt5-qmake qt5-host-tools"
makedepends="qscintilla-qt5-devel python3-sip-PyQt5
python3-devel python-dbus-devel qt5 qt5-devel qt5-tools-devel
qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
@@ -26,157 +27,8 @@ post_extract() {
rm -rf pyuic/uic/port_v2
}
-_cross_configure() {
- 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_configure
- 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 --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() {
- cd build
- make ${makejobs}
-}
-
-do_install() {
- cd build
- make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+post_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
}
From 2f0d2f9dad559b1dc5e640429f6163879595931c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:32 +0700
Subject: [PATCH 6/9] python3-PyQt5-webengine: update to 5.15.3.
---
srcpkgs/python3-PyQt5-webengine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 7f4cb452f8e..8817d131a53 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,7 +1,7 @@
# 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"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
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
From a3ce5f26cb832ad4a59ff6f55aa9af26e8a6e00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:18:17 +0700
Subject: [PATCH 7/9] python3-PyQt5-webengine: build with sip-build
---
srcpkgs/python3-PyQt5-webengine/template | 169 ++---------------------
1 file changed, 13 insertions(+), 156 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 8817d131a53..2041880eb0c 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -3,11 +3,11 @@ pkgname=python3-PyQt5-webengine
version=5.15.3
revision=1
wrksrc="PyQtWebEngine-${version}"
-hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel
- sip python3-PyQt-builder"
+build_style=sip-build
+hostmakedepends="qt5-qmake python3-PyQt5-devel"
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 <congdanhqx@gmail.com>"
license="GPL-3.0-only"
@@ -15,163 +15,20 @@ homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
checksum=0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6
lib32disabled=yes
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel"
-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
}
-_cross_configure() {
- 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
- INCPATH += $XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel
- 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 <<EOF >$XBPS_WRAPPERDIR/qmake
-#!/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_configure
- 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
- # Fix location of python include
- find build -name Makefile |
- xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
- fi
-}
-
-do_build() {
- cd build
- make ${makejobs}
-}
-
-do_install() {
- cd build
- make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
- rm -rf ${DESTDIR}/usr/share
+post_install() {
+ : rm -rf ${DESTDIR}/usr/share
}
From ee3b30a29300730086e756754ca73602c981c10d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:58:54 +0700
Subject: [PATCH 8/9] 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 2041880eb0c..64950603316 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -32,3 +32,11 @@ post_extract() {
post_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 4398c0d1dcba315e1828a521020dfc5c968f8ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 08:20:45 +0700
Subject: [PATCH 9/9] python3-PyQt5-networkauth: update to 5.15.3
Splited from python3-PyQt5
---
srcpkgs/python3-PyQt5-networkauth-devel | 1 +
srcpkgs/python3-PyQt5-networkauth/template | 23 ++++++++++++++++++++++
2 files changed, 24 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..600367e50ef
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-PyQt5-networkauth'
+pkgname=python3-PyQt5-networkauth
+version=5.15.3
+revision=1
+wrksrc=PyQtNetworkAuth-$version
+build_style=sip-build
+hostmakedepends="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 <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
+distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz"
+checksum=2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82
+
+python3-PyQt5-networkauth-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] New build-style: sip-build for PyQt stack, update to 5.15.3
2021-03-02 14:44 [PR PATCH] New build-style: sip-build for PyQt stack, update to 5.15.3 sgn
2021-03-02 15:09 ` [PR PATCH] [Updated] " sgn
2021-03-02 15:14 ` sgn
@ 2021-03-05 0:55 ` sgn
2021-03-05 1:16 ` [PR PATCH] [Updated] PyQt stack: " sgn
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-03-05 0:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages new-build-style-sip-build-for-PyQt-stack
https://github.com/void-linux/void-packages/pull/29178
New build-style: sip-build for PyQt stack, update to 5.15.3
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29178.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-build-style-sip-build-for-PyQt-stack-29178.patch --]
[-- Type: text/x-diff, Size: 15823 bytes --]
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?=
<congdanhqx@gmail.com>
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 <congdanhqx@gmail.com>"
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?=
<congdanhqx@gmail.com>
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 <congdanhqx@gmail.com>"
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?=
<congdanhqx@gmail.com>
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 <congdanhqx@gmail.com>"
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?=
<congdanhqx@gmail.com>
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 <congdanhqx@gmail.com>"
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?=
<congdanhqx@gmail.com>
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 85374d8680451bc69a5a04d3b11f9d4ef7831bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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..ead456447dc
--- /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 <congdanhqx@gmail.com>"
+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 --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
+ 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
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] PyQt stack: update to 5.15.3
2021-03-02 14:44 [PR PATCH] New build-style: sip-build for PyQt stack, update to 5.15.3 sgn
` (2 preceding siblings ...)
2021-03-05 0:55 ` sgn
@ 2021-03-05 1:16 ` sgn
2021-03-08 5:26 ` sgn
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-03-05 1:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages new-build-style-sip-build-for-PyQt-stack
https://github.com/void-linux/void-packages/pull/29178
PyQt stack: update to 5.15.3
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29178.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-build-style-sip-build-for-PyQt-stack-29178.patch --]
[-- Type: text/x-diff, Size: 15805 bytes --]
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?=
<congdanhqx@gmail.com>
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 <congdanhqx@gmail.com>"
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?=
<congdanhqx@gmail.com>
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 <congdanhqx@gmail.com>"
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?=
<congdanhqx@gmail.com>
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 <congdanhqx@gmail.com>"
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?=
<congdanhqx@gmail.com>
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 <congdanhqx@gmail.com>"
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?=
<congdanhqx@gmail.com>
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?=
<congdanhqx@gmail.com>
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 <congdanhqx@gmail.com>"
+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
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] PyQt stack: update to 5.15.3
2021-03-02 14:44 [PR PATCH] New build-style: sip-build for PyQt stack, update to 5.15.3 sgn
` (3 preceding siblings ...)
2021-03-05 1:16 ` [PR PATCH] [Updated] PyQt stack: " sgn
@ 2021-03-08 5:26 ` sgn
2021-03-10 16:15 ` sgn
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-03-08 5:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages new-build-style-sip-build-for-PyQt-stack
https://github.com/void-linux/void-packages/pull/29178
PyQt stack: update to 5.15.3
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29178.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-build-style-sip-build-for-PyQt-stack-29178.patch --]
[-- Type: text/x-diff, Size: 29314 bytes --]
From 511b0ff9e3c146bd4ac3357fe58a2f4d4c033e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 27 Feb 2021 07:41:36 +0700
Subject: [PATCH 1/9] 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 <congdanhqx@gmail.com>"
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 38013568dac8360d5fa10aba2ed3a1249db718af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:32:49 +0700
Subject: [PATCH 2/9] 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 <congdanhqx@gmail.com>"
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 940239a7a6ce4cfff12c14547aabc081414cf3ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 09:03:44 +0700
Subject: [PATCH 3/9] New build-style: sip-build
---
common/build-style/sip-build.sh | 149 ++++++++++++++++++++
common/environment/build-style/sip-build.sh | 1 +
2 files changed, 150 insertions(+)
create mode 100644 common/build-style/sip-build.sh
create mode 100644 common/environment/build-style/sip-build.sh
diff --git a/common/build-style/sip-build.sh b/common/build-style/sip-build.sh
new file mode 100644
index 00000000000..81d9622ec09
--- /dev/null
+++ b/common/build-style/sip-build.sh
@@ -0,0 +1,149 @@
+#
+# This helper is for templates using sip-build.
+#
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ 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;;
+ ppc64*) _qt_arch=power64 ;;
+ ppc*) _qt_arch=power ;;
+ 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
+ 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 ${configure_args}
+
+ 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_cmd:=make}
+ ${make_cmd} -C build ${makejobs}
+}
+
+do_install() {
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
+ ${make_cmd} -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} ${make_install_target}
+}
+
diff --git a/common/environment/build-style/sip-build.sh b/common/environment/build-style/sip-build.sh
new file mode 100644
index 00000000000..b3cd76b6dfa
--- /dev/null
+++ b/common/environment/build-style/sip-build.sh
@@ -0,0 +1 @@
+hostmakedepends+=" pkg-config python3-PyQt-builder"
From fc9eab4f7da1de61729ee84baeb9381f798c57c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:16 +0700
Subject: [PATCH 4/9] 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 <congdanhqx@gmail.com>"
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 2b4812dcf0767f440483691fa5899fb108e055e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:13:23 +0700
Subject: [PATCH 5/9] python3-PyQt5: build with sip-build
---
srcpkgs/python3-PyQt5/template | 151 +--------------------------------
1 file changed, 4 insertions(+), 147 deletions(-)
diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index 6ab4fe59308..bf3321d5584 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -4,9 +4,10 @@ version=5.15.3
revision=1
_sipver=12.8.0
wrksrc="PyQt5-${version}"
+build_style=sip-build
build_helper=qemu
-hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake
- python3-dbus"
+configure_args="--confirm-license"
+hostmakedepends="python3-dbus qt5-qmake qt5-host-tools"
makedepends="qscintilla-qt5-devel python3-sip-PyQt5
python3-devel python-dbus-devel qt5 qt5-devel qt5-tools-devel
qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
@@ -26,153 +27,9 @@ post_extract() {
rm -rf pyuic/uic/port_v2
}
-_cross_configure() {
- 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_configure
- 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 --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
+post_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
}
From b430a86e66ce2b5104208e82fe47a8cbba0ffc10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:32 +0700
Subject: [PATCH 6/9] 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 <congdanhqx@gmail.com>"
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 26fbc5a5cbafea42f165b651bd2ed2783b48631c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:58:54 +0700
Subject: [PATCH 7/9] 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 323078edd067118899a3bbf6cd1a3a84ea4e9375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:18:17 +0700
Subject: [PATCH 8/9] python3-PyQt5-webengine: build with sip-build
---
srcpkgs/python3-PyQt5-webengine/template | 155 +----------------------
1 file changed, 3 insertions(+), 152 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 0c08cf8b410..ef690823d75 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -3,8 +3,8 @@ pkgname=python3-PyQt5-webengine
version=5.15.3
revision=1
wrksrc="PyQtWebEngine-${version}"
-hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel
- sip python3-PyQt-builder"
+build_style=sip-build
+hostmakedepends="qt5-qmake python3-PyQt5-devel"
makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
qt5-webengine-devel python3-devel python3-PyQt5-devel"
depends="python3-PyQt5>=${version} python3-PyQt5-webchannel>=${version}"
@@ -15,6 +15,7 @@ homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
checksum=0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6
lib32disabled=yes
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel"
if [ "$XBPS_TARGET_ENDIAN" != le ]; then
broken="no webengine for big endian"
@@ -28,156 +29,6 @@ post_extract() {
rm -rf pyuic/uic/port_v2
}
-_cross_configure() {
- 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
- INCPATH += $XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel
- 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 <<EOF >$XBPS_WRAPPERDIR/qmake
-#!/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_configure
- 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
- # Fix location of python include
- find build -name Makefile |
- xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
- fi
-}
-
-do_build() {
- cd build
- make ${makejobs}
-}
-
-do_install() {
- cd build
- 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}"
From 39a7d3e80dfc2dc742b937bd635361c5c5037402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 08:20:45 +0700
Subject: [PATCH 9/9] python3-PyQt5-networkauth: update to 5.15.3
Splited from python3-PyQt5
---
srcpkgs/python3-PyQt5-networkauth-devel | 1 +
srcpkgs/python3-PyQt5-networkauth/template | 23 ++++++++++++++++++++++
2 files changed, 24 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..600367e50ef
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-PyQt5-networkauth'
+pkgname=python3-PyQt5-networkauth
+version=5.15.3
+revision=1
+wrksrc=PyQtNetworkAuth-$version
+build_style=sip-build
+hostmakedepends="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 <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
+distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz"
+checksum=2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82
+
+python3-PyQt5-networkauth-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] PyQt stack: update to 5.15.3
2021-03-02 14:44 [PR PATCH] New build-style: sip-build for PyQt stack, update to 5.15.3 sgn
` (4 preceding siblings ...)
2021-03-08 5:26 ` sgn
@ 2021-03-10 16:15 ` sgn
2021-03-10 23:58 ` sgn
2021-03-10 23:59 ` [PR PATCH] [Merged]: " sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-03-10 16:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages new-build-style-sip-build-for-PyQt-stack
https://github.com/void-linux/void-packages/pull/29178
PyQt stack: update to 5.15.3
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29178.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-build-style-sip-build-for-PyQt-stack-29178.patch --]
[-- Type: text/x-diff, Size: 24375 bytes --]
From 988d123b5093b2239691579ce673a4b67b596f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:16 +0700
Subject: [PATCH 1/4] python3-PyQt5: update to 5.15.3.
---
srcpkgs/python3-PyQt5-networkauth | 1 -
srcpkgs/python3-PyQt5/template | 198 +++++-------------------------
2 files changed, 32 insertions(+), 167 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..8c0c62edb7a 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,158 +1,37 @@
# 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
-hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake
+build_helper="qemu qmake"
+configure_args="--confirm-license"
+hostmakedepends="pkg-config python3-PyQt-builder qt5-qmake qt5-host-tools
python3-dbus"
makedepends="qscintilla-qt5-devel python3-sip-PyQt5
python3-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"
+ 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 <congdanhqx@gmail.com>"
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
+CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver
+CXXFLAGS="$CFLAGS"
+
+export INCPATH=$XBPS_CROSS_BASE/usr/include/python$py3_ver
post_extract() {
rm -rf pyuic/uic/port_v2
}
-_cross_configure() {
- 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_configure
- 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 --confirm-license --no-make \
--api-dir /usr/share/qt5/qsci/api/python \
@@ -161,29 +40,24 @@ 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}
done
}
python3-PyQt5-devel-tools_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc+=" - development tools"
alternatives="
pyqt5:pylupdate5:/usr/bin/python3-pylupdate5
@@ -196,7 +70,7 @@ python3-PyQt5-devel-tools_package() {
}
}
python3-PyQt5-devel_package() {
- depends="sip>=6.0.0 python3-PyQt5-${version}_${revision}"
+ depends="sip>=6.0.0 python3-PyQt5>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/bindings
@@ -204,7 +78,7 @@ python3-PyQt5-devel_package() {
}
python3-PyQt5-dbus_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision} python3-dbus"
+ depends="python3-PyQt5>=${version}_${revision} python3-dbus"
short_desc="${short_desc} - dbus support"
pkg_install() {
vmove ${py3_sitelib}/dbus
@@ -212,7 +86,7 @@ python3-PyQt5-dbus_package() {
}
python3-PyQt5-connectivity_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - connectivity module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtBluetooth.*"
@@ -221,24 +95,16 @@ python3-PyQt5-connectivity_package() {
}
python3-PyQt5-multimedia_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - multimedia module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtMultimedia.*"
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}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - opengl module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtOpenGL.*"
@@ -249,7 +115,7 @@ python3-PyQt5-opengl_package() {
}
python3-PyQt5-location_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - location module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtLocation.*"
@@ -258,7 +124,7 @@ python3-PyQt5-location_package() {
}
python3-PyQt5-quick_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - quick module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtQml.*"
@@ -269,7 +135,7 @@ python3-PyQt5-quick_package() {
}
python3-PyQt5-sensors_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - sensors module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSensors.*"
@@ -277,7 +143,7 @@ python3-PyQt5-sensors_package() {
}
python3-PyQt5-serialport_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - serialport module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSerialPort.*"
@@ -285,7 +151,7 @@ python3-PyQt5-serialport_package() {
}
python3-PyQt5-sql_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - sql module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSql.*"
@@ -293,7 +159,7 @@ python3-PyQt5-sql_package() {
}
python3-PyQt5-svg_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - svg module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSvg.*"
@@ -301,7 +167,7 @@ python3-PyQt5-svg_package() {
}
python3-PyQt5-tools_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - designer, help modules"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtHelp.*"
@@ -311,7 +177,7 @@ python3-PyQt5-tools_package() {
}
python3-PyQt5-webchannel_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - webchannel module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtWebChannel.*"
@@ -319,7 +185,7 @@ python3-PyQt5-webchannel_package() {
}
python3-PyQt5-webkit_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - webkit module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtWebKit.*"
@@ -328,7 +194,7 @@ python3-PyQt5-webkit_package() {
}
python3-PyQt5-websockets_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - websockets module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtWebSockets.*"
@@ -336,7 +202,7 @@ python3-PyQt5-websockets_package() {
}
python3-PyQt5-x11extras_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - x11extras module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtX11Extras.*"
@@ -344,7 +210,7 @@ python3-PyQt5-x11extras_package() {
}
python3-PyQt5-xmlpatterns_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - xmlpatterns module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtXmlPatterns.*"
From 905eb7ccfa99cbb6ad5411aae76d8b27bf4f3e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:32 +0700
Subject: [PATCH 2/4] python3-PyQt5-webengine: update to 5.15.3.
---
srcpkgs/python3-PyQt5-webengine/template | 158 +++--------------------
1 file changed, 17 insertions(+), 141 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 7f4cb452f8e..6027049cf68 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,177 +1,53 @@
# 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}"
+build_helper="qmake"
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 <congdanhqx@gmail.com>"
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
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
+CXXFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel"
-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
}
-_cross_configure() {
- 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
- INCPATH += $XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel
- 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 <<EOF >$XBPS_WRAPPERDIR/qmake
-#!/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_configure
- 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
- # Fix location of python include
+ # -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() {
- cd build
- make ${makejobs}
+ make -C build ${makejobs}
}
do_install() {
- cd build
- make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
- rm -rf ${DESTDIR}/usr/share
+ make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
}
From 9445f986d01c66eec7520b0ba3cc909b3b2fe7fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:58:54 +0700
Subject: [PATCH 3/4] 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 6027049cf68..aed879a2dba 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -51,3 +51,11 @@ do_build() {
do_install() {
make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
}
+
+python3-PyQt5-webengine-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ }
+}
From f239b603ff5fb5f2b1ccb952d161a3487cca67a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 08:20:45 +0700
Subject: [PATCH 4/4] python3-PyQt5-networkauth: update to 5.15.3
Splited from python3-PyQt5
---
srcpkgs/python3-PyQt5-networkauth-devel | 1 +
srcpkgs/python3-PyQt5-networkauth/template | 47 ++++++++++++++++++++++
2 files changed, 48 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..b0768fc041b
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -0,0 +1,47 @@
+# Template file for 'python3-PyQt5-networkauth'
+pkgname=python3-PyQt5-networkauth
+version=5.15.3
+revision=1
+wrksrc=PyQtNetworkAuth-$version
+build_helper="qmake"
+hostmakedepends="qt5-qmake python3-PyQt5-devel pkg-config sip
+ python3-PyQt-builder"
+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 <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
+distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz"
+checksum=2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82
+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}"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] PyQt stack: update to 5.15.3
2021-03-02 14:44 [PR PATCH] New build-style: sip-build for PyQt stack, update to 5.15.3 sgn
` (5 preceding siblings ...)
2021-03-10 16:15 ` sgn
@ 2021-03-10 23:58 ` sgn
2021-03-10 23:59 ` [PR PATCH] [Merged]: " sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-03-10 23:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1629 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages new-build-style-sip-build-for-PyQt-stack
https://github.com/void-linux/void-packages/pull/29178
PyQt stack: update to 5.15.3
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/29178.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-build-style-sip-build-for-PyQt-stack-29178.patch --]
[-- Type: text/x-diff, Size: 24339 bytes --]
From 6301dd03cf2f223dee82ade0064ab5110f16f292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:16 +0700
Subject: [PATCH 1/4] python3-PyQt5: update to 5.15.3.
---
srcpkgs/python3-PyQt5-networkauth | 1 -
srcpkgs/python3-PyQt5/template | 197 +++++-------------------------
2 files changed, 31 insertions(+), 167 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..4437295251d 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,158 +1,36 @@
# 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
-hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake
+build_helper="qemu qmake"
+hostmakedepends="pkg-config python3-PyQt-builder qt5-qmake qt5-host-tools
python3-dbus"
makedepends="qscintilla-qt5-devel python3-sip-PyQt5
python3-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"
+ 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 <congdanhqx@gmail.com>"
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
+CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver
+CXXFLAGS="$CFLAGS"
+
+export INCPATH=$XBPS_CROSS_BASE/usr/include/python$py3_ver
post_extract() {
rm -rf pyuic/uic/port_v2
}
-_cross_configure() {
- 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_configure
- 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 --confirm-license --no-make \
--api-dir /usr/share/qt5/qsci/api/python \
@@ -161,29 +39,24 @@ 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}
done
}
python3-PyQt5-devel-tools_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc+=" - development tools"
alternatives="
pyqt5:pylupdate5:/usr/bin/python3-pylupdate5
@@ -196,7 +69,7 @@ python3-PyQt5-devel-tools_package() {
}
}
python3-PyQt5-devel_package() {
- depends="sip>=6.0.0 python3-PyQt5-${version}_${revision}"
+ depends="sip>=6.0.0 python3-PyQt5>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/bindings
@@ -204,7 +77,7 @@ python3-PyQt5-devel_package() {
}
python3-PyQt5-dbus_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision} python3-dbus"
+ depends="python3-PyQt5>=${version}_${revision} python3-dbus"
short_desc="${short_desc} - dbus support"
pkg_install() {
vmove ${py3_sitelib}/dbus
@@ -212,7 +85,7 @@ python3-PyQt5-dbus_package() {
}
python3-PyQt5-connectivity_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - connectivity module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtBluetooth.*"
@@ -221,24 +94,16 @@ python3-PyQt5-connectivity_package() {
}
python3-PyQt5-multimedia_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - multimedia module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtMultimedia.*"
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}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - opengl module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtOpenGL.*"
@@ -249,7 +114,7 @@ python3-PyQt5-opengl_package() {
}
python3-PyQt5-location_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - location module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtLocation.*"
@@ -258,7 +123,7 @@ python3-PyQt5-location_package() {
}
python3-PyQt5-quick_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - quick module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtQml.*"
@@ -269,7 +134,7 @@ python3-PyQt5-quick_package() {
}
python3-PyQt5-sensors_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - sensors module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSensors.*"
@@ -277,7 +142,7 @@ python3-PyQt5-sensors_package() {
}
python3-PyQt5-serialport_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - serialport module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSerialPort.*"
@@ -285,7 +150,7 @@ python3-PyQt5-serialport_package() {
}
python3-PyQt5-sql_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - sql module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSql.*"
@@ -293,7 +158,7 @@ python3-PyQt5-sql_package() {
}
python3-PyQt5-svg_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - svg module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSvg.*"
@@ -301,7 +166,7 @@ python3-PyQt5-svg_package() {
}
python3-PyQt5-tools_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - designer, help modules"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtHelp.*"
@@ -311,7 +176,7 @@ python3-PyQt5-tools_package() {
}
python3-PyQt5-webchannel_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - webchannel module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtWebChannel.*"
@@ -319,7 +184,7 @@ python3-PyQt5-webchannel_package() {
}
python3-PyQt5-webkit_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - webkit module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtWebKit.*"
@@ -328,7 +193,7 @@ python3-PyQt5-webkit_package() {
}
python3-PyQt5-websockets_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - websockets module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtWebSockets.*"
@@ -336,7 +201,7 @@ python3-PyQt5-websockets_package() {
}
python3-PyQt5-x11extras_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - x11extras module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtX11Extras.*"
@@ -344,7 +209,7 @@ python3-PyQt5-x11extras_package() {
}
python3-PyQt5-xmlpatterns_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - xmlpatterns module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtXmlPatterns.*"
From ba88a30daecfa8faee51ec9c016167e86b606d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 21:33:32 +0700
Subject: [PATCH 2/4] python3-PyQt5-webengine: update to 5.15.3.
---
srcpkgs/python3-PyQt5-webengine/template | 158 +++--------------------
1 file changed, 17 insertions(+), 141 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 7f4cb452f8e..6027049cf68 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,177 +1,53 @@
# 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}"
+build_helper="qmake"
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 <congdanhqx@gmail.com>"
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
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
+CXXFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel"
-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
}
-_cross_configure() {
- 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
- INCPATH += $XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel
- 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 <<EOF >$XBPS_WRAPPERDIR/qmake
-#!/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_configure
- 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
- # Fix location of python include
+ # -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() {
- cd build
- make ${makejobs}
+ make -C build ${makejobs}
}
do_install() {
- cd build
- make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
- rm -rf ${DESTDIR}/usr/share
+ make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
}
From 4f1762cc195f88a76909a92d0b85da5c23d61a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 21:58:54 +0700
Subject: [PATCH 3/4] 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 6027049cf68..aed879a2dba 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -51,3 +51,11 @@ do_build() {
do_install() {
make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
}
+
+python3-PyQt5-webengine-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ }
+}
From b709de05c5e6c67434e6daa194ae1fb514fb4143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Mar 2021 08:20:45 +0700
Subject: [PATCH 4/4] python3-PyQt5-networkauth: update to 5.15.3
Splited from python3-PyQt5
---
srcpkgs/python3-PyQt5-networkauth-devel | 1 +
srcpkgs/python3-PyQt5-networkauth/template | 47 ++++++++++++++++++++++
2 files changed, 48 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..b0768fc041b
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -0,0 +1,47 @@
+# Template file for 'python3-PyQt5-networkauth'
+pkgname=python3-PyQt5-networkauth
+version=5.15.3
+revision=1
+wrksrc=PyQtNetworkAuth-$version
+build_helper="qmake"
+hostmakedepends="qt5-qmake python3-PyQt5-devel pkg-config sip
+ python3-PyQt-builder"
+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 <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
+distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz"
+checksum=2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82
+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}"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: PyQt stack: update to 5.15.3
2021-03-02 14:44 [PR PATCH] New build-style: sip-build for PyQt stack, update to 5.15.3 sgn
` (6 preceding siblings ...)
2021-03-10 23:58 ` sgn
@ 2021-03-10 23:59 ` sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-03-10 23:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1448 bytes --]
There's a merged pull request on the void-packages repository
PyQt stack: update to 5.15.3
https://github.com/void-linux/void-packages/pull/29178
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
[ci skip]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-03-10 23:59 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-02 14:44 [PR PATCH] New build-style: sip-build for PyQt stack, update to 5.15.3 sgn
2021-03-02 15:09 ` [PR PATCH] [Updated] " sgn
2021-03-02 15:14 ` sgn
2021-03-05 0:55 ` sgn
2021-03-05 1:16 ` [PR PATCH] [Updated] PyQt stack: " sgn
2021-03-08 5:26 ` sgn
2021-03-10 16:15 ` sgn
2021-03-10 23:58 ` sgn
2021-03-10 23:59 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).