Re: [PR PATCH] [Updated] WIP: PyQt6

[sgn <sgn@users.noreply.github.com>]

[-- 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: 6418 bytes --]

From c01551a6520c391c63a3b4f32918e3e707f2d8f2 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 21:41:13 +0700
Subject: [PATCH 1/4] python3-sip-PyQt5: add update pattern

---
 srcpkgs/python3-sip-PyQt5/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/python3-sip-PyQt5/update

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 0ea55e40ae8320b5643e339b58e6dade0b06a644 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 2/4] 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..a0edac5be594
--- /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="Orphaned <orphan@voidlinux.org>"
+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 614ffee6c2af9b8538cc94802b8a1854c53aeb85 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 3/4] build-style: introduce sip-build

---
 common/build-style/sip-build.sh             | 65 +++++++++++++++++++++
 common/environment/build-style/sip-build.sh |  6 ++
 2 files changed, 71 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..1cde601ee82e
--- /dev/null
+++ b/common/build-style/sip-build.sh
@@ -0,0 +1,65 @@
+#
+# This helper is for templates using sip-build.
+#
+
+do_configure() {
+	local _build_help=
+	local _qmake=
+	local _confirm_license=
+	local _apidir=
+	local _dbusdir=
+	: "${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
+	*--qmake*)
+		if [ "$QMAKE" ]; then
+			_qmake="$QMAKE"
+		elif [ -x /usr/lib/qt6/bin/qmake ]; then
+			_qmake=/usr/lib/qt6/bin/qmake
+		elif [ -x /usr/lib/qt5/bin/qmake ]; then
+			_qmake=/usr/lib/qt5/bin/qmake
+		else
+			msg_error 'qmake not found\n'
+		fi
+		;;
+	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
+
+	sip-build --no-make \
+		${_confirm_license:+--confirm-license} \
+		${_apidir:+--api-dir "$_apidir"} \
+		${_qmake:+--qmake "$_qmake"} \
+		${_dbusdir:+--dbus "$_dbusdir"} \
+		--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 1ee5149f638fd1c3eacf4dac37af1a1cbd426614 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 4/4] New package: python3-PyQt6-6.1.0

---
 srcpkgs/python3-PyQt6/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-PyQt6/template

diff --git a/srcpkgs/python3-PyQt6/template b/srcpkgs/python3-PyQt6/template
new file mode 100644
index 000000000000..ee0ffc944f59
--- /dev/null
+++ b/srcpkgs/python3-PyQt6/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-PyQt6'
+pkgname=python3-PyQt6
+version=6.1.0
+revision=1
+wrksrc=PyQt6-$version
+build_style=sip-build
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="qt6-base"
+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