From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] WIP: PyQt6
Date: Sat, 29 May 2021 18:47:24 +0200 [thread overview]
Message-ID: <20210529164724.qZoOOcvbFhdqa6ukis1Twhd4Uw6wWlrFVgAXnHBSh80@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31092@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1571 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages wip-pyqt6
https://github.com/void-linux/void-packages/pull/31092
WIP: PyQt6
<!-- 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/31092.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wip-pyqt6-31092.patch --]
[-- Type: text/x-diff, Size: 24282 bytes --]
From d814ecea9ebf94b2e535198383b3cc973f19b520 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, 29 May 2021 11:49:19 +0700
Subject: [PATCH 1/7] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
See: /usr/lib/qt6/mkspecs/modules/qt_lib_core_private.pri
It should say "-latomic" instead of "atomic".
---
srcpkgs/qt6-base/patches/libatomic.patch | 14 ++++++++++++++
srcpkgs/qt6-base/template | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
new file mode 100644
index 000000000000..edbe5e609d5a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/libatomic.patch
@@ -0,0 +1,14 @@
+Index: cmake/FindWrapAtomic.cmake
+===================================================================
+--- cmake/FindWrapAtomic.cmake.orig
++++ cmake/FindWrapAtomic.cmake
+@@ -38,7 +38,8 @@ endif()
+
+ add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
+ if(HAVE_STDATOMIC_WITH_LIB)
+- target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
++ find_library(LIBATOMIC atomic REQUIRED)
++ target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
+ endif()
+
+ set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index c720e7f51671..d03dfe7a2129 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-base'
pkgname=qt6-base
version=6.1.0
-revision=1
+revision=2
wrksrc="qtbase-everywhere-src-${version}"
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
@@ -25,7 +25,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel
sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
short_desc="Cross-platform application and UI framework (QT6)"
maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
homepage="https://www.qt.io"
distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
checksum=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
From f853b0280cdbff6cff0285a09939655133f45a26 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: Fri, 14 May 2021 22:03:09 +0700
Subject: [PATCH 2/7] python3-PyQt-builder: update to 1.10.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 befe99aae73a..58d5ad28db8b 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.9.1
+version=1.10.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=8d669fe8fa434a3e47abde3b40d924d91932e8e19d88b20c778a3e1c77621ebc
+checksum=86bd19fde83d92beaefacdeac1e26c6e1918c300ff78d7ec2a19973bf2cf21b5
post_install() {
rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle
From 8e0df367ed200fa7657ce999123f3fb5e9d62853 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: Fri, 14 May 2021 22:04:05 +0700
Subject: [PATCH 3/7] sip: update to 6.1.0.
---
srcpkgs/sip/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1227e754298f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
# Template file for 'sip'
pkgname=sip
-version=6.0.3
+version=6.1.0
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=929e3515428ea962003ccf6795244a5fe4fa6e2c94dc9ab8cb2c58fcd368c34c
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
lib32disabled=yes
replaces="sip5<=${version}_${revision}"
provides="sip5-${version}_${revision}"
From 3e432bdfd8d72d6de00e027c78569cd6ea796775 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: Wed, 26 May 2021 08:20:10 +0700
Subject: [PATCH 4/7] python3-sip-PyQt5: update to 12.9.0.
---
srcpkgs/python3-sip-PyQt5/template | 8 ++++----
srcpkgs/python3-sip-PyQt5/update | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/python3-sip-PyQt5/update
diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template
index 6ef05a2e0b1d..efc715a7f910 100644
--- a/srcpkgs/python3-sip-PyQt5/template
+++ b/srcpkgs/python3-sip-PyQt5/template
@@ -1,18 +1,18 @@
# Template file for 'python3-sip-PyQt5'
pkgname=python3-sip-PyQt5
-version=12.8.1
-revision=2
+version=12.9.0
+revision=1
wrksrc="PyQt5_sip-$version"
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools sip"
makedepends="python3-devel"
depends="python3"
short_desc="Python 3 PyQt5 SIP bindings with C and C++"
-maintainer="Orphaned <orphan@voidlinux.org>"
+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}/P/PyQt5_sip/PyQt5_sip-${version}.tar.gz"
-checksum=30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd
+checksum=d3e4489d7c2b0ece9d203ae66e573939f7f60d4d29e089c9f11daa17cfeaae32
lib32disabled=yes
post_extract() {
diff --git a/srcpkgs/python3-sip-PyQt5/update b/srcpkgs/python3-sip-PyQt5/update
new file mode 100644
index 000000000000..656adf47509e
--- /dev/null
+++ b/srcpkgs/python3-sip-PyQt5/update
@@ -0,0 +1,2 @@
+site=https://pypi.org/simple/PyQt5-sip
+pattern='PyQt5_sip-\K([\d.]+)(?=.tar.gz)'
From 6959dc16f9872d8bcbd906d13132ec2ba4128d54 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: Mon, 24 May 2021 22:51:51 +0700
Subject: [PATCH 5/7] New package: python3-PyQt6-sip-13.1.0
---
srcpkgs/python3-PyQt6-sip/template | 25 +++++++++++++++++++++++++
srcpkgs/python3-PyQt6-sip/update | 2 ++
2 files changed, 27 insertions(+)
create mode 100644 srcpkgs/python3-PyQt6-sip/template
create mode 100644 srcpkgs/python3-PyQt6-sip/update
diff --git a/srcpkgs/python3-PyQt6-sip/template b/srcpkgs/python3-PyQt6-sip/template
new file mode 100644
index 000000000000..826a31719992
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-sip/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-PyQt6-sip'
+pkgname=python3-PyQt6-sip
+version=13.1.0
+revision=1
+wrksrc="PyQt6_sip-$version"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools sip"
+makedepends="python3-devel"
+depends="python3"
+short_desc="PyQt6 SIP bindings with C and C++ for Python 3"
+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/sip/"
+distfiles="${PYPI_SITE}/P/PyQt6_sip/PyQt6_sip-${version}.tar.gz"
+checksum=7c31073fe8e6cb8a42e85d60d3a096700a9047c772b354d6227dfe965566ec8a
+lib32disabled=yes
+
+post_extract() {
+ # for do_check
+ mkdir -p PyQt6
+}
+
+post_install() {
+ vlicense /usr/share/licenses/sip/LICENSE
+}
diff --git a/srcpkgs/python3-PyQt6-sip/update b/srcpkgs/python3-PyQt6-sip/update
new file mode 100644
index 000000000000..b3e535a20eb4
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-sip/update
@@ -0,0 +1,2 @@
+site=https://pypi.org/simple/PyQt6-sip
+pattern='PyQt6_sip-\K([\d.]+)(?=.tar.gz)'
From c522341a83b5af16b5b8a468a4c5379ed3df6d45 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: Mon, 24 May 2021 22:54:39 +0700
Subject: [PATCH 6/7] build-style: new build-style for sip-build
---
common/build-style/sip-build.sh | 164 ++++++++++++++++++++
common/environment/build-style/sip-build.sh | 6 +
2 files changed, 170 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 000000000000..5a651981f40c
--- /dev/null
+++ b/common/build-style/sip-build.sh
@@ -0,0 +1,164 @@
+#
+# This helper is for templates using sip-build.
+#
+
+do_configure() {
+ local _build_help=
+ local _confirm_license=
+ local _apidir=
+ local _dbusdir=
+ local _qt=
+ local _spec=
+ local _mkspec=
+ : "${sip_builddir:=build}"
+ mkdir -p "$sip_builddir"
+
+ _build_help="$(sip-build --help)"
+ case "$_build_help" in
+ *--confirm-license*) _confirm_license=yes ;;
+ esac
+
+ case "$_build_help" in
+ *--dbus*)
+ for _dbusdir in "$XBPS_CROSS_BASE/usr/include/dbus"*; do
+ if [ -f "$_dbusdir/dbus/dbus-python.h" ]; then
+ break
+ fi
+ done
+ ;;
+ esac
+
+ case "$_build_help" in
+ *--qmake*)
+ if [ -x /usr/lib/qt6/bin/qmake ]; then
+ _qt=qt6
+ elif [ -x /usr/lib/qt5/bin/qmake ]; then
+ _qt=qt5
+ else
+ msg_error 'qmake not found\n'
+ fi
+ ;;
+ esac
+
+ if [ ! "$_qt" ]; then
+ : "who use sip-build without qmake anyway?"
+ elif [ "$CROSS_BUILD" ]; then
+ _mkspec="usr/lib/$_qt/mkspecs"
+ _spec="$XBPS_WRAPPERDIR/sip-build/target-spec/linux-g++"
+ mkdir -p "$_spec"
+ cat >"$_spec/qmake.conf" <<_EOF
+MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental no_qt_rpath
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(/$_mkspec/common/linux.conf)
+include(/$_mkspec/common/gcc-base-unix.conf)
+include(/$_mkspec/common/g++-unix.conf)
+
+QMAKE_TARGET_CONFIG = $XBPS_CROSS_BASE/$_mkspec/qconfig.pri
+QMAKE_TARGET_MODULE = $XBPS_CROSS_BASE/$_mkspec/qmodule.pri
+QMAKEMODULES = $XBPS_CROSS_BASE/$_mkspec/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 = -L$XBPS_CROSS_BASE/usr/lib $LDFLAGS
+load(qt_config)
+_EOF
+ echo "#include \"$XBPS_CROSS_BASE/$_mkspec/linux-g++/qplatformdefs.h\"" >"$_spec/qplatformdefs.h"
+ cat >"$XBPS_WRAPPERDIR/sip-build/qt.conf" <<_EOF
+[Paths]
+Sysroot=$XBPS_CROSS_BASE
+Prefix=$XBPS_CROSS_BASE/usr
+ArchData=$XBPS_CROSS_BASE/usr/lib/$_qt
+Data=$XBPS_CROSS_BASE/usr/share/$_qt
+Documentation=$XBPS_CROSS_BASE/usr/share/doc/$_qt
+Headers=$XBPS_CROSS_BASE/usr/include/$_qt
+Libraries=$XBPS_CROSS_BASE/usr/lib
+LibraryExecutables=/usr/lib/$_qt/libexec
+Binaries=/usr/lib/$_qt/bin
+Tests=$XBPS_CROSS_BASE/usr/tests
+Plugins=/usr/lib/$_qt/plugins
+Imports=$XBPS_CROSS_BASE/usr/lib/$_qt/imports
+Qml2Imports=$XBPS_CROSS_BASE/usr/lib/$_qt/qml
+Translations=$XBPS_CROSS_BASE/usr/share/$_qt/translations
+Settings=$XBPS_CROSS_BASE/etc/xdg
+Examples=$XBPS_CROSS_BASE/usr/share/$_qt/examples
+HostPrefix=/usr
+HostData=/usr/lib/$_qt
+HostBinaries=/usr/lib/$_qt/bin
+HostLibraries=/usr/lib
+HostLibraryExecutables=/usr/lib/$_qt/libexec
+Spec=linux-g++
+TargetSpec=$_spec
+_EOF
+ # Call it sip-qmake to not override qmake build-helper
+ #
+ # XXX: Intentionally quote {C,CXX,LD}FLAGS here but not native.
+ # - Cross Build:
+ # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+ # + hardening flags will be picked up from environment variables
+ # - Native Build:
+ # + hardening flags will be picked up first (Makefile, qt.conf?)
+ # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+ # Maybe there're better workaround, I don't know.
+ cat >"$XBPS_WRAPPERDIR/sip-qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/$_qt/bin/qmake "\$@" -qtconf "$XBPS_WRAPPERDIR/sip-build/qt.conf" \\
+ QMAKE_CFLAGS+="\$CFLAGS" \\
+ QMAKE_CXXFLAGS+="\$CXXFLAGS" \\
+ QMAKE_LFLAGS+="\$LDFLAGS"
+_EOF
+ else
+ cat >"${XBPS_WRAPPERDIR}/sip-qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/$_qt/bin/qmake \\
+ "\$@" \\
+ PREFIX=/usr \\
+ QT_INSTALL_PREFIX=/usr \\
+ LIB=/usr/lib \\
+ QMAKE_CC="$CC" QMAKE_CXX="$CXX" \\
+ QMAKE_LINK="$CXX" QMAKE_LINK_C="$CC" \\
+ QMAKE_CFLAGS+="$CFLAGS" \\
+ QMAKE_CXXFLAGS+="$CXXFLAGS" \\
+ QMAKE_LFLAGS+="$LDFLAGS" \\
+ CONFIG+=no_qt_rpath
+_EOF
+ fi
+ chmod 755 ${XBPS_WRAPPERDIR}/sip-qmake
+
+ sip-build --no-make \
+ ${_confirm_license:+--confirm-license} \
+ ${_apidir:+--api-dir "$_apidir"} \
+ ${_qt:+--qmake "$XBPS_WRAPPERDIR/sip-qmake"} \
+ ${_dbusdir:+--dbus "$_dbusdir"} \
+ $configure_args \
+ --build-dir "$sip_builddir"
+
+ if [ "$CROSS_BUILD" ]; then
+ # -I/usr/include/python$py3_ver is set by sip-build :(
+ find "$sip_builddir" -name Makefile |
+ xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
+ fi
+}
+
+do_build() {
+ : "${sip_builddir:=build}"
+ make -C "${sip_builddir}" ${makejobs}
+}
+
+do_install() {
+ : "${sip_builddir:=build}"
+ make -C "${sip_builddir}" \
+ DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} \
+ install
+}
diff --git a/common/environment/build-style/sip-build.sh b/common/environment/build-style/sip-build.sh
new file mode 100644
index 000000000000..ffaefc90ce47
--- /dev/null
+++ b/common/environment/build-style/sip-build.sh
@@ -0,0 +1,6 @@
+hostmakedepends+=" python3-PyQt-builder pkg-config"
+makedepends+=" python3-devel"
+lib32disabled=yes
+
+CFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
+CXXFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
From 523fe2812c2623bd301d7785ac3f70fb3e644a60 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: Mon, 24 May 2021 22:54:59 +0700
Subject: [PATCH 7/7] New package: python3-PyQt6-6.1.0
---
srcpkgs/python3-PyQt6-core | 1 +
srcpkgs/python3-PyQt6-dbus | 1 +
srcpkgs/python3-PyQt6-devel | 1 +
srcpkgs/python3-PyQt6-devel-tools | 1 +
srcpkgs/python3-PyQt6-gui | 1 +
srcpkgs/python3-PyQt6-network | 1 +
srcpkgs/python3-PyQt6-opengl-widgets | 1 +
srcpkgs/python3-PyQt6-printsupport | 1 +
srcpkgs/python3-PyQt6-sql | 1 +
srcpkgs/python3-PyQt6-test | 1 +
srcpkgs/python3-PyQt6-widgets | 1 +
srcpkgs/python3-PyQt6-xml | 1 +
.../patches/pyproject-cross.patch | 20 +++
srcpkgs/python3-PyQt6/template | 146 ++++++++++++++++++
14 files changed, 178 insertions(+)
create mode 120000 srcpkgs/python3-PyQt6-core
create mode 120000 srcpkgs/python3-PyQt6-dbus
create mode 120000 srcpkgs/python3-PyQt6-devel
create mode 120000 srcpkgs/python3-PyQt6-devel-tools
create mode 120000 srcpkgs/python3-PyQt6-gui
create mode 120000 srcpkgs/python3-PyQt6-network
create mode 120000 srcpkgs/python3-PyQt6-opengl-widgets
create mode 120000 srcpkgs/python3-PyQt6-printsupport
create mode 120000 srcpkgs/python3-PyQt6-sql
create mode 120000 srcpkgs/python3-PyQt6-test
create mode 120000 srcpkgs/python3-PyQt6-widgets
create mode 120000 srcpkgs/python3-PyQt6-xml
create mode 100644 srcpkgs/python3-PyQt6/patches/pyproject-cross.patch
create mode 100644 srcpkgs/python3-PyQt6/template
diff --git a/srcpkgs/python3-PyQt6-core b/srcpkgs/python3-PyQt6-core
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-core
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-dbus b/srcpkgs/python3-PyQt6-dbus
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-dbus
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-devel b/srcpkgs/python3-PyQt6-devel
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-devel
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-devel-tools b/srcpkgs/python3-PyQt6-devel-tools
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-devel-tools
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-gui b/srcpkgs/python3-PyQt6-gui
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-gui
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-network b/srcpkgs/python3-PyQt6-network
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-network
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-opengl-widgets b/srcpkgs/python3-PyQt6-opengl-widgets
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-opengl-widgets
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-printsupport b/srcpkgs/python3-PyQt6-printsupport
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-printsupport
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-sql b/srcpkgs/python3-PyQt6-sql
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-sql
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-test b/srcpkgs/python3-PyQt6-test
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-test
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-widgets b/srcpkgs/python3-PyQt6-widgets
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-widgets
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6-xml b/srcpkgs/python3-PyQt6-xml
new file mode 120000
index 000000000000..9f73cbb49761
--- /dev/null
+++ b/srcpkgs/python3-PyQt6-xml
@@ -0,0 +1 @@
+python3-PyQt6
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt6/patches/pyproject-cross.patch b/srcpkgs/python3-PyQt6/patches/pyproject-cross.patch
new file mode 100644
index 000000000000..eba520ffc6ac
--- /dev/null
+++ b/srcpkgs/python3-PyQt6/patches/pyproject-cross.patch
@@ -0,0 +1,20 @@
+Index: PyQt6-6.1.0/project.py
+===================================================================
+--- PyQt6-6.1.0.orig/project.py
++++ PyQt6-6.1.0/project.py
+@@ -49,6 +49,15 @@ class PyQt(PyQtProject):
+ # QtNfc, QtPositioning, QtLocation, QtRemoteObjects, QtSensors,
+ # QtSerialPort, QtTextToSpeech, QtWebChannel, QtWebSockets
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "PyQt6")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values where needed. """
+
diff --git a/srcpkgs/python3-PyQt6/template b/srcpkgs/python3-PyQt6/template
new file mode 100644
index 000000000000..35e2437bb45d
--- /dev/null
+++ b/srcpkgs/python3-PyQt6/template
@@ -0,0 +1,146 @@
+# Template file for 'python3-PyQt6'
+pkgname=python3-PyQt6
+version=6.1.0
+revision=1
+wrksrc=PyQt6-$version
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt6-base-devel python3-dbus"
+makedepends="qt6-base-devel python3-dbus-devel"
+depends="python3-PyQt6-sip"
+short_desc="Python 3 bindings for the Qt6 application toolkit"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/pyqt/"
+distfiles="$PYPI_SITE/P/PyQt6/PyQt6-$version.tar.gz"
+checksum=9b45df6c404d7297598b91378d1e3f9bdf0970553ebb53c192a9051576098f9b
+lib32disabled=yes
+patch_args=-Np1
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+python3-PyQt6-devel-tools_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision}"
+ short_desc+=" - development tools"
+ pkg_install() {
+ vmove usr/bin
+ vmove "${py3_sitelib}/PyQt6/lupdate"
+ vmove "${py3_sitelib}/PyQt6/uic"
+ }
+}
+
+python3-PyQt6-devel_package() {
+ depends="sip>=6.0.0
+ python3-PyQt6-dbus>=${version}_${revision}
+ python3-PyQt6-gui>=${version}_${revision}
+ python3-PyQt6-opengl-widgets>=${version}_${revision}
+ python3-PyQt6-core>=${version}_${revision}
+ python3-PyQt6-printsupport>=${version}_${revision}
+ python3-PyQt6-widgets>=${version}_${revision}
+ python3-PyQt6-network>=${version}_${revision}
+ python3-PyQt6-sql>=${version}_${revision}
+ python3-PyQt6-test>=${version}_${revision}
+ python3-PyQt6-xml>=${version}_${revision}
+ python3-PyQt6-devel-tools>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt6/bindings
+ }
+}
+
+# Split like qt6
+
+python3-PyQt6-dbus_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision} python3-dbus"
+ short_desc="${short_desc} - dbus support"
+ pkg_install() {
+ vmove ${py3_sitelib}/dbus
+ vmove "${py3_sitelib}/PyQt6/QtDBus.*"
+ }
+}
+
+python3-PyQt6-gui_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision}"
+ short_desc="${short_desc} - GUI"
+ pkg_install() {
+ vmove "${py3_sitelib}/PyQt6/QtGui.*"
+ vmove "${py3_sitelib}/PyQt6/QtOpenGL.*"
+ }
+}
+
+python3-PyQt6-opengl-widgets_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision}"
+ short_desc="${short_desc} - OpenGL Widgets"
+ pkg_install() {
+ vmove "${py3_sitelib}/PyQt6/QtOpenGLWidgets.*"
+ }
+}
+
+python3-PyQt6-core_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision}"
+ short_desc="${short_desc} - Core"
+ pkg_install() {
+ vmove "${py3_sitelib}/PyQt6/QtCore.*"
+ }
+}
+
+python3-PyQt6-printsupport_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision}"
+ short_desc="${short_desc} - Print Support"
+ pkg_install() {
+ vmove "${py3_sitelib}/PyQt6/QtPrintSupport.*"
+ }
+}
+
+python3-PyQt6-widgets_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision}"
+ short_desc="${short_desc} - Widgets"
+ pkg_install() {
+ vmove "${py3_sitelib}/PyQt6/QtWidgets.*"
+ }
+}
+
+python3-PyQt6-network_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision}"
+ short_desc="${short_desc} - Network"
+ pkg_install() {
+ vmove "${py3_sitelib}/PyQt6/QtNetwork.*"
+ }
+}
+
+python3-PyQt6-sql_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision}"
+ short_desc="${short_desc} - SQL"
+ pkg_install() {
+ vmove "${py3_sitelib}/PyQt6/QtSql.*"
+ }
+}
+
+python3-PyQt6-test_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision}"
+ short_desc="${short_desc} - Test"
+ pkg_install() {
+ vmove "${py3_sitelib}/PyQt6/QtTest.*"
+ }
+}
+
+python3-PyQt6-xml_package() {
+ lib32disabled=yes
+ depends="python3-PyQt6>=${version}_${revision}"
+ short_desc="${short_desc} - Xml"
+ pkg_install() {
+ vmove "${py3_sitelib}/PyQt6/QtXml.*"
+ }
+}
next prev parent reply other threads:[~2021-05-29 16:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-24 15:57 [PR PATCH] " sgn
2021-05-24 15:58 ` [PR PATCH] [Updated] " sgn
2021-05-28 16:09 ` sgn
2021-05-28 16:19 ` sgn
2021-05-29 16:47 ` sgn [this message]
2021-05-30 17:14 ` sgn
2021-05-31 11:54 ` sgn
2021-06-04 15:14 ` sgn
2021-06-06 8:52 ` sgn
2021-06-15 18:17 ` sgn
2021-06-17 0:37 ` PyQt6 sgn
2021-06-17 0:37 ` PyQt6 sgn
2021-06-17 11:39 ` [PR PATCH] [Updated] PyQt6 sgn
2021-06-17 12:07 ` sgn
2021-06-17 12:09 ` sgn
2021-06-22 14:27 ` [PR PATCH] [Merged]: PyQt6 sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210529164724.qZoOOcvbFhdqa6ukis1Twhd4Uw6wWlrFVgAXnHBSh80@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).