[PR PATCH] PyQt 6.6.0

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] PyQt 6.6.0
@ 2023-12-12 16:20 sgn
  2023-12-13  0:51 ` [PR PATCH] [Updated] " sgn
  2023-12-13  4:48 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2023-12-12 16:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages python3-pyqt6-6.6.0
https://github.com/void-linux/void-packages/pull/47716

PyQt 6.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/47716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-pyqt6-6.6.0-47716.patch --]
[-- Type: text/x-diff, Size: 20601 bytes --]

From eee680997a41604fe10704fadc5fbda83024e34c 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, 11 Dec 2023 22:16:49 +0700
Subject: [PATCH 01/10] sip: update to 6.8.0.

---
 srcpkgs/sip/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 17891438c95d6..44b024fc4752c 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,7 +1,7 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.7.9
-revision=2
+version=6.8.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging
  python3-toml python3-ply"
@@ -9,14 +9,10 @@ makedepends="python3-devel"
 depends="python3-setuptools python3-packaging python3-toml python3-ply"
 short_desc="SIP - Python 3 bindings generator for C/C++ libraries"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
-license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=35d51fc10f599d3696abb50f29d068ad04763df7b77808c76b74597660f99b17
+checksum=2ed1904820cb661b7207eb1dccfaebec1a5463dcad903ba448ad1945502d089c
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
-
-post_install() {
-	vlicense LICENSE
-}

From 9242cd4806a0432161f0eb39f88b1a05251c6b42 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, 11 Dec 2023 22:16:57 +0700
Subject: [PATCH 02/10] python3-pyqt6-sip: update to 13.6.0.

---
 srcpkgs/python3-pyqt6-sip/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-pyqt6-sip/template b/srcpkgs/python3-pyqt6-sip/template
index 49d4efa6d50ca..aebae2602c77b 100644
--- a/srcpkgs/python3-pyqt6-sip/template
+++ b/srcpkgs/python3-pyqt6-sip/template
@@ -1,24 +1,20 @@
 # Template file for 'python3-pyqt6-sip'
 pkgname=python3-pyqt6-sip
-version=13.5.2
-revision=2
+version=13.6.0
+revision=1
 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"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/sip/"
 distfiles="${PYPI_SITE}/P/PyQt6_sip/PyQt6_sip-${version}.tar.gz"
-checksum=ebf6264b6feda01ba37d3b60a4bb87493bdb87be70f7b2a5384a7acd4902d88d
+checksum=2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778
 lib32disabled=yes
 
 post_extract() {
 	# for do_check
 	mkdir -p PyQt6
 }
-
-post_install() {
-	vlicense /usr/share/licenses/sip/LICENSE
-}

From dda9b2bffadcbe9a07618a2a3000de97c0818c51 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, 11 Dec 2023 22:17:08 +0700
Subject: [PATCH 03/10] python3-PyQt-builder: update to 1.15.4.

---
 srcpkgs/python3-PyQt-builder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index 0c5928c708613..49aeb5eaad9a2 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt-builder'
 pkgname=python3-PyQt-builder
-version=1.15.0
-revision=2
+version=1.15.4
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools sip"
 depends="python3 sip>=6.3"
@@ -10,7 +10,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=a90553703897eb41e27c2f1abd31fb9ed304c32ec3271b380015b54ea9762ddd
+checksum=39f8c75db17d9ce17cb6bbf3df1650b5cebc1ea4e5bd73843d21cc96612b2ae1
 
 post_install() {
 	rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle

From 655e62880404bcd42fd5152fc6b805c4e95168d5 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, 11 Dec 2023 22:25:46 +0700
Subject: [PATCH 04/10] python3-sip-PyQt5: update to 12.13.0.

---
 .../patches/00.python3.12.patch               | 32 -------------------
 .../patches/01.python3.12.patch               | 22 -------------
 srcpkgs/python3-sip-PyQt5/template            | 12 +++----
 3 files changed, 4 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/python3-sip-PyQt5/patches/00.python3.12.patch
 delete mode 100644 srcpkgs/python3-sip-PyQt5/patches/01.python3.12.patch

diff --git a/srcpkgs/python3-sip-PyQt5/patches/00.python3.12.patch b/srcpkgs/python3-sip-PyQt5/patches/00.python3.12.patch
deleted file mode 100644
index f4f48c495b68d..0000000000000
--- a/srcpkgs/python3-sip-PyQt5/patches/00.python3.12.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://src.fedoraproject.org/rpms/python-pyqt5-sip/raw/0a67d370b56645efc3f756d89e5a46f7a5927633
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 1686925181 -3600
-# Node ID 312476401030130daed2eecfd1c93413f49e4458
-# Parent  88452293f4e4cdc9d22cb5dfca02ba83216f662b
-sipMalloc() and sipFree() are now implemented using PyMem_RawMalloc() and
-PyMem_RawFree() so that they should be safe to call from functions registered
-with Py_AtExit().
-
-diff -r 88452293f4e4 -r 312476401030 sipbuild/module/source/12/siplib.c
---- a/siplib.c	Thu Jun 08 14:30:02 2023 +0100
-+++ b/siplib.c	Fri Jun 16 15:19:41 2023 +0100
-@@ -2147,7 +2147,7 @@
- {
-     void *mem;
- 
--    if ((mem = PyMem_Malloc(nbytes)) == NULL)
-+    if ((mem = PyMem_RawMalloc(nbytes)) == NULL)
-         PyErr_NoMemory();
- 
-     return mem;
-@@ -2159,7 +2159,7 @@
-  */
- void sip_api_free(void *mem)
- {
--    PyMem_Free(mem);
-+    PyMem_RawFree(mem);
- }
- 
- 
diff --git a/srcpkgs/python3-sip-PyQt5/patches/01.python3.12.patch b/srcpkgs/python3-sip-PyQt5/patches/01.python3.12.patch
deleted file mode 100644
index 9d774ee610472..0000000000000
--- a/srcpkgs/python3-sip-PyQt5/patches/01.python3.12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://src.fedoraproject.org/rpms/python-pyqt5-sip/raw/5db48dad9dc59835593ff2bfaf06dca2b8a291b6/f/fix-py3.12-subclass-crash.patch
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 1686926134 -3600
-# Node ID d36867e54192b02ebe5743b48774abf75bd9bb57
-# Parent  312476401030130daed2eecfd1c93413f49e4458
-For Python v3.12 implement sipPyTypeDict() using PyType_GetDict().
-
-diff -r 312476401030 -r d36867e54192 sipbuild/siplib.c
---- a/siplib.c	Fri Jun 16 15:19:41 2023 +0100
-+++ b/siplib.c	Fri Jun 16 15:35:34 2023 +0100
-@@ -12597,7 +12597,11 @@
-  */
- static PyObject *sip_api_py_type_dict(const PyTypeObject *py_type)
- {
-+#if PY_VERSION_HEX >= 0x030c0000
-+    return PyType_GetDict(py_type);
-+#else
-     return py_type->tp_dict;
-+#endif
- }
diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template
index 780096cb80309..fe50eabda13f2 100644
--- a/srcpkgs/python3-sip-PyQt5/template
+++ b/srcpkgs/python3-sip-PyQt5/template
@@ -1,24 +1,20 @@
 # Template file for 'python3-sip-PyQt5'
 pkgname=python3-sip-PyQt5
-version=12.12.1
-revision=2
+version=12.13.0
+revision=1
 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="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
-license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/P/PyQt5_sip/PyQt5_sip-${version}.tar.gz"
-checksum=8fdc6e0148abd12d977a1d3828e7b79aae958e83c6cb5adae614916d888a6b10
+checksum=7f321daf84b9c9dbca61b80e1ef37bdaffc0e93312edae2cd7da25b953971d91
 lib32disabled=yes
 
 post_extract() {
 	# for do_check
 	mkdir -p PyQt5
 }
-
-post_install() {
-	vlicense /usr/share/licenses/sip/LICENSE
-}

From d4b77212663a62c75ff2d433ea0a03e741040506 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: Sun, 10 Dec 2023 21:32:15 +0700
Subject: [PATCH 05/10] python3-pyqt6: update to 6.6.1.

---
 srcpkgs/python3-pyqt6-pdf          |  1 +
 srcpkgs/python3-pyqt6-pdf-devel    |  1 +
 srcpkgs/python3-pyqt6-speech       |  1 +
 srcpkgs/python3-pyqt6-speech-devel |  1 +
 srcpkgs/python3-pyqt6/template     | 85 ++++++++++++++++++++++++++++--
 5 files changed, 85 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/python3-pyqt6-pdf
 create mode 120000 srcpkgs/python3-pyqt6-pdf-devel
 create mode 120000 srcpkgs/python3-pyqt6-speech
 create mode 120000 srcpkgs/python3-pyqt6-speech-devel

diff --git a/srcpkgs/python3-pyqt6-pdf b/srcpkgs/python3-pyqt6-pdf
new file mode 120000
index 0000000000000..dd603d682349f
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-pdf
@@ -0,0 +1 @@
+python3-pyqt6
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt6-pdf-devel b/srcpkgs/python3-pyqt6-pdf-devel
new file mode 120000
index 0000000000000..dd603d682349f
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-pdf-devel
@@ -0,0 +1 @@
+python3-pyqt6
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt6-speech b/srcpkgs/python3-pyqt6-speech
new file mode 120000
index 0000000000000..dd603d682349f
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-speech
@@ -0,0 +1 @@
+python3-pyqt6
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt6-speech-devel b/srcpkgs/python3-pyqt6-speech-devel
new file mode 120000
index 0000000000000..dd603d682349f
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-speech-devel
@@ -0,0 +1 @@
+python3-pyqt6
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt6/template b/srcpkgs/python3-pyqt6/template
index e2ed1540681f9..e0c1827a00653 100644
--- a/srcpkgs/python3-pyqt6/template
+++ b/srcpkgs/python3-pyqt6/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6'
 pkgname=python3-pyqt6
-version=6.5.2
-revision=2
+version=6.6.1
+revision=1
 build_style=sip-build
 build_helper=qemu
 configure_args="--confirm-license --dbus $XBPS_CROSS_BASE/usr/include/dbus-1.0"
@@ -9,7 +9,7 @@ hostmakedepends="qt6-base python3-dbus python3-PyQt-builder pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-tools-devel
  qt6-webchannel-devel qt6-multimedia-devel qt6-location-devel
  qt6-remoteobjects-devel qt6-sensors-devel qt6-serialport-devel
- qt6-connectivity-devel qt6-websockets-devel
+ qt6-connectivity-devel qt6-websockets-devel qt6-speech-devel
  qt6-quick3d-devel qt6-shadertools-devel qt6-svg-devel python3-dbus-devel"
 depends="python3-pyqt6-sip"
 short_desc="Python 3 bindings for Qt6"
@@ -17,9 +17,44 @@ 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=1487ee7350f9ffb66d60ab4176519252c2b371762cbe8f8340fd951f63801280
+checksum=9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379
 lib32disabled=yes
 
+subpackages="python3-pyqt6-core-devel
+ python3-pyqt6-devel python3-pyqt6-devel-tools
+ python3-pyqt6-connectivity python3-pyqt6-connectivity-devel
+ python3-pyqt6-dbus python3-pyqt6-dbus-devel
+ python3-pyqt6-declarative python3-pyqt6-declarative-devel
+ python3-pyqt6-gui python3-pyqt6-gui-devel
+ python3-pyqt6-multimedia python3-pyqt6-multimedia-devel
+ python3-pyqt6-network python3-pyqt6-network-devel
+ python3-pyqt6-opengl-widgets python3-pyqt6-opengl-widgets-devel
+ python3-pyqt6-position python3-pyqt6-position-devel
+ python3-pyqt6-printsupport python3-pyqt6-printsupport-devel
+ python3-pyqt6-quick3d python3-pyqt6-quick3d-devel
+ python3-pyqt6-remoteobjects python3-pyqt6-remoteobjects-devel
+ python3-pyqt6-sensors python3-pyqt6-sensors-devel
+ python3-pyqt6-serialport python3-pyqt6-serialport-devel
+ python3-pyqt6-speech python3-pyqt6-speech-devel
+ python3-pyqt6-sql python3-pyqt6-sql-devel
+ python3-pyqt6-svg python3-pyqt6-svg-devel
+ python3-pyqt6-test python3-pyqt6-test-devel
+ python3-pyqt6-tools python3-pyqt6-tools-devel
+ python3-pyqt6-websockets python3-pyqt6-websockets-devel
+ python3-pyqt6-webchannel python3-pyqt6-webchannel-devel
+ python3-pyqt6-widgets python3-pyqt6-widgets-devel
+ python3-pyqt6-xml python3-pyqt6-xml-devel
+ "
+
+case "$XBPS_TARGET_MACHINE" in
+	riscv64*) ;;
+	ppc*) ;;
+	armv5* | armv6*) ;;
+	*)
+		makedepends+=" qt6-pdf-devel"
+		subpackages+=" python3-pyqt6-pdf python3-pyqt6-pdf-devel"
+		;;
+esac
 # Split like qt6, but keep qt6-core in main pkg
 
 python3-pyqt6-core-devel_package() {
@@ -496,3 +531,45 @@ python3-pyqt6-connectivity-devel_package() {
 		vmove "${py3_sitelib}/PyQt6/bindings/QtNfc"
 	}
 }
+
+python3-pyqt6-pdf_package() {
+	lib32disabled=yes
+	short_desc+=" - Pdf"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "${py3_sitelib}/PyQt6/QtPdf.*"
+		vmove "${py3_sitelib}/PyQt6/QtPdfWidgets.*"
+	}
+}
+
+python3-pyqt6-pdf-devel_package() {
+	lib32disabled=yes
+	short_desc+=" - Pdf - development files"
+	depends="python3-pyqt6-pdf>=${version}_${revision}
+	 python3-pyqt6-core-devel>=${version}_${revision}
+	 qt6-pdf-devel"
+	pkg_install() {
+		vmove "${py3_sitelib}/PyQt6/bindings/QtPdf"
+		vmove "${py3_sitelib}/PyQt6/bindings/QtPdfWidgets"
+	}
+}
+
+python3-pyqt6-speech_package() {
+	lib32disabled=yes
+	short_desc+=" - Speech"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "${py3_sitelib}/PyQt6/QtTextToSpeech.*"
+	}
+}
+
+python3-pyqt6-speech-devel_package() {
+	lib32disabled=yes
+	short_desc+=" - Speech - development files"
+	depends="python3-pyqt6-speech>=${version}_${revision}
+	 python3-pyqt6-core-devel>=${version}_${revision}
+	 qt6-speech-devel"
+	pkg_install() {
+		vmove "${py3_sitelib}/PyQt6/bindings/QtTextToSpeech"
+	}
+}

From 7c3e46c3d01a1ccfa035c5a53733c53a7ef0ccda 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, 11 Dec 2023 22:36:35 +0700
Subject: [PATCH 06/10] python3-pyqt6-3d: update to 6.6.0.

---
 srcpkgs/python3-pyqt6-3d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyqt6-3d/template b/srcpkgs/python3-pyqt6-3d/template
index ed9b1f51da1e4..3f300752789df 100644
--- a/srcpkgs/python3-pyqt6-3d/template
+++ b/srcpkgs/python3-pyqt6-3d/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-3d'
 pkgname=python3-pyqt6-3d
-version=6.5.0
-revision=2
+version=6.6.0
+revision=1
 build_style=sip-build
 build_helper="python3"
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqt3d/"
 distfiles="$PYPI_SITE/P/PyQt6-3D/PyQt6_3D-${version}.tar.gz"
-checksum=f8ef3e2965a518367eb4cc693fd9f23698fcbeb909c7dcb7269737b8d877f68b
+checksum=372b206eb8185f2b6ff048629d3296cb137c9e5901b113119ffa46a317726988
 lib32disabled=yes
 
 python3-pyqt6-3d-devel_package() {

From d32f5b9d3e01e3f73ad068d50649392e1bf0d483 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, 11 Dec 2023 22:36:37 +0700
Subject: [PATCH 07/10] python3-pyqt6-charts: update to 6.6.0.

---
 srcpkgs/python3-pyqt6-charts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyqt6-charts/template b/srcpkgs/python3-pyqt6-charts/template
index 6ccd01ed49f73..813b781638466 100644
--- a/srcpkgs/python3-pyqt6-charts/template
+++ b/srcpkgs/python3-pyqt6-charts/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-charts'
 pkgname=python3-pyqt6-charts
-version=6.5.0
-revision=2
+version=6.6.0
+revision=1
 build_style=sip-build
 build_helper="python3"
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqtchart/"
 distfiles="$PYPI_SITE/P/PyQt6-Charts/PyQt6_Charts-${version}.tar.gz"
-checksum=6ff00f65b2517f99bf106ddd28c76f3ca344f91ecf5ba68191e20a2d90024962
+checksum=14cc6e5d19cae80129524a42fa6332d0d5dada4282a9423425e6b9ae1b6bc56d
 lib32disabled=yes
 
 python3-pyqt6-charts-devel_package() {

From 63e3953f3f3f72d29809d35c792cc7787d9385f2 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, 11 Dec 2023 22:36:41 +0700
Subject: [PATCH 08/10] python3-pyqt6-networkauth: update to 6.6.0.

---
 srcpkgs/python3-pyqt6-networkauth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyqt6-networkauth/template b/srcpkgs/python3-pyqt6-networkauth/template
index 3d6c4958ac46b..2823d496a98b9 100644
--- a/srcpkgs/python3-pyqt6-networkauth/template
+++ b/srcpkgs/python3-pyqt6-networkauth/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-networkauth'
 pkgname=python3-pyqt6-networkauth
-version=6.5.0
-revision=2
+version=6.6.0
+revision=1
 build_style=sip-build
 build_helper="python3"
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
@@ -12,7 +12,7 @@ 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/PyQt6-NetworkAuth/PyQt6_NetworkAuth-${version}.tar.gz"
-checksum=7170db3f99e13aef855d9d52a00a8baa2dea92d12f9b441fed9c6dec57f83e09
+checksum=cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb
 lib32disabled=yes
 
 python3-pyqt6-networkauth-devel_package() {

From 850babb191fc4820d5f48d6bf54ffcdeca137fbf 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, 11 Dec 2023 22:36:46 +0700
Subject: [PATCH 09/10] python3-pyqt6-webengine: update to 6.6.0.

---
 srcpkgs/python3-pyqt6-webengine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyqt6-webengine/template b/srcpkgs/python3-pyqt6-webengine/template
index 53c6ce63dfc8b..fb248e8471008 100644
--- a/srcpkgs/python3-pyqt6-webengine/template
+++ b/srcpkgs/python3-pyqt6-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-webengine'
 pkgname=python3-pyqt6-webengine
-version=6.5.0
-revision=2
+version=6.6.0
+revision=1
 build_style=sip-build
 build_helper=python3
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
@@ -15,7 +15,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/"
 distfiles="$PYPI_SITE/P/PyQt6_WebEngine/PyQt6_WebEngine-$version.tar.gz"
-checksum=8ba9db56c4c181a2a2fab1673ca35e5b63dc69113f085027ddc43c710b6d6ee9
+checksum=d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487
 lib32disabled=yes
 
 python3-pyqt6-webengine-devel_package() {

From 81d1633b4044aa81c0919a0ad923cec9bd2e115f 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, 12 Dec 2023 13:48:00 +0700
Subject: [PATCH 10/10] qutebrowser: depends on PyQt6-PDF

---
 srcpkgs/qutebrowser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 2f803f428a90b..a4a64d164b010 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,7 +1,7 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
 version=3.1.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-Jinja2 python3-yaml"
@@ -34,7 +34,7 @@ elif [ "$XBPS_WORDSIZE" != 32 ]; then
 fi
 
 if [ "$build_option_qt6" ]; then
-	depends+=" python3-pyqt6-declarative python3-pyqt6-gui
+	depends+=" python3-pyqt6-declarative python3-pyqt6-gui python3-pyqt6-pdf
 	 python3-pyqt6-sql python3-pyqt6-webengine python3-pyqt6-webchannel
 	 python3-pyqt6-widgets python3-pyqt6-network python3-pyqt6-dbus
 	 python3-pyqt6-printsupport qt6-plugin-sqlite"

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] PyQt 6.6.0
  2023-12-12 16:20 [PR PATCH] PyQt 6.6.0 sgn
@ 2023-12-13  0:51 ` sgn
  2023-12-13  4:48 ` [PR PATCH] [Merged]: " sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2023-12-13  0:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages python3-pyqt6-6.6.0
https://github.com/void-linux/void-packages/pull/47716

PyQt 6.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/47716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-pyqt6-6.6.0-47716.patch --]
[-- Type: text/x-diff, Size: 21057 bytes --]

From eee680997a41604fe10704fadc5fbda83024e34c 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, 11 Dec 2023 22:16:49 +0700
Subject: [PATCH 01/10] sip: update to 6.8.0.

---
 srcpkgs/sip/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 17891438c95d6..44b024fc4752c 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,7 +1,7 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.7.9
-revision=2
+version=6.8.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging
  python3-toml python3-ply"
@@ -9,14 +9,10 @@ makedepends="python3-devel"
 depends="python3-setuptools python3-packaging python3-toml python3-ply"
 short_desc="SIP - Python 3 bindings generator for C/C++ libraries"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
-license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=35d51fc10f599d3696abb50f29d068ad04763df7b77808c76b74597660f99b17
+checksum=2ed1904820cb661b7207eb1dccfaebec1a5463dcad903ba448ad1945502d089c
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
-
-post_install() {
-	vlicense LICENSE
-}

From 9242cd4806a0432161f0eb39f88b1a05251c6b42 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, 11 Dec 2023 22:16:57 +0700
Subject: [PATCH 02/10] python3-pyqt6-sip: update to 13.6.0.

---
 srcpkgs/python3-pyqt6-sip/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-pyqt6-sip/template b/srcpkgs/python3-pyqt6-sip/template
index 49d4efa6d50ca..aebae2602c77b 100644
--- a/srcpkgs/python3-pyqt6-sip/template
+++ b/srcpkgs/python3-pyqt6-sip/template
@@ -1,24 +1,20 @@
 # Template file for 'python3-pyqt6-sip'
 pkgname=python3-pyqt6-sip
-version=13.5.2
-revision=2
+version=13.6.0
+revision=1
 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"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/sip/"
 distfiles="${PYPI_SITE}/P/PyQt6_sip/PyQt6_sip-${version}.tar.gz"
-checksum=ebf6264b6feda01ba37d3b60a4bb87493bdb87be70f7b2a5384a7acd4902d88d
+checksum=2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778
 lib32disabled=yes
 
 post_extract() {
 	# for do_check
 	mkdir -p PyQt6
 }
-
-post_install() {
-	vlicense /usr/share/licenses/sip/LICENSE
-}

From dda9b2bffadcbe9a07618a2a3000de97c0818c51 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, 11 Dec 2023 22:17:08 +0700
Subject: [PATCH 03/10] python3-PyQt-builder: update to 1.15.4.

---
 srcpkgs/python3-PyQt-builder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index 0c5928c708613..49aeb5eaad9a2 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt-builder'
 pkgname=python3-PyQt-builder
-version=1.15.0
-revision=2
+version=1.15.4
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools sip"
 depends="python3 sip>=6.3"
@@ -10,7 +10,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=a90553703897eb41e27c2f1abd31fb9ed304c32ec3271b380015b54ea9762ddd
+checksum=39f8c75db17d9ce17cb6bbf3df1650b5cebc1ea4e5bd73843d21cc96612b2ae1
 
 post_install() {
 	rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle

From 655e62880404bcd42fd5152fc6b805c4e95168d5 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, 11 Dec 2023 22:25:46 +0700
Subject: [PATCH 04/10] python3-sip-PyQt5: update to 12.13.0.

---
 .../patches/00.python3.12.patch               | 32 -------------------
 .../patches/01.python3.12.patch               | 22 -------------
 srcpkgs/python3-sip-PyQt5/template            | 12 +++----
 3 files changed, 4 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/python3-sip-PyQt5/patches/00.python3.12.patch
 delete mode 100644 srcpkgs/python3-sip-PyQt5/patches/01.python3.12.patch

diff --git a/srcpkgs/python3-sip-PyQt5/patches/00.python3.12.patch b/srcpkgs/python3-sip-PyQt5/patches/00.python3.12.patch
deleted file mode 100644
index f4f48c495b68d..0000000000000
--- a/srcpkgs/python3-sip-PyQt5/patches/00.python3.12.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://src.fedoraproject.org/rpms/python-pyqt5-sip/raw/0a67d370b56645efc3f756d89e5a46f7a5927633
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 1686925181 -3600
-# Node ID 312476401030130daed2eecfd1c93413f49e4458
-# Parent  88452293f4e4cdc9d22cb5dfca02ba83216f662b
-sipMalloc() and sipFree() are now implemented using PyMem_RawMalloc() and
-PyMem_RawFree() so that they should be safe to call from functions registered
-with Py_AtExit().
-
-diff -r 88452293f4e4 -r 312476401030 sipbuild/module/source/12/siplib.c
---- a/siplib.c	Thu Jun 08 14:30:02 2023 +0100
-+++ b/siplib.c	Fri Jun 16 15:19:41 2023 +0100
-@@ -2147,7 +2147,7 @@
- {
-     void *mem;
- 
--    if ((mem = PyMem_Malloc(nbytes)) == NULL)
-+    if ((mem = PyMem_RawMalloc(nbytes)) == NULL)
-         PyErr_NoMemory();
- 
-     return mem;
-@@ -2159,7 +2159,7 @@
-  */
- void sip_api_free(void *mem)
- {
--    PyMem_Free(mem);
-+    PyMem_RawFree(mem);
- }
- 
- 
diff --git a/srcpkgs/python3-sip-PyQt5/patches/01.python3.12.patch b/srcpkgs/python3-sip-PyQt5/patches/01.python3.12.patch
deleted file mode 100644
index 9d774ee610472..0000000000000
--- a/srcpkgs/python3-sip-PyQt5/patches/01.python3.12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://src.fedoraproject.org/rpms/python-pyqt5-sip/raw/5db48dad9dc59835593ff2bfaf06dca2b8a291b6/f/fix-py3.12-subclass-crash.patch
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 1686926134 -3600
-# Node ID d36867e54192b02ebe5743b48774abf75bd9bb57
-# Parent  312476401030130daed2eecfd1c93413f49e4458
-For Python v3.12 implement sipPyTypeDict() using PyType_GetDict().
-
-diff -r 312476401030 -r d36867e54192 sipbuild/siplib.c
---- a/siplib.c	Fri Jun 16 15:19:41 2023 +0100
-+++ b/siplib.c	Fri Jun 16 15:35:34 2023 +0100
-@@ -12597,7 +12597,11 @@
-  */
- static PyObject *sip_api_py_type_dict(const PyTypeObject *py_type)
- {
-+#if PY_VERSION_HEX >= 0x030c0000
-+    return PyType_GetDict(py_type);
-+#else
-     return py_type->tp_dict;
-+#endif
- }
diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template
index 780096cb80309..fe50eabda13f2 100644
--- a/srcpkgs/python3-sip-PyQt5/template
+++ b/srcpkgs/python3-sip-PyQt5/template
@@ -1,24 +1,20 @@
 # Template file for 'python3-sip-PyQt5'
 pkgname=python3-sip-PyQt5
-version=12.12.1
-revision=2
+version=12.13.0
+revision=1
 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="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
-license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
+license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/P/PyQt5_sip/PyQt5_sip-${version}.tar.gz"
-checksum=8fdc6e0148abd12d977a1d3828e7b79aae958e83c6cb5adae614916d888a6b10
+checksum=7f321daf84b9c9dbca61b80e1ef37bdaffc0e93312edae2cd7da25b953971d91
 lib32disabled=yes
 
 post_extract() {
 	# for do_check
 	mkdir -p PyQt5
 }
-
-post_install() {
-	vlicense /usr/share/licenses/sip/LICENSE
-}

From d4b77212663a62c75ff2d433ea0a03e741040506 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: Sun, 10 Dec 2023 21:32:15 +0700
Subject: [PATCH 05/10] python3-pyqt6: update to 6.6.1.

---
 srcpkgs/python3-pyqt6-pdf          |  1 +
 srcpkgs/python3-pyqt6-pdf-devel    |  1 +
 srcpkgs/python3-pyqt6-speech       |  1 +
 srcpkgs/python3-pyqt6-speech-devel |  1 +
 srcpkgs/python3-pyqt6/template     | 85 ++++++++++++++++++++++++++++--
 5 files changed, 85 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/python3-pyqt6-pdf
 create mode 120000 srcpkgs/python3-pyqt6-pdf-devel
 create mode 120000 srcpkgs/python3-pyqt6-speech
 create mode 120000 srcpkgs/python3-pyqt6-speech-devel

diff --git a/srcpkgs/python3-pyqt6-pdf b/srcpkgs/python3-pyqt6-pdf
new file mode 120000
index 0000000000000..dd603d682349f
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-pdf
@@ -0,0 +1 @@
+python3-pyqt6
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt6-pdf-devel b/srcpkgs/python3-pyqt6-pdf-devel
new file mode 120000
index 0000000000000..dd603d682349f
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-pdf-devel
@@ -0,0 +1 @@
+python3-pyqt6
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt6-speech b/srcpkgs/python3-pyqt6-speech
new file mode 120000
index 0000000000000..dd603d682349f
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-speech
@@ -0,0 +1 @@
+python3-pyqt6
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt6-speech-devel b/srcpkgs/python3-pyqt6-speech-devel
new file mode 120000
index 0000000000000..dd603d682349f
--- /dev/null
+++ b/srcpkgs/python3-pyqt6-speech-devel
@@ -0,0 +1 @@
+python3-pyqt6
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt6/template b/srcpkgs/python3-pyqt6/template
index e2ed1540681f9..e0c1827a00653 100644
--- a/srcpkgs/python3-pyqt6/template
+++ b/srcpkgs/python3-pyqt6/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6'
 pkgname=python3-pyqt6
-version=6.5.2
-revision=2
+version=6.6.1
+revision=1
 build_style=sip-build
 build_helper=qemu
 configure_args="--confirm-license --dbus $XBPS_CROSS_BASE/usr/include/dbus-1.0"
@@ -9,7 +9,7 @@ hostmakedepends="qt6-base python3-dbus python3-PyQt-builder pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-tools-devel
  qt6-webchannel-devel qt6-multimedia-devel qt6-location-devel
  qt6-remoteobjects-devel qt6-sensors-devel qt6-serialport-devel
- qt6-connectivity-devel qt6-websockets-devel
+ qt6-connectivity-devel qt6-websockets-devel qt6-speech-devel
  qt6-quick3d-devel qt6-shadertools-devel qt6-svg-devel python3-dbus-devel"
 depends="python3-pyqt6-sip"
 short_desc="Python 3 bindings for Qt6"
@@ -17,9 +17,44 @@ 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=1487ee7350f9ffb66d60ab4176519252c2b371762cbe8f8340fd951f63801280
+checksum=9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379
 lib32disabled=yes
 
+subpackages="python3-pyqt6-core-devel
+ python3-pyqt6-devel python3-pyqt6-devel-tools
+ python3-pyqt6-connectivity python3-pyqt6-connectivity-devel
+ python3-pyqt6-dbus python3-pyqt6-dbus-devel
+ python3-pyqt6-declarative python3-pyqt6-declarative-devel
+ python3-pyqt6-gui python3-pyqt6-gui-devel
+ python3-pyqt6-multimedia python3-pyqt6-multimedia-devel
+ python3-pyqt6-network python3-pyqt6-network-devel
+ python3-pyqt6-opengl-widgets python3-pyqt6-opengl-widgets-devel
+ python3-pyqt6-position python3-pyqt6-position-devel
+ python3-pyqt6-printsupport python3-pyqt6-printsupport-devel
+ python3-pyqt6-quick3d python3-pyqt6-quick3d-devel
+ python3-pyqt6-remoteobjects python3-pyqt6-remoteobjects-devel
+ python3-pyqt6-sensors python3-pyqt6-sensors-devel
+ python3-pyqt6-serialport python3-pyqt6-serialport-devel
+ python3-pyqt6-speech python3-pyqt6-speech-devel
+ python3-pyqt6-sql python3-pyqt6-sql-devel
+ python3-pyqt6-svg python3-pyqt6-svg-devel
+ python3-pyqt6-test python3-pyqt6-test-devel
+ python3-pyqt6-tools python3-pyqt6-tools-devel
+ python3-pyqt6-websockets python3-pyqt6-websockets-devel
+ python3-pyqt6-webchannel python3-pyqt6-webchannel-devel
+ python3-pyqt6-widgets python3-pyqt6-widgets-devel
+ python3-pyqt6-xml python3-pyqt6-xml-devel
+ "
+
+case "$XBPS_TARGET_MACHINE" in
+	riscv64*) ;;
+	ppc*) ;;
+	armv5* | armv6*) ;;
+	*)
+		makedepends+=" qt6-pdf-devel"
+		subpackages+=" python3-pyqt6-pdf python3-pyqt6-pdf-devel"
+		;;
+esac
 # Split like qt6, but keep qt6-core in main pkg
 
 python3-pyqt6-core-devel_package() {
@@ -496,3 +531,45 @@ python3-pyqt6-connectivity-devel_package() {
 		vmove "${py3_sitelib}/PyQt6/bindings/QtNfc"
 	}
 }
+
+python3-pyqt6-pdf_package() {
+	lib32disabled=yes
+	short_desc+=" - Pdf"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "${py3_sitelib}/PyQt6/QtPdf.*"
+		vmove "${py3_sitelib}/PyQt6/QtPdfWidgets.*"
+	}
+}
+
+python3-pyqt6-pdf-devel_package() {
+	lib32disabled=yes
+	short_desc+=" - Pdf - development files"
+	depends="python3-pyqt6-pdf>=${version}_${revision}
+	 python3-pyqt6-core-devel>=${version}_${revision}
+	 qt6-pdf-devel"
+	pkg_install() {
+		vmove "${py3_sitelib}/PyQt6/bindings/QtPdf"
+		vmove "${py3_sitelib}/PyQt6/bindings/QtPdfWidgets"
+	}
+}
+
+python3-pyqt6-speech_package() {
+	lib32disabled=yes
+	short_desc+=" - Speech"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "${py3_sitelib}/PyQt6/QtTextToSpeech.*"
+	}
+}
+
+python3-pyqt6-speech-devel_package() {
+	lib32disabled=yes
+	short_desc+=" - Speech - development files"
+	depends="python3-pyqt6-speech>=${version}_${revision}
+	 python3-pyqt6-core-devel>=${version}_${revision}
+	 qt6-speech-devel"
+	pkg_install() {
+		vmove "${py3_sitelib}/PyQt6/bindings/QtTextToSpeech"
+	}
+}

From 7c3e46c3d01a1ccfa035c5a53733c53a7ef0ccda 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, 11 Dec 2023 22:36:35 +0700
Subject: [PATCH 06/10] python3-pyqt6-3d: update to 6.6.0.

---
 srcpkgs/python3-pyqt6-3d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyqt6-3d/template b/srcpkgs/python3-pyqt6-3d/template
index ed9b1f51da1e4..3f300752789df 100644
--- a/srcpkgs/python3-pyqt6-3d/template
+++ b/srcpkgs/python3-pyqt6-3d/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-3d'
 pkgname=python3-pyqt6-3d
-version=6.5.0
-revision=2
+version=6.6.0
+revision=1
 build_style=sip-build
 build_helper="python3"
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqt3d/"
 distfiles="$PYPI_SITE/P/PyQt6-3D/PyQt6_3D-${version}.tar.gz"
-checksum=f8ef3e2965a518367eb4cc693fd9f23698fcbeb909c7dcb7269737b8d877f68b
+checksum=372b206eb8185f2b6ff048629d3296cb137c9e5901b113119ffa46a317726988
 lib32disabled=yes
 
 python3-pyqt6-3d-devel_package() {

From d32f5b9d3e01e3f73ad068d50649392e1bf0d483 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, 11 Dec 2023 22:36:37 +0700
Subject: [PATCH 07/10] python3-pyqt6-charts: update to 6.6.0.

---
 srcpkgs/python3-pyqt6-charts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyqt6-charts/template b/srcpkgs/python3-pyqt6-charts/template
index 6ccd01ed49f73..813b781638466 100644
--- a/srcpkgs/python3-pyqt6-charts/template
+++ b/srcpkgs/python3-pyqt6-charts/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-charts'
 pkgname=python3-pyqt6-charts
-version=6.5.0
-revision=2
+version=6.6.0
+revision=1
 build_style=sip-build
 build_helper="python3"
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqtchart/"
 distfiles="$PYPI_SITE/P/PyQt6-Charts/PyQt6_Charts-${version}.tar.gz"
-checksum=6ff00f65b2517f99bf106ddd28c76f3ca344f91ecf5ba68191e20a2d90024962
+checksum=14cc6e5d19cae80129524a42fa6332d0d5dada4282a9423425e6b9ae1b6bc56d
 lib32disabled=yes
 
 python3-pyqt6-charts-devel_package() {

From 63e3953f3f3f72d29809d35c792cc7787d9385f2 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, 11 Dec 2023 22:36:41 +0700
Subject: [PATCH 08/10] python3-pyqt6-networkauth: update to 6.6.0.

---
 srcpkgs/python3-pyqt6-networkauth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyqt6-networkauth/template b/srcpkgs/python3-pyqt6-networkauth/template
index 3d6c4958ac46b..2823d496a98b9 100644
--- a/srcpkgs/python3-pyqt6-networkauth/template
+++ b/srcpkgs/python3-pyqt6-networkauth/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-networkauth'
 pkgname=python3-pyqt6-networkauth
-version=6.5.0
-revision=2
+version=6.6.0
+revision=1
 build_style=sip-build
 build_helper="python3"
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
@@ -12,7 +12,7 @@ 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/PyQt6-NetworkAuth/PyQt6_NetworkAuth-${version}.tar.gz"
-checksum=7170db3f99e13aef855d9d52a00a8baa2dea92d12f9b441fed9c6dec57f83e09
+checksum=cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb
 lib32disabled=yes
 
 python3-pyqt6-networkauth-devel_package() {

From aa0b4d64d834c9e939320a652b4ba7ba441d76c4 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, 11 Dec 2023 22:36:46 +0700
Subject: [PATCH 09/10] python3-pyqt6-webengine: update to 6.6.0.

---
 srcpkgs/python3-pyqt6-webengine/template | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyqt6-webengine/template b/srcpkgs/python3-pyqt6-webengine/template
index 53c6ce63dfc8b..a98fa997ee5dc 100644
--- a/srcpkgs/python3-pyqt6-webengine/template
+++ b/srcpkgs/python3-pyqt6-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-webengine'
 pkgname=python3-pyqt6-webengine
-version=6.5.0
-revision=2
+version=6.6.0
+revision=1
 build_style=sip-build
 build_helper=python3
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
@@ -15,9 +15,22 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/"
 distfiles="$PYPI_SITE/P/PyQt6_WebEngine/PyQt6_WebEngine-$version.tar.gz"
-checksum=8ba9db56c4c181a2a2fab1673ca35e5b63dc69113f085027ddc43c710b6d6ee9
+checksum=d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487
 lib32disabled=yes
 
+case "$XBPS_TARGET_MACHINE" in
+	riscv64*) broken="Patchset needs updating";;
+	ppc*) broken="not ported" ;;
+	armv5* | armv6*) broken="need yield" ;;
+esac
+
+if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="chromium needs host and target wordsize match"
+fi
+if [ "$XBPS_WORDSIZE" = 32 ]; then
+	broken="32 bit"
+fi
+
 python3-pyqt6-webengine-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"

From f0e76d5bf788e782c7c4744a32e3a005912be3d4 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, 12 Dec 2023 13:48:00 +0700
Subject: [PATCH 10/10] qutebrowser: depends on PyQt6-PDF

---
 srcpkgs/qutebrowser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 2f803f428a90b..a4a64d164b010 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,7 +1,7 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
 version=3.1.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-Jinja2 python3-yaml"
@@ -34,7 +34,7 @@ elif [ "$XBPS_WORDSIZE" != 32 ]; then
 fi
 
 if [ "$build_option_qt6" ]; then
-	depends+=" python3-pyqt6-declarative python3-pyqt6-gui
+	depends+=" python3-pyqt6-declarative python3-pyqt6-gui python3-pyqt6-pdf
 	 python3-pyqt6-sql python3-pyqt6-webengine python3-pyqt6-webchannel
 	 python3-pyqt6-widgets python3-pyqt6-network python3-pyqt6-dbus
 	 python3-pyqt6-printsupport qt6-plugin-sqlite"

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: PyQt 6.6.0
  2023-12-12 16:20 [PR PATCH] PyQt 6.6.0 sgn
  2023-12-13  0:51 ` [PR PATCH] [Updated] " sgn
@ 2023-12-13  4:48 ` sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2023-12-13  4:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]

There's a merged pull request on the void-packages repository

PyQt 6.6.0
https://github.com/void-linux/void-packages/pull/47716

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-12-13  4:48 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-12 16:20 [PR PATCH] PyQt 6.6.0 sgn
2023-12-13  0:51 ` [PR PATCH] [Updated] " sgn
2023-12-13  4:48 ` [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).