Qt6: Update to 6.7.0

Qt 6.7 is out with lots of large and small improvements for all of us who like to have fun when building modern applications and user experiences, focusing on the expansion of supported platforms and industry standards. This makes code written with Qt more sustainable and brings more value in Qt as a long-term investment. www/qt6-webengine is now based on Chromium version 118.0.5993.220. Announcement: https://www.qt.io/blog/qt-6.7-released Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md PySide6: Update to 6.7.0 PySide6 and its related components have been updated alongside the Qt release for compatibility. Older versions will not build with Qt 6.7.x. Announcement: https://www.qt.io/blog/qt-for-python-release-6.7 PyQt6: Update to 6.7.0 Minor Makefile cleanups and simplification of MASTER_SITES in pyqt.mk. As with PySide6, older versions of PyQt6 will not build with Qt 6.7.x. Announcement: https://www.riverbankcomputing.com/news/PyQt_v6.7.0_Released PR: 278658 Exp-run by: antoine MFH: 2024Q2 Security: e79cc4e2-12d7-11ef-83d8-4ccc6adda413, c6f03ea6-12de-11ef-83d8-4ccc6adda413
freebsd · May 15, 2024 · bef8e40 · bef8e40
1 parent e40c4fb
commit bef8e40
Show file tree

Hide file tree

Showing 823 changed files with 16,192 additions and 3,789 deletions.
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
@@ -50,28 +50,35 @@ _PYQT_VERSION=	0
 PYQT_MAINTAINER=	kde@FreeBSD.org
 
 MASTER_SITE_RIVERBANK=	https://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
+MASTER_SITE_RBDEV=	https://www.riverbankcomputing.com/pypi/packages/%SUBDIR%/
 
-MASTER_SITES_SIP=	https://pypi.python.org/packages/source/s/sip/
-MASTER_SITES_PYQT5=	https://pypi.python.org/packages/source/P/PyQt5/
-MASTER_SITES_PYQT6=	https://pypi.python.org/packages/source/P/PyQt6/
+MASTER_SITES_SIP=	PYPI/source/s/sip
+MASTER_SITES_PYQT5=	PYPI/source/P/PyQt5
+MASTER_SITES_PYQT6=	PYPI/source/P/PyQt6 \
+			RBDEV/PyQt6
 MASTER_SITES_PYQT=	${MASTER_SITES_PYQT${_PYQT_VERSION}}
-MASTER_SITES_PYQT5SIP=	https://pypi.python.org/packages/source/P/PyQt5-sip/
-MASTER_SITES_PYQT6SIP=	https://pypi.python.org/packages/source/P/PyQt6-sip/
+MASTER_SITES_PYQT5SIP=	PYPI/source/P/PyQt5-sip
+MASTER_SITES_PYQT6SIP=	PYPI/source/P/PyQt6-sip
 MASTER_SITES_PYQTSIP=	${MASTER_SITES_PYQT${_PYQT_VERSION}SIP}
-MASTER_SITES_PYQT63D=	https://pypi.python.org/packages/source/P/PyQt6-3D/
+MASTER_SITES_PYQT63D=	PYPI/source/P/PyQt6-3D \
+			RBDEV/PyQt6-3D
 MASTER_SITES_PYQT3D=	${MASTER_SITES_PYQT${_PYQT_VERSION}3D}
-MASTER_SITES_PYQT5CHART=	https://pypi.python.org/packages/source/P/PyQtChart/
-MASTER_SITES_PYQT6CHART=	https://pypi.python.org/packages/source/P/PyQt6-Charts/
+MASTER_SITES_PYQT5CHART=	PYPI/source/P/PyQtChart
+MASTER_SITES_PYQT6CHART=	PYPI/source/P/PyQt6-Charts \
+				RBDEV/PyQt6-Charts
 MASTER_SITES_PYQTCHART=		${MASTER_SITES_PYQT${_PYQT_VERSION}CHART}
-MASTER_SITES_PYQT6DATAVIS3D=	https://pypi.python.org/packages/source/P/PyQt6-DataVisualization/
+MASTER_SITES_PYQT6DATAVIS3D=	PYPI/source/P/PyQt6-DataVisualization \
+				RBDEV/PyQt6-DataVisualization
 MASTER_SITES_PYQTDATAVIS3D=	${MASTER_SITES_PYQT${_PYQT_VERSION}DATAVIS3D}
-MASTER_SITES_PYQT5NETWORKAUTH=	https://pypi.python.org/packages/source/P/PyQtNetworkAuth/
-MASTER_SITES_PYQT6NETWORKAUTH=	https://pypi.python.org/packages/source/P/PyQt6-NetworkAuth/
-MASTER_SITES_PYQTNETWORKAUTH=		${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}
-MASTER_SITES_PYQTBUILDER=	https://pypi.io/packages/source/P/PyQt-builder/
-MASTER_SITES_PYQT5WEBENGINE=	https://pypi.python.org/packages/source/P/PyQtWebEngine/
-MASTER_SITES_PYQT6WEBENGINE=	https://pypi.python.org/packages/source/P/PyQt6-WebEngine/
-MASTER_SITES_PYQTWEBENGINE=		${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
+MASTER_SITES_PYQT5NETWORKAUTH=	PYPI/source/P/PyQtNetworkAuth
+MASTER_SITES_PYQT6NETWORKAUTH=	PYPI/source/P/PyQt6-NetworkAuth \
+				RBDEV/PyQt6-NetworkAuth
+MASTER_SITES_PYQTNETWORKAUTH=	${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}
+MASTER_SITES_PYQTBUILDER=	PYPI/source/P/PyQt-builder
+MASTER_SITES_PYQT5WEBENGINE=	PYPI/source/P/PyQtWebEngine
+MASTER_SITES_PYQT6WEBENGINE=	PYPI/source/P/PyQt6-WebEngine \
+				RBDEV/PyQt6-WebEngine
+MASTER_SITES_PYQTWEBENGINE=	${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
 #https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.12.0/QScintilla_src-2.12.0.tar.gz
 MASTER_SITES_QSCI2=	RIVERBANK/QScintilla/${PORTVERSION} \
 			SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
@@ -89,17 +96,19 @@ SIP_VERSION=		6.8.3	# ,1
 SIP4_VERSION=		4.19.25
 QSCI2_VERSION=		2.14.1
 PYQT5_VERSION=		5.15.10
-PYQT6_VERSION=		6.6.1
-PYQT63D_VERSION=	6.6.0
+PYQT6_VERSION=		6.7.0
+PYQT63D_VERSION=	6.7.0
 PYQT5CHART_VERSION=	5.15.6
-PYQT6CHART_VERSION=	6.6.0
-PYQT6DATAVIS3D_VERSION=	6.6.0
+PYQT6CHART_VERSION=	6.7.0
+PYQT6DATAVIS3D_VERSION=	6.7.0
 PYQT5NETWORKAUTH_VERSION=5.15.5
-PYQT6NETWORKAUTH_VERSION=6.6.0
+PYQT6NETWORKAUTH_VERSION=6.7.0
 PYQT5WEBENGINE_VERSION=	5.15.6
-PYQT6WEBENGINE_VERSION=	6.6.0
+PYQT6WEBENGINE_VERSION=	6.7.0
 PYQT5SIP_VERSION=	12.13.0
 PYQT6SIP_VERSION=	13.6.0
+# PyQt-builder >= 1.16.0 requires setuptools >= 64
+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270358
 PYQTBUILDER_VERSION=	1.15.4
 
 SIP4_DISTNAME=		sip-${SIP4_VERSION}
@@ -160,10 +169,9 @@ py-webengine_PATH=		${PYQT_PY_RELNAME}-webengine>=${PYQTWEBENGINE_VERSION}
 
 # PORT
 py-sip_PORT=			devel/py-sip
-py-qtbuilder_PORT=		devel/py-qtbuilder
 py-pysip_PORT=			devel/${PYQT_RELNAME}-sip
 py-qscintilla2_PORT=		devel/${PYQT_RELNAME}-qscintilla2
-py-positioning_PORT=		devel/${PYQT_RELNAME}-positioning
+py-qtbuilder_PORT=		devel/py-qtbuilder
 py-pyqt5_PORT=			devel/${PYQT_RELNAME}-pyqt
 py-pyqt6_PORT=			devel/${PYQT_RELNAME}-pyqt
 py-3d_PORT=			graphics/${PYQT_RELNAME}-3d

diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
@@ -83,8 +83,8 @@ _QT5_MASTER_SITES=		${MASTER_SITE_QT}
 _QT5_MASTER_SITE_SUBDIR=	official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
 # Qt6 specific master sites
 _QT6_MASTER_SITES=		${MASTER_SITE_QT}
-_QT6_MASTER_SITE_SUBDIR=	official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules \
-				official_releases/additional_libraries/${_QT_VERSION:R}/${_QT_VERSION}/
+_QT6_MASTER_SITE_SUBDIR=	${_QT6_RELEASE_TYPE}_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules
+
 # Qt5 specific distnames
 .  if ${_QT_DIST} == webengine
 _QT5_DISTNAME=			${_QT_DIST:S,^,qt,:S,$,-everywhere-opensource-src-${DISTVERSION},}

diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
@@ -23,8 +23,17 @@ _QT_MK_INCLUDED=	qt.mk
 # Qt versions currently supported by the framework.
 _QT_SUPPORTED?=		5 6
 QT5_VERSION?=		5.15.13
-QT6_VERSION?=		6.6.3
-PYSIDE6_VERSION?=	6.6.2
+QT6_VERSION?=		6.7.0
+PYSIDE6_VERSION?=	6.7.0
+
+# Support for intermediate Qt6 releases. This partially defines
+# _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk,
+# but misc/qt6-examples needs this too.
+.  if ${QT6_VERSION:M*beta*} || ${QT6_VERSION:M*rc*}
+_QT6_RELEASE_TYPE=		development
+.  else
+_QT6_RELEASE_TYPE=		official
+.  endif
 
 # We accept the Qt version to be passed by either or all of the three mk files.
 .  if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)

diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660905
-SHA256 (KDE/Qt/6.6.3/qtspeech-everywhere-src-6.6.3.tar.xz) = e628f746efb17155f89c72a34f62b0c69c21b8d8d14c7ff493933fb87ec903fa
-SIZE (KDE/Qt/6.6.3/qtspeech-everywhere-src-6.6.3.tar.xz) = 261976
+TIMESTAMP = 1712112642
+SHA256 (KDE/Qt/6.7.0/qtspeech-everywhere-src-6.7.0.tar.xz) = 44768eba837d48c2233ef12aab562acf2d3c531b489f4ec70124e2bb313d1f11
+SIZE (KDE/Qt/6.7.0/qtspeech-everywhere-src-6.7.0.tar.xz) = 261732
diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660910
-SHA256 (KDE/Qt/6.6.3/qtconnectivity-everywhere-src-6.6.3.tar.xz) = 091aba91a0ab4081bad880b1adfd97d38b7a6ba87ba1cce3e63e20651a71d518
-SIZE (KDE/Qt/6.6.3/qtconnectivity-everywhere-src-6.6.3.tar.xz) = 1060952
+TIMESTAMP = 1712112647
+SHA256 (KDE/Qt/6.7.0/qtconnectivity-everywhere-src-6.7.0.tar.xz) = 07afd6aac19ff73c8ba1471057f43d4ef2737d6a8a772393ec907988dd71244c
+SIZE (KDE/Qt/6.7.0/qtconnectivity-everywhere-src-6.7.0.tar.xz) = 1060904
diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660915
-SHA256 (KDE/Qt/6.6.3/qtsensors-everywhere-src-6.6.3.tar.xz) = b235af8042250a4212a6df400c4b7899fc2905897126bc9388f2a6122a1d3765
-SIZE (KDE/Qt/6.6.3/qtsensors-everywhere-src-6.6.3.tar.xz) = 1494016
+TIMESTAMP = 1712112654
+SHA256 (KDE/Qt/6.7.0/qtsensors-everywhere-src-6.7.0.tar.xz) = 1c3015200a30a64f760818e40794df719e068fc25179e96e88993dff38f7bcab
+SIZE (KDE/Qt/6.7.0/qtsensors-everywhere-src-6.7.0.tar.xz) = 1494212
diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660918
-SHA256 (KDE/Qt/6.6.3/qtserialbus-everywhere-src-6.6.3.tar.xz) = 143e5afcb81a2e2a92d5c0f16679295349d0b8e1ee398230a391ca5be00ad0fb
-SIZE (KDE/Qt/6.6.3/qtserialbus-everywhere-src-6.6.3.tar.xz) = 545820
+TIMESTAMP = 1712112659
+SHA256 (KDE/Qt/6.7.0/qtserialbus-everywhere-src-6.7.0.tar.xz) = 498193a9860664f8a55f676656c45af179ac13d48184af43fc58ddf795bb76dd
+SIZE (KDE/Qt/6.7.0/qtserialbus-everywhere-src-6.7.0.tar.xz) = 546788
diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660920
-SHA256 (KDE/Qt/6.6.3/qtserialport-everywhere-src-6.6.3.tar.xz) = e1656579e555da61cb81cbbb5ee6d31835cea110b3a5dd9e14b16fa71e55dc37
-SIZE (KDE/Qt/6.6.3/qtserialport-everywhere-src-6.6.3.tar.xz) = 270704
+TIMESTAMP = 1712112663
+SHA256 (KDE/Qt/6.7.0/qtserialport-everywhere-src-6.7.0.tar.xz) = b1f02a3d8c9cc8ba2ffa7cca3749f1f147d327e8dfc633fd4ec3cb770d7981c9
+SIZE (KDE/Qt/6.7.0/qtserialport-everywhere-src-6.7.0.tar.xz) = 270604
diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660995
-SHA256 (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462
-SIZE (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 48784716
+TIMESTAMP = 1712112752
+SHA256 (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254
+SIZE (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 49314276
diff --git a/devel/py-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	pyqt
-PORTVERSION=	${PYQT_VERSION}
+DISTVERSION=	${PYQT_VERSION}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQT_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Python bindings for the Qt6 toolkit, QtCore module
+COMMENT=	Python bindings for the Qt6 toolkit
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 PYQT_DIST=	yes
@@ -17,8 +17,7 @@ BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
 
 USES=		gl pkgconfig python pyqt:6 qt:6
-USE_GL+=	gl opengl
-USE_LOCALE=	C.UTF-8
+USE_GL=		opengl
 USE_PYTHON=	concurrent flavors
 USE_PYQT=	pysip qtbuilder sip
 USE_QT=		base connectivity declarative imageformats multimedia \

diff --git a/devel/py-qt6-pyqt/distinfo b/devel/py-qt6-pyqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701802289
-SHA256 (PyQt6-6.6.1.tar.gz) = 9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379
-SIZE (PyQt6-6.6.1.tar.gz) = 1043203
+TIMESTAMP = 1714270793
+SHA256 (PyQt6-6.7.0.tar.gz) = 3d31b2c59dc378ee26e16586d9469842483588142fc377280aad22aaf2fa6235
+SIZE (PyQt6-6.7.0.tar.gz) = 1050408
diff --git a/devel/py-qt6-pyqt/pkg-descr b/devel/py-qt6-pyqt/pkg-descr
@@ -1,2 +1,8 @@
-PyQt6 is a set of Python bindings for Qt6 application framework.
-This package provides the QtCore module.
+PyQt6 is a comprehensive set of Python bindings for Qt6. It is
+implemented as more than 35 extension modules and enables Python
+to be used as an alternative application development language to
+C++ on all supported platforms.
+
+PyQt6 may also be embedded in C++ based applications to allow users
+of those applications to configure or enhance the functionality of
+those applications.
diff --git a/devel/py-qt6-pyqt/pkg-plist b/devel/py-qt6-pyqt/pkg-plist
@@ -154,6 +154,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qlist.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qmap.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qset.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_std_optional.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_std_pair.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_virtual_error_handler.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qrandom.sip
@@ -195,6 +196,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtranslator.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtransposeproxymodel.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtversion.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtyperevision.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtypes.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qurl.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qurlquery.sip
@@ -205,6 +207,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qwaitcondition.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qwineventnotifier.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qxmlstream.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qyieldcpu.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtDBus/QtDBus.toml
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtDBus/QtDBusmod.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtDBus/qdbusabstractadaptor.sip
@@ -378,6 +381,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qpymultimedia_qlist.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qscreencapture.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qsoundeffect.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qtvideo.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframe.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframeformat.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideosink.sip
@@ -397,6 +401,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhstspolicy.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttp1configuration.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttp2configuration.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttpheaders.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttpmultipart.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qlocalserver.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qlocalsocket.sip
@@ -563,6 +568,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgrendernode.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgsimplerectnode.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgsimpletexturenode.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtextnode.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtexture.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtexture_platform.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtexturematerial.sip
@@ -634,6 +640,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/QtSvgmod.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/qsvggenerator.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/qsvgrenderer.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/qtsvgglobal.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvgWidgets/QtSvgWidgets.toml
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvgWidgets/QtSvgWidgetsmod.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvgWidgets/qgraphicssvgitem.sip
@@ -878,6 +885,8 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qscintilla%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtcharts%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtcharts%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtopenglwidgets%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtopenglwidgets%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtprintsupport%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtprintsupport%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtquickwidgets%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -887,6 +896,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qaxcontainer.py
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qscintilla.py
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtcharts.py
+%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtopenglwidgets.py
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtprintsupport.py
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtquickwidgets.py
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtwebenginewidgets.py

diff --git a/devel/pyside6-tools/Makefile b/devel/pyside6-tools/Makefile
@@ -18,15 +18,15 @@ LIB_DEPENDS=	libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR}
 		libxkbcommon.so:x11/libxkbcommon \
 		libzstd.so:archivers/zstd
 
-USES=		cmake gl llvm:lib python qt:6 shebangfix tar:xz
-USE_GL=		gl
+USES=		cmake gl llvm:lib,noexport python qt:6 shebangfix tar:xz
+USE_GL=		opengl
 USE_PYTHON=	flavors
 USE_QT=		base declarative languageserver tools
 
 SHEBANG_FILES=	pyside_tool.py qtpy2cpp_lib/tests/baseline/basic_test.py
 
 PLIST_SUB=	PYSIDE_BINDIR_REL=${PYSIDE_BINDIR_REL}
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside-tools
+WRKSRC_SUBDIR=	sources/pyside-tools
 
 PYSIDE_RELNAME=		${PORTNAME}
 PYSIDE_BINDIR_REL?=	bin/${PYSIDE_RELNAME}
@@ -41,6 +41,7 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}
 	@${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_RELNAME} ${STAGEDIR}${PREFIX}/bin
 # These directories contain templates that should not be byte-compiled.
+# Temporarily relocate them to avoid errors.
 	@${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/deploy_lib/android/recipes ${WRKDIR}
 
 .for d in deploy_lib project qtpy2cpp_lib
@@ -52,6 +53,8 @@ post-install:
 		${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/${d}
 .endfor
 
+# Move the aforementioned templates back into STAGEDIR after the byte-compiling
+# operation has finished.
 	@${MV} ${WRKDIR}/recipes ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/deploy_lib/android
 
 .include <bsd.port.mk>
diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708228813
-SHA256 (pyside-setup-everywhere-src-6.6.2.tar.xz) = 14620b694d7af4c978443016292d3d2108ba5dc105f4170e3b71eadcaf04c9f0
-SIZE (pyside-setup-everywhere-src-6.6.2.tar.xz) = 13975896
+TIMESTAMP = 1714321552
+SHA256 (pyside-setup-everywhere-src-6.7.0.tar.xz) = 82eae370737df5ecf539c165d09d7c81d5fc6153a541b8d3d37b11275f9e3e8f
+SIZE (pyside-setup-everywhere-src-6.7.0.tar.xz) = 14382456
diff --git a/devel/pyside6-tools/pkg-plist b/devel/pyside6-tools/pkg-plist
@@ -8,6 +8,8 @@
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/commands%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/dependency_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/dependency_util%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/nuitka_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -31,6 +33,7 @@
 %%PYSIDE_BINDIR_REL%%/deploy_lib/commands.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/config.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/default.spec
+%%PYSIDE_BINDIR_REL%%/deploy_lib/dependency_util.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/deploy_util.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/nuitka_helper.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/pyside_icon.icns

diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile
@@ -5,28 +5,33 @@ MASTER_SITES=	QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}-
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyside-setup-everywhere-src-${DISTVERSION}
 
+PATCH_SITES=	https://github.com/qtproject/pyside-pyside-setup/commit/
+PATCHFILES+=	3b2ad15ec75b082699dbde6c695c19b467eb0008.patch:-p1 # Adapt to revert of QAudio->QtAudio namespace renaming
+
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python Qt bindings for Qt 6
 WWW=		https://wiki.qt.io/Qt_for_Python
 
 LICENSE=	LGPL3
 
+BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 LIB_DEPENDS=	libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR} \
 		libxkbcommon.so:x11/libxkbcommon
 
-USES=		cmake gl llvm:lib python qt:6 tar:xz
-USE_GL=		gl
+USES=		cmake gl llvm:lib,noexport python qt:6 tar:xz
+USE_GL=		opengl
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
 USE_QT=		3d base charts connectivity datavis3d declarative doc graphs \
 		httpserver imageformats location multimedia networkauth pdf \
 		positioning quick3d quicktimeline remoteobjects scxml sensors \
 		serialbus serialport shadertools speech svg tools translations \
-		wayland webchannel websockets
+		webchannel websockets
 
-CMAKE_ARGS=	-DPYTHON_EXECUTABLE=${PYTHON_CMD}
+CONFIGURE_ENV=	LLVM_INSTALL_DIR="${LLVM_PREFIX}/lib/cmake/llvm"
 
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside6
+PATCH_WRKSRC=	${WRKSRC:H:H}
+WRKSRC_SUBDIR=	sources/pyside6
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .include <bsd.port.pre.mk>

diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1708228795
-SHA256 (pyside-setup-everywhere-src-6.6.2.tar.xz) = 14620b694d7af4c978443016292d3d2108ba5dc105f4170e3b71eadcaf04c9f0
-SIZE (pyside-setup-everywhere-src-6.6.2.tar.xz) = 13975896
+TIMESTAMP = 1714344956
+SHA256 (pyside-setup-everywhere-src-6.7.0.tar.xz) = 82eae370737df5ecf539c165d09d7c81d5fc6153a541b8d3d37b11275f9e3e8f
+SIZE (pyside-setup-everywhere-src-6.7.0.tar.xz) = 14382456
+SHA256 (3b2ad15ec75b082699dbde6c695c19b467eb0008.patch) = 9fe5ce2d8e8fa1d90069dc9c9ccf86ef40e2fbf393c348822eea9afe697b2ec6
+SIZE (3b2ad15ec75b082699dbde6c695c19b467eb0008.patch) = 10764
diff --git a/...es/patch-cmake_Macros_PySideModules.cmake → ..._pyside6_cmake_Macros_PySideModules.cmake b/...es/patch-cmake_Macros_PySideModules.cmake → ..._pyside6_cmake_Macros_PySideModules.cmake
@@ -1,5 +1,5 @@
---- cmake/Macros/PySideModules.cmake.orig	2023-11-27 12:04:49 UTC
-+++ cmake/Macros/PySideModules.cmake
+--- sources/pyside6/cmake/Macros/PySideModules.cmake.orig	2023-11-27 12:04:49 UTC
++++ sources/pyside6/cmake/Macros/PySideModules.cmake
 @@ -107,7 +107,7 @@ macro(create_pyside_module)
      get_target_property(qt_core_includes Qt${QT_MAJOR_VERSION}::Core
                          INTERFACE_INCLUDE_DIRECTORIES)