void-linux · sgn · Oct 30, 2024 · Oct 30, 2024 · Oct 30, 2024 · Oct 30, 2024
diff --git a/srcpkgs/python3-pyqt6-3d/template b/srcpkgs/python3-pyqt6-3d/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pyqt6-3d'
 pkgname=python3-pyqt6-3d
-version=6.7.0
-revision=2
+version=6.8.0
+revision=1
 build_style=sip-build
 build_helper="python3"
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
-makedepends="python3-pyqt6-bindings qt6-3d-devel"
-depends="python3-pyqt6"
+makedepends="python3-pyqt6-bindings qt6-3d-private-devel python3-pyqt6-sip"
+depends="python3-pyqt6>=${version%.*} python3-pyqt6-sip"
 short_desc="Qt6 bindings for 3D - Python 3"
 maintainer="Đoàn Trần Công Danh <[email protected]>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqt3d/"
 distfiles="$PYPI_SITE/P/PyQt6-3D/PyQt6_3D-${version}.tar.gz"
-checksum=3e99bfc801918ab4758dd2660b2d2358e0057c943eb2bd9f8d0ddf156ea5ccd7
+checksum=f62790a787cfc99fcd84c774fa952b83c877dd2175355a3a6609d37fe1a1c7a3
 lib32disabled=yes
 
 python3-pyqt6-3d-devel_package() {

diff --git a/srcpkgs/python3-pyqt6-charts/template b/srcpkgs/python3-pyqt6-charts/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pyqt6-charts'
 pkgname=python3-pyqt6-charts
-version=6.7.0
-revision=2
+version=6.8.0
+revision=1
 build_style=sip-build
 build_helper="python3"
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
-makedepends="qt6-charts-devel python3-pyqt6-bindings"
-depends="python3-pyqt6"
+makedepends="qt6-charts-private-devel python3-pyqt6-bindings python3-pyqt6-sip"
+depends="python3-pyqt6>=${version%.*} python3-pyqt6-sip"
 short_desc="Qt6 bindings for Charts - Python 3"
 maintainer="Đoàn Trần Công Danh <[email protected]>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqtchart/"
 distfiles="$PYPI_SITE/P/PyQt6-Charts/PyQt6_Charts-${version}.tar.gz"
-checksum=c4f7cf369928f7bf032e4e33f718d3b8fe66da176d4959fe30735a970d86f35c
+checksum=f86705b8740e3041667ce211aeaa205b750eb6baf4c908f4e3f6dc8c720d10f1
 lib32disabled=yes
 
 python3-pyqt6-charts-devel_package() {

diff --git a/srcpkgs/python3-pyqt6-networkauth/template b/srcpkgs/python3-pyqt6-networkauth/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pyqt6-networkauth'
 pkgname=python3-pyqt6-networkauth
-version=6.7.0
-revision=2
+version=6.8.0
+revision=1
 build_style=sip-build
 build_helper="python3"
 hostmakedepends="qt6-base python3-PyQt-builder pkg-config"
-makedepends="python3-pyqt6-bindings qt6-networkauth-devel"
-depends="python3-pyqt6"
+makedepends="python3-pyqt6-bindings qt6-networkauth-devel python3-pyqt6-sip"
+depends="python3-pyqt6>=${version%.*} python3-pyqt6-sip"
 short_desc="Qt6 bindings for NetworkAuth - Python 3"
 maintainer="Đoàn Trần Công Danh <[email protected]>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
 distfiles="$PYPI_SITE/P/PyQt6-NetworkAuth/PyQt6_NetworkAuth-${version}.tar.gz"
-checksum=974983525437633a0f016c0ffa0dc311847089f253dfe6840b0ec8ce21dc8685
+checksum=2a1043ff6d03fc19e7bc87fad4f32d4d7e56d2bf1bb89b2a43287c0161457d59
 lib32disabled=yes
 
 python3-pyqt6-networkauth-devel_package() {

diff --git a/srcpkgs/python3-pyqt6-sip/template b/srcpkgs/python3-pyqt6-sip/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6-sip'
 pkgname=python3-pyqt6-sip
-version=13.8.0
-revision=2
+version=13.9.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools sip"
 makedepends="python3-devel"
@@ -10,8 +10,8 @@ short_desc="PyQt6 SIP bindings with C and C++ for Python 3"
 maintainer="Đoàn Trần Công Danh <[email protected]>"
 license="BSD-2-Clause"
 homepage="https://www.riverbankcomputing.com/software/sip/"
-distfiles="${PYPI_SITE}/P/PyQt6_sip/PyQt6_sip-${version}.tar.gz"
-checksum=2f74cf3d6d9cab5152bd9f49d570b2dfb87553ebb5c4919abfde27f5b9fd69d4
+distfiles="${PYPI_SITE}/p/pyqt6_sip/pyqt6_sip-${version}.tar.gz"
+checksum=15be741d1ae8c82bb7afe9a61f3cf8c50457f7d61229a1c39c24cd6e8f4d86dc
 lib32disabled=yes
 
 post_extract() {

diff --git a/srcpkgs/python3-pyqt6-webengine/patches/qvariant.patch b/srcpkgs/python3-pyqt6-webengine/patches/qvariant.patch
@@ -0,0 +1,10 @@
+--- a/sip/QtWebEngineCore/qwebengineframe.sip
++++ b/sip/QtWebEngineCore/qwebengineframe.sip
+@@ -25,6 +25,7 @@
+ class QWebEngineFrame /NoDefaultCtors/
+ {
+ %TypeHeaderCode
++#include <QVariant>
+ #include <qwebengineframe.h>
+ %End
+
diff --git 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.7.0
-revision=2
+version=6.8.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 <[email protected]>"
 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=68edc7adb6d9e275f5de956881e79cca0d71fad439abeaa10d823bff5ac55001
+checksum=64045ea622b6a41882c2b18f55ae9714b8660acff06a54e910eb72822c2f3ff2
 lib32disabled=yes
 
 case "$XBPS_TARGET_MACHINE" in

diff --git a/srcpkgs/python3-pyqt6/template b/srcpkgs/python3-pyqt6/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqt6'
 pkgname=python3-pyqt6
-version=6.7.1
-revision=2
+version=6.8.0
+revision=1
 build_style=sip-build
 build_helper=qemu
 configure_args="--confirm-license --dbus $XBPS_CROSS_BASE/usr/include/dbus-1.0
@@ -11,15 +11,15 @@ makedepends="qt6-base-private-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-speech-devel
- dbus-devel
+ dbus-devel python3-pyqt6-sip
  qt6-quick3d-devel qt6-shadertools-devel qt6-svg-devel python3-dbus-devel"
-depends="python3-pyqt6-sip"
+depends="python3-pyqt6-sip>=13.9.0"
 short_desc="Python 3 bindings for Qt6"
 maintainer="Đoàn Trần Công Danh <[email protected]>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqt/"
 distfiles="$PYPI_SITE/P/PyQt6/PyQt6-$version.tar.gz"
-checksum=3672a82ccd3a62e99ab200a13903421e2928e399fda25ced98d140313ad59cb9
+checksum=6d8628de4c2a050f0b74462e4c9cb97f839bf6ffabbca91711722ffb281570d9
 lib32disabled=yes
 
 subpackages="python3-pyqt6-bindings

diff --git a/srcpkgs/qt6-3d-private-devel b/srcpkgs/qt6-3d-private-devel
@@ -0,0 +1 @@
+qt6-3d
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.7.2
+version=6.8.0
 revision=1
 build_style=cmake
 hostmakedepends="perl qt6-declarative-host-tools"
@@ -11,7 +11,20 @@ maintainer="John <[email protected]>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz"
-checksum=8bc087d904973133186e58471845c5df376bbfdcfcf079fda287e1cda27c8adf
+checksum=3a11919e15437c351b742dbf4e0115ce51aa969cba844dd6388aae14810c7b7d
+
+subpackages="qt6-3d-private-devel qt6-3d-devel"
+
+qt6-3d-private-devel_package() {
+	depends="qt6-3d-devel>=${version}_${revision}"
+	short_desc+=" - private development files"
+	pkg_install() {
+		vmove "usr/lib/qt6/mkspecs/modules/*_private.pri"
+		for dir in $(cd ${DESTDIR} && find usr/include -type d -name private); do
+			vmove "$dir"
+		done
+	}
+}
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

diff --git a/srcpkgs/qt6-base/patches/CVE-2024-39936-qtbase-6.7.patch b/srcpkgs/qt6-base/patches/CVE-2024-39936-qtbase-6.7.patch
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
@@ -2,8 +2,8 @@
 #
 # On update rebuild all pkg with qt6-base-private-devel
 pkgname=qt6-base
-version=6.7.2
-revision=2
+version=6.8.0
+revision=1
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_ARCHDATADIR=lib${XBPS_TARGET_WORDSIZE}/qt6
@@ -35,7 +35,7 @@
 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=c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599
+checksum=1bad481710aa27f872de6c9f72651f89a6107f0077003d0ebfcc9fd15cba3c75
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
@@ -120,7 +120,7 @@
 	HostArchData=lib/qt6
 	Data=share/qt6
 	HostData=share/qt6
 	Sysroot=
 	SysrootifyPrefix=false
 	TargetSpec=linux-g++
 	HostSpec=linux-g++

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.7.2
-revision=2
+version=6.8.0
+revision=1
 build_style=cmake
 hostmakedepends="perl qt6-declarative-host-tools"
 makedepends="qt6-declarative-private-devel qt6-base-private-devel"
@@ -10,7 +10,7 @@ maintainer="John <[email protected]>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
-checksum=00f6a437458b7f2c4e81d748dbe2a077567a9e6ad8d8e3820b36c39dc5279bda
+checksum=1923daac0d1a69b03a4cb119b147c2e3f5080f642af365098fd8771a465b132f
 
 subpackages="qt6-charts-private-devel qt6-charts-devel"
 

diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-connectivity'
 pkgname=qt6-connectivity
-version=6.7.2
+version=6.8.0
 revision=1
 build_style=cmake
 configure_args="-DQT_FEATURE_pcsclite=ON"
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <[email protected]>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtconnectivity-everywhere-src-${version}.tar.xz"
-checksum=8ed321b242f0e956473a295fa31670271f9b3acb797508644cb740f89f6c08e8
+checksum=bbbefb6cc07507fcc961362b3380553eba6400aa15480600126793ba3dc21788
 
 do_check() {
 	ctest -E tst_qlowenergycontroller

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
@@ -2,7 +2,7 @@
 #
 # On update, rebuild pkgs with qt6-declarative-private-devel
 pkgname=qt6-declarative
-version=6.7.2
+version=6.8.0
 revision=1
 build_style=cmake
 configure_args="-DQT_BUILD_TESTS=ON"
@@ -14,7 +14,7 @@ maintainer="John <[email protected]>"
 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/qtdeclarative-everywhere-src-${version}.tar.xz"
-checksum=4c29cba1af8c42d425d8eb6e01bad24cb80f4b983d71eef566a0542dfdb9b999
+checksum=3b41a36b42e919a3aa0da1f71107591504200f41707bee2ad8e8d4f99b5644c2
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then