Qt6: Update to 6.6.0

Qt 6.6.0 is a feature release with focus on improving UX capabilities including responsive UI technology and the Qt Graph module. The Qt Coap module has been added as net/qt6-coap. [1] PySide6 and PyQt6 have also been updated to 6.6.0. Announcement: https://www.qt.io/blog/qt-6.6-released Rel note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md PR: 275068, 274911 [1] MFH: 2023Q4 Exp-run by: antoine
freebsd · Nov 23, 2023 · 1d76bdf · 1d76bdf
1 parent c9efdf4
commit 1d76bdf
Show file tree

Hide file tree

Showing 920 changed files with 7,528 additions and 3,630 deletions.
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
@@ -89,15 +89,15 @@ SIP_VERSION=		6.7.12	# ,1
 SIP4_VERSION=		4.19.25
 QSCI2_VERSION=		2.14.1
 PYQT5_VERSION=		5.15.10
-PYQT6_VERSION=		6.5.3
-PYQT63D_VERSION=	6.5.0
+PYQT6_VERSION=		6.6.0
+PYQT63D_VERSION=	6.6.0
 PYQT5CHART_VERSION=	5.15.6
-PYQT6CHART_VERSION=	6.5.0
-PYQT6DATAVIS3D_VERSION=	6.5.0
+PYQT6CHART_VERSION=	6.6.0
+PYQT6DATAVIS3D_VERSION=	6.6.0
 PYQT5NETWORKAUTH_VERSION=5.15.5
-PYQT6NETWORKAUTH_VERSION=6.5.0
+PYQT6NETWORKAUTH_VERSION=6.6.0
 PYQT5WEBENGINE_VERSION=	5.15.6
-PYQT6WEBENGINE_VERSION=	6.5.0
+PYQT6WEBENGINE_VERSION=	6.6.0
 PYQT5SIP_VERSION=	12.13.0
 PYQT6SIP_VERSION=	13.6.0
 PYQTBUILDER_VERSION=	1.15.3

diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
@@ -28,7 +28,7 @@ _COMMON_DISTS=		3d base charts connectivity datavis3d declarative imageformats l
 _QT5_DISTS=		gamepad graphicaleffects quickcontrols \
 			quickcontrols2 script webglplugin \
 			x11extras xmlpatterns
-_QT6_DISTS=		5compat doc httpserver languageserver lottie positioning \
+_QT6_DISTS=		5compat coap doc graphs httpserver languageserver lottie positioning \
 			quick3dphysics quickeffectmaker shadertools
 
 _QT_DISTS=		${_COMMON_DISTS} \
@@ -95,11 +95,14 @@ _QT5_DISTNAME_kde=		${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},}
 # Qt6 specific distnames
 _QT6_DISTNAME=			${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},}
 
-# Effective master sites and disfile valus
+# Effective master sites and distfile values
+# net/qt6-coap has no submodule distfile and uses USE_GITHUB
+.  if ${_QT_DIST} != coap
 MASTER_SITES=			${_QT${_QT_VER}_MASTER_SITES${_KDE_${_QT_DIST}:D_kde}}
 MASTER_SITE_SUBDIR=		${_QT${_QT_VER}_MASTER_SITE_SUBDIR${_KDE_${_QT_DIST}:D_kde}}
 DISTNAME=			${_QT${_QT_VER}_DISTNAME${_KDE_${_QT_DIST}:D_kde}}
 DISTFILES=			${DISTNAME:S,$,${EXTRACT_SUFX},}
+.  endif
 DIST_SUBDIR=			KDE/Qt/${_QT_VERSION}
 
 .  if ${_QT_VER:M5}
@@ -299,6 +302,13 @@ QMAKE_ARGS+=		QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
 
 PLIST_SUB+=		SHORTVER=${_QT_VERSION:R} \
 			FULLVER=${_QT_VERSION:C/-.*//}
+.  if defined(WITH_DEBUG)
+PLIST_SUB+=		DEBUG="" \
+			NO_DEBUG="@comment "
+.  else
+PLIST_SUB+=		DEBUG="@comment " \
+			NO_DEBUG=""
+.  endif
 
 # Handle additional PLIST directories, which should only be used for Qt-dist ports.
 .  for dir in ETC

diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
@@ -23,8 +23,8 @@ _QT_MK_INCLUDED=	qt.mk
 # Qt versions currently supported by the framework.
 _QT_SUPPORTED?=		5 6
 QT5_VERSION?=		5.15.11
-QT6_VERSION?=		6.5.3
-PYSIDE6_VERSION?=	6.5.3
+QT6_VERSION?=		6.6.0
+PYSIDE6_VERSION?=	6.6.0
 
 # 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)
@@ -112,6 +112,11 @@ PLIST_SUB+=		QT_${dir}DIR="${QT_${dir}DIR_REL}"
 .    endif
 .  endfor
 
+# Suppress warnings from rcc about not using a UTF-8 locale.
+.  if ${_QT_VER:M6}
+USE_LOCALE?=		C.UTF-8
+.  endif
+
 CONFIGURE_ENV+=		QT_SELECT=${_QT_RELNAME}
 MAKE_ENV+=		QT_SELECT=${_QT_RELNAME}
 
@@ -155,7 +160,7 @@ _USE_QT5_ONLY=		assistant buildtools concurrent core dbus \
 _USE_QT5_ONLY+=		sql-ibase
 .  endif
 
-_USE_QT6_ONLY=		5compat base httpserver languageserver lottie positioning \
+_USE_QT6_ONLY=		5compat base coap graphs httpserver languageserver lottie positioning \
 			quick3dphysics quickeffectmaker shadertools tools translations \
 			sqldriver-sqlite sqldriver-mysql sqldriver-psql sqldriver-odbc
 
@@ -179,6 +184,9 @@ qt-base_LIB=		libQt${_QT_LIBVER}Core.so
 qt-charts_PORT=		x11-toolkits/${_QT_RELNAME}-charts
 qt-charts_LIB=		libQt${_QT_LIBVER}Charts.so
 
+qt-coap_PORT=		net/${_QT_RELNAME}-coap
+qt-coap_LIB=		libQt${_QT_LIBVER}Coap.so
+
 qt-concurrent_PORT=	devel/${_QT_RELNAME}-concurrent
 qt-concurrent_LIB=	libQt${_QT_LIBVER}Concurrent.so
 
@@ -218,6 +226,9 @@ qt-gamepad_LIB=		libQt${_QT_LIBVER}Gamepad.so
 qt-graphicaleffects_PORT=	graphics/${_QT_RELNAME}-graphicaleffects
 qt-graphicaleffects_PATH=	${LOCALBASE}/${QT_QMLDIR_REL}/QtGraphicalEffects/qmldir
 
+qt-graphs_PORT=		x11-toolkits/${_QT_RELNAME}-graphs
+qt-graphs_LIB=		libQt${_QT_LIBVER}Graphs.so
+
 qt-gui_PORT=		x11-toolkits/${_QT_RELNAME}-gui
 qt-gui_LIB=		libQt${_QT_LIBVER}Gui.so
 

diff --git a/accessibility/qt6-speech/Makefile b/accessibility/qt6-speech/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	speech
-PORTVERSION=	${QT6_VERSION}
+DISTVERSION=	${QT6_VERSION}
 CATEGORIES=	accessibility
 PKGNAMEPREFIX=	qt6-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Accessibilty features for Qt6
 
-USES=		cmake gl pkgconfig qt-dist:6
+USES=		cmake compiler:c++17-lang gl pkgconfig qt-dist:6
 USE_GL=		gl opengl
-USE_QT=		base declarative
+USE_QT=		base declarative multimedia
 
 OPTIONS_DEFINE=		ALSA
 OPTIONS_DEFAULT=	SPEECHD
@@ -23,7 +23,6 @@ ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_ALSA
 
 FLITE_LIB_DEPENDS=	libflite.so:audio/flite
-FLITE_USE=		QT=multimedia
 FLITE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Flite
 
 SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher

diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695931458
-SHA256 (KDE/Qt/6.5.3/qtspeech-everywhere-src-6.5.3.tar.xz) = 79c2f42c4d921a7e73825ead5681b5b32eac52f5e180e1899bb86e68206b0b9c
-SIZE (KDE/Qt/6.5.3/qtspeech-everywhere-src-6.5.3.tar.xz) = 250112
+TIMESTAMP = 1697049627
+SHA256 (KDE/Qt/6.6.0/qtspeech-everywhere-src-6.6.0.tar.xz) = 969bdbff826808f0cfd80e8f2e357f00174489f30d9f895390cf59814abe9f9c
+SIZE (KDE/Qt/6.6.0/qtspeech-everywhere-src-6.6.0.tar.xz) = 270044
diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695965470
-SHA256 (KDE/Qt/6.5.3/qtconnectivity-everywhere-src-6.5.3.tar.xz) = 242231b06071eff72c8b2a39e54bf813f7eed3ef53473d2eb711603634be3f5b
-SIZE (KDE/Qt/6.5.3/qtconnectivity-everywhere-src-6.5.3.tar.xz) = 986024
+TIMESTAMP = 1697049631
+SHA256 (KDE/Qt/6.6.0/qtconnectivity-everywhere-src-6.6.0.tar.xz) = 1c29c26247c28ef19b9ca87c38b4d61a1f94ee9021897962e0d5ba215f1c4010
+SIZE (KDE/Qt/6.6.0/qtconnectivity-everywhere-src-6.6.0.tar.xz) = 989076
diff --git a/comms/qt6-sensors/Makefile b/comms/qt6-sensors/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	sensors
-PORTVERSION=	${QT6_VERSION}
+DISTVERSION=	${QT6_VERSION}
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt6-
 
@@ -9,7 +9,7 @@ WWW=		https://qt.io
 
 BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 
-USES=		cmake compiler:c++11-lang pkgconfig qt-dist:6
+USES=		cmake compiler:c++17-lang pkgconfig qt-dist:6
 USE_QT=		base declarative
 
 .include <bsd.port.mk>
diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695931461
-SHA256 (KDE/Qt/6.5.3/qtsensors-everywhere-src-6.5.3.tar.xz) = 19d1a7335a83124df886701ef2da389c3ba8e943ee7262c76c6d9b242e2dc293
-SIZE (KDE/Qt/6.5.3/qtsensors-everywhere-src-6.5.3.tar.xz) = 1484752
+TIMESTAMP = 1697049639
+SHA256 (KDE/Qt/6.6.0/qtsensors-everywhere-src-6.6.0.tar.xz) = 28f0be5d4eac103ba3bb660ea61806d0e193c1fab949d1c95f2cb7cb39d84498
+SIZE (KDE/Qt/6.6.0/qtsensors-everywhere-src-6.6.0.tar.xz) = 1485724
diff --git a/comms/qt6-serialbus/Makefile b/comms/qt6-serialbus/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	serialbus
-PORTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
+DISTVERSION=	${QT6_VERSION}
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt6-
 
@@ -10,7 +9,7 @@ WWW=		https://qt.io
 
 BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 
-USES=		cmake compiler:c++11-lib qt-dist:6
+USES=		cmake compiler:c++17-lang qt-dist:6
 USE_QT=		base serialport
 
 .include <bsd.port.mk>
diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695931463
-SHA256 (KDE/Qt/6.5.3/qtserialbus-everywhere-src-6.5.3.tar.xz) = 216d9599150d77c4717ec017b89b53e8d936c7d101c464d98219dd0f32aad08d
-SIZE (KDE/Qt/6.5.3/qtserialbus-everywhere-src-6.5.3.tar.xz) = 553856
+TIMESTAMP = 1697049641
+SHA256 (KDE/Qt/6.6.0/qtserialbus-everywhere-src-6.6.0.tar.xz) = 18ccf07152ea995c6c1ef3ce9120b6baea7017a09626ec1c5bf4faa6dd29b94c
+SIZE (KDE/Qt/6.6.0/qtserialbus-everywhere-src-6.6.0.tar.xz) = 554416
diff --git a/comms/qt6-serialport/Makefile b/comms/qt6-serialport/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	serialport
-PORTVERSION=	${QT6_VERSION}
+DISTVERSION=	${QT6_VERSION}
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt6-
 
@@ -10,7 +10,7 @@ WWW=		https://qt.io
 BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libudev.so:devel/libudev-devd
 
-USES=		cmake compiler:c++11-lib pkgconfig qt-dist:6
+USES=		cmake compiler:c++17-lang pkgconfig qt-dist:6
 USE_QT=		base
 
 .include <bsd.port.mk>
diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695931465
-SHA256 (KDE/Qt/6.5.3/qtserialport-everywhere-src-6.5.3.tar.xz) = 99cbad398cb1422884f36276d226b54c501df9cb8e70eb0bd887bf6180844eda
-SIZE (KDE/Qt/6.5.3/qtserialport-everywhere-src-6.5.3.tar.xz) = 279224
+TIMESTAMP = 1697049643
+SHA256 (KDE/Qt/6.6.0/qtserialport-everywhere-src-6.6.0.tar.xz) = ecfcbbf1c47a67ff599a409bf7682fed416f797860c01c934f5a78c336da4065
+SIZE (KDE/Qt/6.6.0/qtserialport-everywhere-src-6.6.0.tar.xz) = 279784
diff --git a/databases/qt6-base_sqldriver/Makefile b/databases/qt6-base_sqldriver/Makefile
@@ -15,7 +15,7 @@ FLAVOR?=	sqlite
 
 WRKSRC_SUBDIR=	src/plugins/sqldrivers
 
-USES=		cmake pkgconfig qt-dist:6 \
+USES=		cmake compiler:c++17-lang pkgconfig qt-dist:6 \
 		${${FLAVOR}_USES}
 USE_QT=		base
 

diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695931486
-SHA256 (KDE/Qt/6.5.3/qtbase-everywhere-src-6.5.3.tar.xz) = df2f4a230be4ea04f9798f2c19ab1413a3b8ec6a80bef359f50284235307b546
-SIZE (KDE/Qt/6.5.3/qtbase-everywhere-src-6.5.3.tar.xz) = 47142456
+TIMESTAMP = 1697049668
+SHA256 (KDE/Qt/6.6.0/qtbase-everywhere-src-6.6.0.tar.xz) = 039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e
+SIZE (KDE/Qt/6.6.0/qtbase-everywhere-src-6.6.0.tar.xz) = 48350308
diff --git a/devel/py-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile
@@ -11,29 +11,30 @@ WWW=		https://riverbankcomputing.com/software/pyqt
 
 PYQT_DIST=	yes
 
-LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2-qt6 \
-		libdbus-1.so:devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libqscintilla2_qt6.so:devel/qscintilla2-qt6
 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_PYTHON=	concurrent flavors
-USE_PYQT=	qtbuilder sip pysip
-USE_QT=		5compat base connectivity declarative imageformats \
-		languageserver lottie multimedia positioning quick3d \
-		remoteobjects sensors serialport speech shadertools \
-		svg tools translations webchannel websockets
+USE_PYQT=	pysip qtbuilder sip
+USE_QT=		base connectivity declarative imageformats multimedia \
+		positioning quick3d remoteobjects sensors serialport \
+		shadertools speech svg tools translations webchannel \
+		websockets
 
 PORTSCOUT?=	limit:^${_QT_VERSION:R}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
-PLIST_SUB+=	WEBENGINE=""
 USE_QT+=	webengine
+PLIST_SUB+=	WEBENGINE=""
 .else
+SIP_ARGS+=	--disable QtPdf --disable QtPdfWidgets
 PLIST_SUB+=	WEBENGINE="@comment "
 .endif
 

diff --git a/devel/py-qt6-pyqt/distinfo b/devel/py-qt6-pyqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697481647
-SHA256 (PyQt6-6.5.3.tar.gz) = bcbbf9511b038b4924298ca10999aa36eb37a0a38d0638f895f9bba6025c0a77
-SIZE (PyQt6-6.5.3.tar.gz) = 1039271
+TIMESTAMP = 1698889584
+SHA256 (PyQt6-6.6.0.tar.gz) = d41512d66044c2df9c5f515a56a922170d68a37b3406ffddc8b4adc57181b576
+SIZE (PyQt6-6.6.0.tar.gz) = 1043298
diff --git a/devel/py-qt6-pyqt/pkg-plist b/devel/py-qt6-pyqt/pkg-plist
@@ -191,6 +191,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtimeline.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtimer.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtimezone.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtipccommon.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtranslator.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtransposeproxymodel.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtversion.sip
@@ -365,6 +366,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qaudiosource.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qcamera.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qcameradevice.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qcapturablewindow.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qimagecapture.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qmediacapturesession.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qmediadevices.sip
@@ -379,6 +381,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframe.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframeformat.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideosink.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qwindowcapture.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimediaWidgets/QtMultimediaWidgets.toml
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimediaWidgets/QtMultimediaWidgetsmod.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimediaWidgets/qgraphicsvideoitem.sip
@@ -468,12 +471,14 @@ bin/pyuic6
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocument.sip
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocumentrenderoptions.sip
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflink.sip
+%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflinkmodel.sip
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagenavigator.sip
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagerenderer.sip
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfsearchmodel.sip
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfselection.sip
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgets.toml
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgetsmod.sip
+%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfpageselector.sip
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfview.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/QtPositioning.toml
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/QtPositioningmod.sip

diff --git a/devel/pyside6-tools/Makefile b/devel/pyside6-tools/Makefile
@@ -26,20 +26,22 @@ 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=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION:R}/sources/pyside-tools
 
 PYSIDE_RELNAME=		${PORTNAME}
 PYSIDE_BINDIR_REL?=	bin/${PYSIDE_RELNAME}
 
+post-install:
 # Move scripts into a dedicated directory. They're too generically named, e.g.:
 # deploy.py and project.py. Unversioned copies of Qt tools like lrelease and
 # rcc are also installed which we probably don't want in PATH by default.
 # Install to: ${PREFIX}/bin/pyside6 by default for now until there are
 # consumers of this and a more fitting location is deemed necessary.
-post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/${PYSIDE_RELNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}
 	@${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_RELNAME} ${STAGEDIR}${PREFIX}/bin
+# These directories contain templates that should not be byte-compiled.
+	@${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/deploy_lib/android/recipes ${WRKDIR}
 
 .for d in deploy_lib project qtpy2cpp_lib
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
@@ -50,4 +52,6 @@ post-install:
 		${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/${d}
 .endfor
 
+	@${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 = 1696878310
-SHA256 (pyside-setup-everywhere-src-6.5.3.tar.xz) = 6606b1634fb2981f9ca7ce2e206cc92c252401de328df4ce23f63e8c998de8d3
-SIZE (pyside-setup-everywhere-src-6.5.3.tar.xz) = 13577208
+TIMESTAMP = 1697908000
+SHA256 (pyside-setup-everywhere-src-6.6.0.tar.xz) = 2dd002db8851a87173354f38aa8c6ec42d0ff1fac99ea422b29e2dfce52d1638
+SIZE (pyside-setup-everywhere-src-6.6.0.tar.xz) = 14054860
diff --git a/devel/pyside6-tools/pkg-plist b/devel/pyside6-tools/pkg-plist
@@ -24,11 +24,7 @@
 %%PYSIDE_BINDIR_REL%%/deploy_lib/android/android_helper.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/android/buildozer.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/PySide6/__init__.tmpl.py
-%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/PySide6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/PySide6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/shiboken6/__init__.tmpl.py
-%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/shiboken6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/shiboken6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/commands.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/config.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/default.spec

diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile
@@ -18,15 +18,15 @@ USES=		cmake gl llvm:lib python qt:6 tar:xz
 USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
-USE_QT=		3d base charts connectivity datavis3d declarative doc httpserver \
-		imageformats location multimedia networkauth positioning \
-		quick3d quicktimeline remoteobjects scxml sensors serialbus \
-		serialport shadertools speech svg tools translations wayland \
-		webchannel websockets
+USE_QT=		3d base charts connectivity datavis3d declarative doc graphs \
+		httpserver imageformats location multimedia networkauth \
+		positioning quick3d quicktimeline remoteobjects scxml sensors \
+		serialbus serialport shadertools speech svg tools translations \
+		wayland webchannel websockets
 
 CMAKE_ARGS=	-DPYTHON_EXECUTABLE=${PYTHON_CMD}
 
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside6
+WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION:R}/sources/pyside6
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .include <bsd.port.pre.mk>