git: 8adbabc798f5 - main - Qt6: Update to 6.6.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 01 Dec 2023 18:18:05 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8adbabc798f51c5d8bc6433d30b7c6c5c5c96eba
commit 8adbabc798f51c5d8bc6433d30b7c6c5c5c96eba
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-12-01 00:18:14 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-12-01 18:16:47 +0000
Qt6: Update to 6.6.1
As a patch release, Qt 6.6.1 does not introduce any new features but
contains more than 400 bug fixes, security updates, and other
improvements to the top of the Qt 6.6.0 release. See more information
about the most important changes and bug fixes from the Qt 6.6.1 release
note.
To allow building www/qt6-webengine without CUPS, a CUPS option has been
added and the Pdf module has been split out to a new port: print/qt6-pdf.
This also allows building devel/py-qt6-pyqt without pulling in the unused
WebEngine module. Fixes [1].
Remove a lot of unused dependencies. Fixes [2]. Also remove inconsistent
WWW lines from the individual Makefiles as WWW is alreay defined in
Mk/Uses/qt-dist.mk. [3]
Announcement: https://www.qt.io/blog/qt-6.6.1-released
Rel note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
PR: 271111 [1], 268692 [2]
Reported by: echoxxzz <echoxxzz@gmail.com> [1],
Matthieu Volat <mazhe@alkumuna.eu> [2],
lwhsu (via #freebsd-desktop IRC) [3]
MFH: 2023Q4
Security: 6d9c6aae-5eb1-11ee-8290-a8a1599412c6,
07ee8c14-68f1-11ee-8290-a8a1599412c6,
a1e27775-7a61-11ee-8290-a8a1599412c6,
0da4db89-84bf-11ee-8290-a8a1599412c6
---
Mk/Uses/qt.mk | 7 +-
accessibility/qt6-speech/Makefile | 2 +-
accessibility/qt6-speech/distinfo | 6 +-
comms/qt6-connectivity/distinfo | 6 +-
comms/qt6-sensors/Makefile | 1 -
comms/qt6-sensors/distinfo | 6 +-
comms/qt6-serialbus/Makefile | 1 -
comms/qt6-serialbus/distinfo | 6 +-
comms/qt6-serialport/Makefile | 1 -
comms/qt6-serialport/distinfo | 6 +-
databases/qt6-base_sqldriver/Makefile | 1 -
databases/qt6-base_sqldriver/distinfo | 6 +-
devel/py-qt6-pyqt/Makefile | 15 +--
devel/py-qt6-pyqt/pkg-plist | 34 ++---
devel/pyside6/Makefile | 3 +-
devel/pyside6/pkg-plist | 16 +--
devel/qt6-5compat/Makefile | 12 +-
devel/qt6-5compat/distinfo | 6 +-
devel/qt6-base/Makefile | 20 +--
devel/qt6-base/distinfo | 6 +-
.../files/patch-cmake_QtFlagHandlingHelpers.cmake | 4 +-
.../patch-src_gui_platform_unix_qxkbcommon.cpp | 13 --
...ns_tls_openssl_qsslsocket__openssl__symbols.cpp | 34 +++--
...atch-src_plugins_tls_openssl_qx509__openssl.cpp | 2 +-
devel/qt6-base/pkg-plist | 11 +-
devel/qt6-languageserver/Makefile | 1 -
devel/qt6-languageserver/distinfo | 6 +-
devel/qt6-location/Makefile | 3 +-
devel/qt6-location/distinfo | 6 +-
devel/qt6-positioning/Makefile | 5 +-
devel/qt6-positioning/distinfo | 6 +-
devel/qt6-remoteobjects/Makefile | 3 +-
devel/qt6-remoteobjects/distinfo | 6 +-
devel/qt6-scxml/Makefile | 3 +-
devel/qt6-scxml/distinfo | 6 +-
devel/qt6-tools/Makefile | 18 +--
devel/qt6-tools/distinfo | 6 +-
devel/qt6-tools/pkg-plist | 5 +
devel/qt6-translations/Makefile | 1 -
devel/qt6-translations/distinfo | 6 +-
graphics/qt6-3d/Makefile | 20 +--
graphics/qt6-3d/distinfo | 6 +-
graphics/qt6-imageformats/Makefile | 24 +---
graphics/qt6-imageformats/distinfo | 6 +-
graphics/qt6-lottie/Makefile | 7 +-
graphics/qt6-lottie/distinfo | 6 +-
graphics/qt6-quickeffectmaker/Makefile | 3 +-
graphics/qt6-quickeffectmaker/distinfo | 6 +-
graphics/qt6-svg/Makefile | 21 +---
graphics/qt6-svg/distinfo | 6 +-
.../qt6-svg/files/patch-src_svg_qsvghandler.cpp | 11 --
graphics/qt6-wayland/Makefile | 26 +---
graphics/qt6-wayland/distinfo | 6 +-
graphics/qt6-wayland/pkg-plist | 1 +
misc/qt6-doc/Makefile | 4 +-
misc/qt6-doc/distinfo | 6 +-
misc/qt6-examples/Makefile | 1 +
misc/qt6-examples/distinfo | 6 +-
misc/qt6-examples/pkg-plist | 112 +++++------------
multimedia/qt6-multimedia/Makefile | 3 +-
multimedia/qt6-multimedia/distinfo | 6 +-
multimedia/qt6-multimedia/pkg-plist | 2 +
net/qt6-coap/distinfo | 6 +-
net/qt6-networkauth/Makefile | 9 +-
net/qt6-networkauth/distinfo | 6 +-
print/Makefile | 1 +
print/qt6-pdf/Makefile | 13 ++
print/qt6-pdf/pkg-descr | 2 +
print/qt6-pdf/pkg-plist | 137 +++++++++++++++++++++
science/qt6-quick3dphysics/Makefile | 1 -
science/qt6-quick3dphysics/distinfo | 6 +-
www/py-qt6-webengine/Makefile | 5 +-
www/py-qt6-webengine/files/patch-pyproject.toml | 15 +++
www/qt6-httpserver/Makefile | 1 -
www/qt6-httpserver/distinfo | 6 +-
www/qt6-webchannel/Makefile | 6 +-
www/qt6-webchannel/distinfo | 6 +-
www/qt6-webengine/Makefile | 94 +++++++++-----
www/qt6-webengine/distinfo | 6 +-
.../files/patch-cmake_Functions.cmake | 22 ++--
www/qt6-webengine/files/patch-configure.cmake | 12 +-
www/qt6-webengine/files/patch-security-rollup | 103 ++++++++++++++++
...y_chromium_base_containers_checked__iterators.h | 12 +-
...rty_chromium_build_toolchain_gcc__toolchain.gni | 4 +-
...owser_zygote__host_zygote__host__impl__linux.cc | 20 +--
...mium_sandbox_policy_freebsd_sandbox__freebsd.cc | 74 ++++++-----
.../files/patch-src_core_api_configure.cmake | 12 +-
www/qt6-webengine/pkg-plist | 130 -------------------
www/qt6-websockets/Makefile | 1 -
www/qt6-websockets/distinfo | 6 +-
www/qt6-webview/Makefile | 2 +-
www/qt6-webview/distinfo | 6 +-
x11-toolkits/qt6-charts/Makefile | 3 +-
x11-toolkits/qt6-charts/distinfo | 6 +-
x11-toolkits/qt6-datavis3d/Makefile | 3 +-
x11-toolkits/qt6-datavis3d/distinfo | 6 +-
x11-toolkits/qt6-declarative/Makefile | 23 +---
x11-toolkits/qt6-declarative/distinfo | 8 +-
x11-toolkits/qt6-declarative/pkg-plist | 1 +
x11-toolkits/qt6-graphs/Makefile | 3 +-
x11-toolkits/qt6-graphs/distinfo | 6 +-
x11-toolkits/qt6-graphs/pkg-plist | 2 +
x11-toolkits/qt6-quick3d/Makefile | 20 +--
x11-toolkits/qt6-quick3d/distinfo | 6 +-
x11-toolkits/qt6-quicktimeline/Makefile | 20 +--
x11-toolkits/qt6-quicktimeline/distinfo | 6 +-
x11-toolkits/qt6-shadertools/Makefile | 18 +--
x11-toolkits/qt6-shadertools/distinfo | 6 +-
x11-toolkits/qt6-virtualkeyboard/Makefile | 6 +-
x11-toolkits/qt6-virtualkeyboard/distinfo | 6 +-
110 files changed, 697 insertions(+), 771 deletions(-)
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 67b419b47cf5..3bb305129a39 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -23,7 +23,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5 6
QT5_VERSION?= 5.15.11
-QT6_VERSION?= 6.6.0
+QT6_VERSION?= 6.6.1
PYSIDE6_VERSION?= 6.6.0
# We accept the Qt version to be passed by either or all of the three mk files.
@@ -160,7 +160,7 @@ _USE_QT5_ONLY= assistant buildtools concurrent core dbus \
_USE_QT5_ONLY+= sql-ibase
. endif
-_USE_QT6_ONLY= 5compat base coap graphs httpserver languageserver lottie positioning \
+_USE_QT6_ONLY= 5compat base coap graphs httpserver languageserver lottie pdf positioning \
quick3dphysics quickeffectmaker shadertools tools translations \
sqldriver-sqlite sqldriver-mysql sqldriver-psql sqldriver-odbc
@@ -274,6 +274,9 @@ qt-opengl_LIB= libQt${_QT_LIBVER}OpenGL.so
qt-paths_PORT= sysutils/${_QT_RELNAME}-qtpaths
qt-paths_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtpaths
+qt-pdf_PORT= print/${_QT_RELNAME}-pdf
+qt-pdf_LIB= libQt${_QT_LIBVER}Pdf.so
+
qt-pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool
qt-pixeltool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/pixeltool
diff --git a/accessibility/qt6-speech/Makefile b/accessibility/qt6-speech/Makefile
index de9d255cf67d..df0b8bde11e3 100644
--- a/accessibility/qt6-speech/Makefile
+++ b/accessibility/qt6-speech/Makefile
@@ -7,7 +7,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Accessibilty features for Qt6
USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6
-USE_GL= gl opengl
+USE_GL= opengl
USE_QT= base declarative multimedia
OPTIONS_DEFINE= ALSA
diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo
index 865816ae135c..7850daa2e10b 100644
--- a/accessibility/qt6-speech/distinfo
+++ b/accessibility/qt6-speech/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1701101665
+SHA256 (KDE/Qt/6.6.1/qtspeech-everywhere-src-6.6.1.tar.xz) = a28c2052c95144cf25f2f234e5334df364818da2b0fc091e369418869c925899
+SIZE (KDE/Qt/6.6.1/qtspeech-everywhere-src-6.6.1.tar.xz) = 270752
diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo
index ef8f501115f4..497155ac308c 100644
--- a/comms/qt6-connectivity/distinfo
+++ b/comms/qt6-connectivity/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1701101668
+SHA256 (KDE/Qt/6.6.1/qtconnectivity-everywhere-src-6.6.1.tar.xz) = 5b468d4649464ff983746c5e9129b731de639ac835d35857f5d87cd4258e0645
+SIZE (KDE/Qt/6.6.1/qtconnectivity-everywhere-src-6.6.1.tar.xz) = 989544
diff --git a/comms/qt6-sensors/Makefile b/comms/qt6-sensors/Makefile
index 8c15b4d10913..61b8e7f7ae23 100644
--- a/comms/qt6-sensors/Makefile
+++ b/comms/qt6-sensors/Makefile
@@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt sensors module
-WWW= https://qt.io
BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo
index 0c80347f50b4..356abc05cb59 100644
--- a/comms/qt6-sensors/distinfo
+++ b/comms/qt6-sensors/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1701101671
+SHA256 (KDE/Qt/6.6.1/qtsensors-everywhere-src-6.6.1.tar.xz) = bd13ee815c2fc39ac9e5a2e34f3e7055f972d14b949f00d6c6ec5347783799d3
+SIZE (KDE/Qt/6.6.1/qtsensors-everywhere-src-6.6.1.tar.xz) = 1502740
diff --git a/comms/qt6-serialbus/Makefile b/comms/qt6-serialbus/Makefile
index 2fd248dcf395..cf5551a70f96 100644
--- a/comms/qt6-serialbus/Makefile
+++ b/comms/qt6-serialbus/Makefile
@@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt functions to access industrial bus systems
-WWW= https://qt.io
BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo
index 35bc3caaab3c..137174070ed6 100644
--- a/comms/qt6-serialbus/distinfo
+++ b/comms/qt6-serialbus/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1701101674
+SHA256 (KDE/Qt/6.6.1/qtserialbus-everywhere-src-6.6.1.tar.xz) = 5c145e630b30a1c204e787c46833bb68d9bcece31343b588a6788711f49ef7ac
+SIZE (KDE/Qt/6.6.1/qtserialbus-everywhere-src-6.6.1.tar.xz) = 554516
diff --git a/comms/qt6-serialport/Makefile b/comms/qt6-serialport/Makefile
index d3eaec344f43..111c23acc4b1 100644
--- a/comms/qt6-serialport/Makefile
+++ b/comms/qt6-serialport/Makefile
@@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt functions to access serial ports
-WWW= https://qt.io
BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
LIB_DEPENDS= libudev.so:devel/libudev-devd
diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo
index 8388a97d4bb7..1a997d2215c1 100644
--- a/comms/qt6-serialport/distinfo
+++ b/comms/qt6-serialport/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1701101676
+SHA256 (KDE/Qt/6.6.1/qtserialport-everywhere-src-6.6.1.tar.xz) = 96fc233d5cbcac5048c6020dcfbd6cec8a6a8334eed0a283b33d58afc6d2aed8
+SIZE (KDE/Qt/6.6.1/qtserialport-everywhere-src-6.6.1.tar.xz) = 279564
diff --git a/databases/qt6-base_sqldriver/Makefile b/databases/qt6-base_sqldriver/Makefile
index 943242d3885e..b7f4abfe8308 100644
--- a/databases/qt6-base_sqldriver/Makefile
+++ b/databases/qt6-base_sqldriver/Makefile
@@ -8,7 +8,6 @@ PKGNAMESUFFIX= _sqldriver-${FLAVOR}
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt base (${FLAVOR} sqldriver)
-WWW= https://www.qt.io/
FLAVORS= sqlite mysql odbc psql
FLAVOR?= sqlite
diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo
index 319c9315f8ec..d2a3bc746c62 100644
--- a/databases/qt6-base_sqldriver/distinfo
+++ b/databases/qt6-base_sqldriver/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1701101726
+SHA256 (KDE/Qt/6.6.1/qtbase-everywhere-src-6.6.1.tar.xz) = 450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7
+SIZE (KDE/Qt/6.6.1/qtbase-everywhere-src-6.6.1.tar.xz) = 48370760
diff --git a/devel/py-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile
index 8bc25e53817b..a03173ba60ab 100644
--- a/devel/py-qt6-pyqt/Makefile
+++ b/devel/py-qt6-pyqt/Makefile
@@ -1,5 +1,6 @@
PORTNAME= pyqt
PORTVERSION= ${PYQT_VERSION}
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT}
PKGNAMEPREFIX= ${PYQT_PY_RELNAME}-
@@ -22,22 +23,12 @@ USE_LOCALE= C.UTF-8
USE_PYTHON= concurrent flavors
USE_PYQT= pysip qtbuilder sip
USE_QT= base connectivity declarative imageformats multimedia \
- positioning quick3d remoteobjects sensors serialport \
+ pdf 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
-USE_QT+= webengine
-PLIST_SUB+= WEBENGINE=""
-.else
-SIP_ARGS+= --disable QtPdf --disable QtPdfWidgets
-PLIST_SUB+= WEBENGINE="@comment "
-.endif
-
post-extract:
${RM} -r ${WRKSRC}/pyuic/uic/port_v2
@@ -51,4 +42,4 @@ post-install:
@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
-name '*.so*' -exec ${STRIP_CMD} {} +
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-qt6-pyqt/pkg-plist b/devel/py-qt6-pyqt/pkg-plist
index 019bdb63c1f8..1b92e9fe76e6 100644
--- a/devel/py-qt6-pyqt/pkg-plist
+++ b/devel/py-qt6-pyqt/pkg-plist
@@ -18,8 +18,8 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/QtNfc.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt6/QtOpenGL.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt6/QtOpenGLWidgets.abi%%PYTHON_MAJOR_VER%%.so
-%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/QtPdf.abi%%PYTHON_MAJOR_VER%%.so
-%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/QtPdfWidgets.abi%%PYTHON_MAJOR_VER%%.so
+%%PYTHON_SITELIBDIR%%/PyQt6/QtPdf.abi%%PYTHON_MAJOR_VER%%.so
+%%PYTHON_SITELIBDIR%%/PyQt6/QtPdfWidgets.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt6/QtPositioning.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt6/QtPrintSupport.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt6/QtQml.abi%%PYTHON_MAJOR_VER%%.so
@@ -465,21 +465,21 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtOpenGLWidgets/QtOpenGLWidgets.toml
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtOpenGLWidgets/QtOpenGLWidgetsmod.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtOpenGLWidgets/qopenglwidget.sip
-%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdf.toml
-%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdfmod.sip
-%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfbookmarkmodel.sip
-%%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/QtPdf/QtPdf.toml
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdfmod.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfbookmarkmodel.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocument.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocumentrenderoptions.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflink.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflinkmodel.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagenavigator.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagerenderer.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfsearchmodel.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfselection.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgets.toml
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgetsmod.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfpageselector.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfview.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/QtPositioning.toml
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/QtPositioningmod.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/qgeoaddress.sip
diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile
index 604d40d9c4c0..75861d3da2c0 100644
--- a/devel/pyside6/Makefile
+++ b/devel/pyside6/Makefile
@@ -1,5 +1,6 @@
PORTNAME= pyside6
DISTVERSION= ${PYSIDE6_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}-src
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +20,7 @@ USE_GL= gl
USE_LDCONFIG= yes
USE_PYTHON= flavors
USE_QT= 3d base charts connectivity datavis3d declarative doc graphs \
- httpserver imageformats location multimedia networkauth \
+ httpserver imageformats location multimedia networkauth pdf \
positioning quick3d quicktimeline remoteobjects scxml sensors \
serialbus serialport shadertools speech svg tools translations \
wayland webchannel websockets
diff --git a/devel/pyside6/pkg-plist b/devel/pyside6/pkg-plist
index 5dbc257f06d7..972c3f66de1b 100644
--- a/devel/pyside6/pkg-plist
+++ b/devel/pyside6/pkg-plist
@@ -30,8 +30,8 @@ include/PySide6/QtNetworkAuth/pyside6_qtnetworkauth_python.h
include/PySide6/QtNfc/pyside6_qtnfc_python.h
include/PySide6/QtOpenGL/pyside6_qtopengl_python.h
include/PySide6/QtOpenGLWidgets/pyside6_qtopenglwidgets_python.h
-%%WEBENGINE%%include/PySide6/QtPdf/pyside6_qtpdf_python.h
-%%WEBENGINE%%include/PySide6/QtPdfWidgets/pyside6_qtpdfwidgets_python.h
+include/PySide6/QtPdf/pyside6_qtpdf_python.h
+include/PySide6/QtPdfWidgets/pyside6_qtpdfwidgets_python.h
include/PySide6/QtPositioning/pyside6_qtpositioning_python.h
include/PySide6/QtPrintSupport/pyside6_qtprintsupport_python.h
include/PySide6/QtQml/pyside6_qtqml_python.h
@@ -184,10 +184,10 @@ lib/libpyside6qml.abi3.so.%%DISTVERSION%%
%%PYTHON_SITELIBDIR%%/PySide6/QtOpenGL.pyi
%%PYTHON_SITELIBDIR%%/PySide6/QtOpenGLWidgets.abi3.so
%%PYTHON_SITELIBDIR%%/PySide6/QtOpenGLWidgets.pyi
-%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.abi3.so
-%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.pyi
-%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.abi3.so
-%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.pyi
%%PYTHON_SITELIBDIR%%/PySide6/QtPositioning.abi3.so
%%PYTHON_SITELIBDIR%%/PySide6/QtPositioning.pyi
%%PYTHON_SITELIBDIR%%/PySide6/QtPrintSupport.abi3.so
@@ -349,8 +349,8 @@ share/PySide6/typesystems/typesystem_opengl_modifications4_5.xml
share/PySide6/typesystems/typesystem_opengl_modifications4_5_core.xml
share/PySide6/typesystems/typesystem_opengl_modifications_va.xml
share/PySide6/typesystems/typesystem_openglwidgets.xml
-%%WEBENGINE%%share/PySide6/typesystems/typesystem_pdf.xml
-%%WEBENGINE%%share/PySide6/typesystems/typesystem_pdfwidgets.xml
+share/PySide6/typesystems/typesystem_pdf.xml
+share/PySide6/typesystems/typesystem_pdfwidgets.xml
share/PySide6/typesystems/typesystem_positioning.xml
share/PySide6/typesystems/typesystem_printsupport.xml
share/PySide6/typesystems/typesystem_printsupport_common.xml
diff --git a/devel/qt6-5compat/Makefile b/devel/qt6-5compat/Makefile
index 87f795e038a3..1523282d4425 100644
--- a/devel/qt6-5compat/Makefile
+++ b/devel/qt6-5compat/Makefile
@@ -5,19 +5,13 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 6 module that contains unsupported Qt 5 APIs
-WWW= https://qt-project.org
LIB_DEPENDS= libicuuc.so:devel/icu \
- libdouble-conversion.so:devel/double-conversion \
- libpcre.so:devel/pcre \
- libpcre2-16.so:devel/pcre2 \
- libxkbcommon.so:x11/libxkbcommon \
- libzstd.so:archivers/zstd
+ libxkbcommon.so:x11/libxkbcommon
-USES= cmake compiler:c++17-lang gettext-runtime gl gnome \
+USES= cmake compiler:c++17-lang gl \
qt-dist:6
-USE_GL= gl opengl
-USE_GNOME= glib20
+USE_GL= opengl
USE_QT= base declarative shadertools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo
index 386803211884..3d146fb6c8ea 100644
--- a/devel/qt6-5compat/distinfo
+++ b/devel/qt6-5compat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697049679
-SHA256 (KDE/Qt/6.6.0/qt5compat-everywhere-src-6.6.0.tar.xz) = 3d85edb66126f712266dcbfc6cd00383d46cc6d66c8b84607ca21e2bc71a8fca
-SIZE (KDE/Qt/6.6.0/qt5compat-everywhere-src-6.6.0.tar.xz) = 14638540
+TIMESTAMP = 1701101740
+SHA256 (KDE/Qt/6.6.1/qt5compat-everywhere-src-6.6.1.tar.xz) = 0e1d15b6eda4172383208109d957257c8fa26a8a881f2901a4e9f347a31bc1f2
+SIZE (KDE/Qt/6.6.1/qt5compat-everywhere-src-6.6.1.tar.xz) = 14640664
diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile
index 89ec755c6049..048dc7a6f13c 100644
--- a/devel/qt6-base/Makefile
+++ b/devel/qt6-base/Makefile
@@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt base (core, gui, widgets, network,...)
-WWW= https://www.qt.io/
BUILD_DEPENDS= xml:textproc/xmlstarlet \
${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
@@ -14,40 +13,24 @@ LIB_DEPENDS= \
libatk-1.0.so:accessibility/at-spi2-core \
libatk-bridge-2.0.so:accessibility/at-spi2-core \
libatspi.so:accessibility/at-spi2-core \
- libavahi-client.so:net/avahi-app \
libbrotlidec.so:archivers/brotli \
libdbus-1.so:devel/dbus \
libdouble-conversion.so:devel/double-conversion \
libdrm.so:graphics/libdrm \
- libepoll-shim.so:devel/libepoll-shim \
- libepoxy.so:graphics/libepoxy \
libevdev.so:devel/libevdev \
- libexpat.so:textproc/expat2 \
- libffi.so:devel/libffi \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
- libfribidi.so:converters/fribidi \
- libgmp.so:math/gmp \
- libgnutls.so:security/gnutls \
libgraphite2.so:graphics/graphite2 \
- libgudev-1.0.so:devel/libgudev \
libharfbuzz.so:print/harfbuzz \
libicui18n.so:devel/icu \
- libidn2.so:dns/libidn2 \
libinput.so:x11/libinput \
libintl.so:devel/gettext-runtime \
libjpeg.so:graphics/jpeg-turbo \
libmtdev.so:devel/libmtdev \
- libnettle.so:security/nettle \
- libp11-kit.so:security/p11-kit \
- libpcre.so:devel/pcre \
libpcre2-16.so:devel/pcre2 \
libpng16.so:graphics/png \
- libtasn1.so:security/libtasn1 \
libudev.so:devel/libudev-devd \
- libunistring.so:devel/libunistring \
libvulkan.so:graphics/vulkan-loader \
- libwacom.so:x11/libwacom \
libwayland-client.so:graphics/wayland \
libxkbcommon.so:x11/libxkbcommon \
libzstd.so:archivers/zstd
@@ -94,8 +77,7 @@ X11_LIB_DEPENDS= libxcb-cursor.so:x11/xcb-util-cursor \
libxcb-icccm.so:x11/xcb-util-wm \
libxcb-image.so:x11/xcb-util-image \
libxcb-keysyms.so:x11/xcb-util-keysyms \
- libxcb-render-util.so:x11/xcb-util-renderutil \
- libxcb-util.so:x11/xcb-util
+ libxcb-render-util.so:x11/xcb-util-renderutil
.include <bsd.port.pre.mk>
diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo
index c3e7e528804d..8fb71367743a 100644
--- a/devel/qt6-base/distinfo
+++ b/devel/qt6-base/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697049681
-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
+TIMESTAMP = 1701101741
+SHA256 (KDE/Qt/6.6.1/qtbase-everywhere-src-6.6.1.tar.xz) = 450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7
+SIZE (KDE/Qt/6.6.1/qtbase-everywhere-src-6.6.1.tar.xz) = 48370760
diff --git a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake
index b6b158107631..a1e02bb2b362 100644
--- a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake
+++ b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake
@@ -1,6 +1,6 @@
---- cmake/QtFlagHandlingHelpers.cmake.orig 2023-09-21 19:24:26 UTC
+--- cmake/QtFlagHandlingHelpers.cmake.orig 2023-11-15 13:58:42 UTC
+++ cmake/QtFlagHandlingHelpers.cmake
-@@ -103,6 +103,10 @@ function(qt_internal_add_link_flags_no_undefined targe
+@@ -132,6 +132,10 @@ function(qt_internal_add_link_flags_no_undefined targe
set(no_undefined_flag "-Wl,--no-undefined")
endif()
diff --git a/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp b/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp
deleted file mode 100644
index c437e8d69127..000000000000
--- a/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gui/platform/unix/qxkbcommon.cpp.orig 2023-09-21 19:24:26 UTC
-+++ src/gui/platform/unix/qxkbcommon.cpp
-@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray(
- Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
- Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
- Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
-- Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
-- Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
-- Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
-- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
-
- // Special keys from X.org - This include multimedia keys,
- // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp
index 4eab6daffac2..902f6ae2be64 100644
--- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp
+++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp
@@ -1,4 +1,4 @@
---- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2023-09-13 16:02:48 UTC
+--- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2023-11-15 13:58:42 UTC
+++ src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
@@ -112,23 +112,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur
DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
@@ -59,7 +59,17 @@
DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -289,12 +308,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const
+@@ -214,7 +233,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **
+ DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return)
+ DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return)
+ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return)
++#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER >= 0x3060000fL)
+ DEFINEFUNC2(int, ASN1_TIME_to_tm, const ASN1_TIME *s, s, struct tm *tm, tm, return 0, return)
++#endif
+ DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
+ DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
+ DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return nullptr, return)
+@@ -289,12 +310,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const
DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -1, return)
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
@@ -74,18 +84,18 @@
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -751,8 +772,8 @@ static LoadedOpenSsl loadOpenSsl()
- #endif
- #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
+@@ -761,8 +784,8 @@ static LoadedOpenSsl loadOpenSsl()
+ libcrypto->setFileNameAndVersion("crypto"_L1, shlibVersion);
+ #elif defined(SHLIB_VERSION_NUMBER)
// first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
- libssl->setFileNameAndVersion("ssl"_L1, SHLIB_VERSION_NUMBER ""_L1);
- libcrypto->setFileNameAndVersion("crypto"_L1, SHLIB_VERSION_NUMBER ""_L1);
+ libssl->setFileNameAndVersion("%%OPENSSLLIB%%/libssl"_L1, SHLIB_VERSION_NUMBER ""_L1);
+ libcrypto->setFileNameAndVersion("%%OPENSSLLIB%%/libcrypto"_L1, SHLIB_VERSION_NUMBER ""_L1);
+ #endif // OPENSSL_SHLIB_VERSION
+
if (libcrypto->load() && libssl->load()) {
- // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
- return result;
-@@ -783,8 +804,8 @@ static LoadedOpenSsl loadOpenSsl()
+@@ -795,8 +818,8 @@ static LoadedOpenSsl loadOpenSsl()
libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1);
libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1);
# else
@@ -96,7 +106,7 @@
# endif
if (libcrypto->load() && libssl->load()) {
// libssl.so.0 and libcrypto.so.0 found
-@@ -853,21 +874,34 @@ bool q_resolveOpenSslSymbols()
+@@ -865,21 +888,34 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(EVP_CIPHER_CTX_reset)
RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free)
RESOLVEFUNC(EVP_PKEY_up_ref)
@@ -131,7 +141,7 @@
#ifdef TLS1_3_VERSION
RESOLVEFUNC(SSL_CTX_set_ciphersuites)
RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -949,7 +983,9 @@ bool q_resolveOpenSslSymbols()
+@@ -961,7 +997,9 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(OCSP_check_validity)
RESOLVEFUNC(OCSP_cert_to_id)
RESOLVEFUNC(OCSP_id_get0_info)
@@ -142,7 +152,7 @@
RESOLVEFUNC(OCSP_basic_sign)
RESOLVEFUNC(OCSP_response_create)
RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -1044,12 +1080,14 @@ bool q_resolveOpenSslSymbols()
+@@ -1056,12 +1094,14 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_CTX_use_PrivateKey)
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
RESOLVEFUNC(SSL_CTX_get_cert_store);
@@ -157,7 +167,7 @@
RESOLVEFUNC(SSL_accept)
RESOLVEFUNC(SSL_clear)
RESOLVEFUNC(SSL_connect)
-@@ -1109,7 +1147,9 @@ bool q_resolveOpenSslSymbols()
+@@ -1121,7 +1161,9 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(RSA_free)
RESOLVEFUNC(DH_bits)
diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp
index b99dd8d25cfd..2c822ea8c44c 100644
--- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp
+++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp
@@ -18,7 +18,7 @@
QDateTime result;
tm lTime;
-+#ifdef LIBRESSL_VERSION_NUMBER
++#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x3060000fL)
+ const char *data;
+ size_t len;
+ int type;
diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist
index 4eaf2762f2cb..f3b5273eda02 100644
--- a/devel/qt6-base/pkg-plist
+++ b/devel/qt6-base/pkg-plist
@@ -385,6 +385,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/QObjectList
%%QT_INCDIR%%/QtCore/QOperatingSystemVersion
%%QT_INCDIR%%/QtCore/QOperatingSystemVersionBase
+%%QT_INCDIR%%/QtCore/QOperatingSystemVersionUnexported
%%QT_INCDIR%%/QtCore/QOverload
%%QT_INCDIR%%/QtCore/QPair
%%QT_INCDIR%%/QtCore/QParallelAnimationGroup
@@ -1034,6 +1035,7 @@ bin/qmake6
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengineex_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpainter_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpainterpath_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpalette_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpathclipper_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpathsimplifier_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpdf_p.h
@@ -3098,10 +3100,6 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
%%QT_MKSPECDIR%%/common/msvc-based-version.conf
%%QT_MKSPECDIR%%/common/msvc-desktop.conf
%%QT_MKSPECDIR%%/common/msvc-version.conf
-%%QT_MKSPECDIR%%/common/nacl/g++-nacl32.conf
-%%QT_MKSPECDIR%%/common/nacl/g++-nacl64.conf
-%%QT_MKSPECDIR%%/common/nacl/nacl-base.conf
-%%QT_MKSPECDIR%%/common/nacl/qplatformdefs.h
%%QT_MKSPECDIR%%/common/posix/qplatformdefs.h
%%QT_MKSPECDIR%%/common/qcc-base-qnx-aarch64le.conf
%%QT_MKSPECDIR%%/common/qcc-base-qnx-armle-v7.conf
@@ -3251,7 +3249,6 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
%%QT_MKSPECDIR%%/features/designer_defines.prf
%%QT_MKSPECDIR%%/features/device_config.prf
%%QT_MKSPECDIR%%/features/egl.prf
-%%QT_MKSPECDIR%%/features/entrypoint.prf
%%QT_MKSPECDIR%%/features/exceptions.prf
%%QT_MKSPECDIR%%/features/exceptions_off.prf
%%QT_MKSPECDIR%%/features/exclusive_builds.prf
@@ -3508,10 +3505,6 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
%%QT_MKSPECDIR%%/unsupported/macx-watchos-clang/Info.plist.lib
%%QT_MKSPECDIR%%/unsupported/macx-watchos-clang/qmake.conf
%%QT_MKSPECDIR%%/unsupported/macx-watchos-clang/qplatformdefs.h
-%%QT_MKSPECDIR%%/unsupported/nacl-g++/qmake.conf
-%%QT_MKSPECDIR%%/unsupported/nacl-g++/qplatformdefs.h
-%%QT_MKSPECDIR%%/unsupported/nacl64-g++/qmake.conf
-%%QT_MKSPECDIR%%/unsupported/nacl64-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/unsupported/qnx-X11-g++/qmake.conf
%%QT_MKSPECDIR%%/unsupported/qnx-X11-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/unsupported/vxworks-ppc-dcc/qmake.conf
diff --git a/devel/qt6-languageserver/Makefile b/devel/qt6-languageserver/Makefile
index 0f7c03bf51fd..7a535c0f90b1 100644
--- a/devel/qt6-languageserver/Makefile
+++ b/devel/qt6-languageserver/Makefile
@@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 6 implementation of the Language Server Protocol
-WWW= https://qt.io
BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
diff --git a/devel/qt6-languageserver/distinfo b/devel/qt6-languageserver/distinfo
index 00fcad36b4d1..5e54b7d6d245 100644
--- a/devel/qt6-languageserver/distinfo
+++ b/devel/qt6-languageserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697049688
-SHA256 (KDE/Qt/6.6.0/qtlanguageserver-everywhere-src-6.6.0.tar.xz) = aec93019862bf63769206fe56a2230cd9e37994806a4bf28415203b4eb9a490e
-SIZE (KDE/Qt/6.6.0/qtlanguageserver-everywhere-src-6.6.0.tar.xz) = 154304
+TIMESTAMP = 1701101743
+SHA256 (KDE/Qt/6.6.1/qtlanguageserver-everywhere-src-6.6.1.tar.xz) = b0761f5603a989df921df10ff33e70d7b98d2a33b17679a7e84eb4f224e73e6f
+SIZE (KDE/Qt/6.6.1/qtlanguageserver-everywhere-src-6.6.1.tar.xz) = 154312
diff --git a/devel/qt6-location/Makefile b/devel/qt6-location/Makefile
index 295bfb0a0be4..7754c53784d2 100644
--- a/devel/qt6-location/Makefile
+++ b/devel/qt6-location/Makefile
@@ -5,13 +5,12 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 6 API to create viable mapping solutions
-WWW= https://qt.io
BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon
USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6
-USE_GL= gl opengl
+USE_GL= opengl
USE_QT= base declarative positioning shadertools
.include <bsd.port.mk>
diff --git a/devel/qt6-location/distinfo b/devel/qt6-location/distinfo
index 2355de5577e8..c0b0e0f83f59 100644
--- a/devel/qt6-location/distinfo
+++ b/devel/qt6-location/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697049692
-SHA256 (KDE/Qt/6.6.0/qtlocation-everywhere-src-6.6.0.tar.xz) = f5968be76108bf22af334b403027cf0a859284cb824250e728bb8daca2d70794
-SIZE (KDE/Qt/6.6.0/qtlocation-everywhere-src-6.6.0.tar.xz) = 3035992
+TIMESTAMP = 1701101748
+SHA256 (KDE/Qt/6.6.1/qtlocation-everywhere-src-6.6.1.tar.xz) = 8dbe2b62e37278c83c5acdb536c3e4c313ec0bac5380d020873db692199f9c29
+SIZE (KDE/Qt/6.6.1/qtlocation-everywhere-src-6.6.1.tar.xz) = 3035980
diff --git a/devel/qt6-positioning/Makefile b/devel/qt6-positioning/Makefile
index 011ecbe781d6..714fb0c005a5 100644
--- a/devel/qt6-positioning/Makefile
+++ b/devel/qt6-positioning/Makefile
@@ -5,13 +5,12 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 6 API to provide positioning information via QML and C++
-WWW= https://qt.io
BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon
USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6
-USE_GL= gl opengl
-USE_QT= base declarative serialbus serialport
+USE_GL= opengl
+USE_QT= base declarative serialport
.include <bsd.port.mk>
diff --git a/devel/qt6-positioning/distinfo b/devel/qt6-positioning/distinfo
index 57b53eb9baee..521860858430 100644
--- a/devel/qt6-positioning/distinfo
+++ b/devel/qt6-positioning/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697049695
-SHA256 (KDE/Qt/6.6.0/qtpositioning-everywhere-src-6.6.0.tar.xz) = 8d6520fa3c759ed33eaea7cb1aa7e1e7ec999f828e496a6c592847d61f0fa539
-SIZE (KDE/Qt/6.6.0/qtpositioning-everywhere-src-6.6.0.tar.xz) = 1513304
+TIMESTAMP = 1701101751
+SHA256 (KDE/Qt/6.6.1/qtpositioning-everywhere-src-6.6.1.tar.xz) = 3ddac73f3b12b8516498cb5d2f9ade058a1a9368f74188d48ed27032833816b8
+SIZE (KDE/Qt/6.6.1/qtpositioning-everywhere-src-6.6.1.tar.xz) = 1513456
diff --git a/devel/qt6-remoteobjects/Makefile b/devel/qt6-remoteobjects/Makefile
index 3c3493a99750..fe9684b8f7b9 100644
--- a/devel/qt6-remoteobjects/Makefile
+++ b/devel/qt6-remoteobjects/Makefile
@@ -5,12 +5,11 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt6 Remote Objects module
-WWW= https://qt.io
BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6
-USE_GL= gl opengl
+USE_GL= opengl
USE_QT= base declarative
.include <bsd.port.mk>
diff --git a/devel/qt6-remoteobjects/distinfo b/devel/qt6-remoteobjects/distinfo
index ecac797f50f2..f01d76f67d37 100644
--- a/devel/qt6-remoteobjects/distinfo
+++ b/devel/qt6-remoteobjects/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697049697
-SHA256 (KDE/Qt/6.6.0/qtremoteobjects-everywhere-src-6.6.0.tar.xz) = 261194e35bb9420225f095c58a5a549686797a3d2b7ea6f0d582d7d681f1f76b
-SIZE (KDE/Qt/6.6.0/qtremoteobjects-everywhere-src-6.6.0.tar.xz) = 527892
+TIMESTAMP = 1701101753
+SHA256 (KDE/Qt/6.6.1/qtremoteobjects-everywhere-src-6.6.1.tar.xz) = b89e5898ff8bc0fca03e07cde97158ad02a0e082971e0637c4db69cd06fb9599
+SIZE (KDE/Qt/6.6.1/qtremoteobjects-everywhere-src-6.6.1.tar.xz) = 542624
diff --git a/devel/qt6-scxml/Makefile b/devel/qt6-scxml/Makefile
index cff348d1ee3e..74d5c4cd01b9 100644
--- a/devel/qt6-scxml/Makefile
+++ b/devel/qt6-scxml/Makefile
@@ -5,13 +5,12 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt6 SCXML module
-WWW= https://qt.io
BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon
USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6
-USE_GL= gl opengl
+USE_GL= opengl
USE_QT= base declarative
.include <bsd.port.mk>
diff --git a/devel/qt6-scxml/distinfo b/devel/qt6-scxml/distinfo
index 587d69fb6297..0e689b56a685 100644
--- a/devel/qt6-scxml/distinfo
+++ b/devel/qt6-scxml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697049705
-SHA256 (KDE/Qt/6.6.0/qtscxml-everywhere-src-6.6.0.tar.xz) = 57ecd0db5d8b063d0334c4b21461585b4904d4884c88de125bd72e967e8a1043
-SIZE (KDE/Qt/6.6.0/qtscxml-everywhere-src-6.6.0.tar.xz) = 1175844
+TIMESTAMP = 1701101756
+SHA256 (KDE/Qt/6.6.1/qtscxml-everywhere-src-6.6.1.tar.xz) = 874bc57af4399399e36424288d5e23fd8ea18c20ad9e0adb1ae3fbd420dd0897
+SIZE (KDE/Qt/6.6.1/qtscxml-everywhere-src-6.6.1.tar.xz) = 1176684
diff --git a/devel/qt6-tools/Makefile b/devel/qt6-tools/Makefile
index b789b10ffc85..8337b56058b6 100644
--- a/devel/qt6-tools/Makefile
+++ b/devel/qt6-tools/Makefile
@@ -5,29 +5,15 @@ PKGNAMEPREFIX= qt6-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt declarative framework for dynamic user interfaces
-WWW= https://qt-project.org
BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
-LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \
- libdouble-conversion.so:devel/double-conversion \
- libexpat.so:textproc/expat2 \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2 \
- libgraphite2.so:graphics/graphite2 \
- libharfbuzz.so:print/harfbuzz \
- libicudata.so:devel/icu \
- libpcre.so:devel/pcre \
- libpcre2-16.so:devel/pcre2 \
- libpng16.so:graphics/png \
- libxkbcommon.so:x11/libxkbcommon \
+LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \
libzstd.so:archivers/zstd
-USES= cmake compiler:c++17-lang gettext-runtime gl gnome llvm:lib python:build xorg \
+USES= cmake compiler:c++17-lang gl llvm:lib python:build \
qt-dist:6
USE_GL= opengl
-USE_GNOME= glib20
USE_QT= base declarative
-USE_XORG= x11 xau xcb xdmcp
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
CMAKE_ARGS+= -DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \
diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo
index b35d54b4aa90..eeab1507260c 100644
--- a/devel/qt6-tools/distinfo
+++ b/devel/qt6-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697049711
-SHA256 (KDE/Qt/6.6.0/qttools-everywhere-src-6.6.0.tar.xz) = 4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99
-SIZE (KDE/Qt/6.6.0/qttools-everywhere-src-6.6.0.tar.xz) = 8582212
+TIMESTAMP = 1701101767
+SHA256 (KDE/Qt/6.6.1/qttools-everywhere-src-6.6.1.tar.xz) = 4939105a7345ab4e19e7caee8654a836e65bd41910359623e0f233f3aff0914a
+SIZE (KDE/Qt/6.6.1/qttools-everywhere-src-6.6.1.tar.xz) = 8583536
diff --git a/devel/qt6-tools/pkg-plist b/devel/qt6-tools/pkg-plist
index c4aac07876f2..4f94015b3e5f 100644
--- a/devel/qt6-tools/pkg-plist
+++ b/devel/qt6-tools/pkg-plist
@@ -99,8 +99,11 @@ bin/qtplugininfo6
%%QT_INCDIR%%/QtDesigner/QDesignerActionEditorInterface
%%QT_INCDIR%%/QtDesigner/QDesignerComponents
%%QT_INCDIR%%/QtDesigner/QDesignerContainerExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerCustomWidgetCollectionInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerCustomWidgetInterface
%%QT_INCDIR%%/QtDesigner/QDesignerDnDItemInterface
%%QT_INCDIR%%/QtDesigner/QDesignerDynamicPropertySheetExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerExportWidget
%%QT_INCDIR%%/QtDesigner/QDesignerExtraInfoExtension
%%QT_INCDIR%%/QtDesigner/QDesignerFormEditorInterface
%%QT_INCDIR%%/QtDesigner/QDesignerFormEditorPluginInterface
@@ -157,6 +160,7 @@ bin/qtplugininfo6
%%QT_INCDIR%%/QtDesigner/abstractwidgetdatabase.h
%%QT_INCDIR%%/QtDesigner/abstractwidgetfactory.h
%%QT_INCDIR%%/QtDesigner/container.h
+%%QT_INCDIR%%/QtDesigner/customwidget.h
%%QT_INCDIR%%/QtDesigner/default_extensionfactory.h
%%QT_INCDIR%%/QtDesigner/dynamicpropertysheet.h
%%QT_INCDIR%%/QtDesigner/extension.h
@@ -168,6 +172,7 @@ bin/qtplugininfo6
%%QT_INCDIR%%/QtDesigner/propertysheet.h
%%QT_INCDIR%%/QtDesigner/qdesigner_components.h
%%QT_INCDIR%%/QtDesigner/qdesigner_components_global.h
+%%QT_INCDIR%%/QtDesigner/qdesignerexportwidget.h
%%QT_INCDIR%%/QtDesigner/qextensionmanager.h
%%QT_INCDIR%%/QtDesigner/qtdesignerversion.h
%%QT_INCDIR%%/QtDesigner/sdk_global.h
diff --git a/devel/qt6-translations/Makefile b/devel/qt6-translations/Makefile
index f1a9e8458f18..664309891c7c 100644
--- a/devel/qt6-translations/Makefile
*** 2328 LINES SKIPPED ***