git: 3c64225be56f - main - Qt6: Update to 6.8.3

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Sat, 29 Mar 2025 07:35:36 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c64225be56feee84b9c2523c2727f87b7281af1

commit 3c64225be56feee84b9c2523c2727f87b7281af1
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-03-29 04:42:00 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-03-29 07:35:21 +0000

    Qt6: Update to 6.8.3
    
    March 27, 2025 by Jani Heikkinen
    
    We have released Qt 6.8.3 today. As a patch release, Qt 6.8.3 does not
    introduce new features but contains more than 300 bug fixes, security updates,
    and other improvements on top of the Qt 6.8.2 release. See more information
    about the most important changes and bug fixes from Qt 6.8.3 release note.
    
    Qt for Python 6.8.3 has also been released by its usual means along with the
    Qt 6.8.3 release.
    
    Announcement:
    https://www.qt.io/blog/qt-6.8.3-released
    
    Release note:
    https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.3/release-note.md
    
    Security:       7cb6642c-0c5a-11f0-8688-4ccc6adda413
---
 Mk/Uses/qt.mk                                      |   4 +-
 accessibility/qt6-speech/Makefile                  |   1 -
 accessibility/qt6-speech/distinfo                  |   6 +-
 comms/qt6-connectivity/Makefile                    |   1 -
 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/distinfo              |   6 +-
 devel/pyside6-tools/distinfo                       |   6 +-
 devel/pyside6/distinfo                             |   6 +-
 ...tch-sources_pyside6_PySide6_QtAsyncio_events.py |  21 +++
 devel/pyside6/pkg-plist                            |   1 -
 devel/qt6-5compat/Makefile                         |   1 -
 devel/qt6-5compat/distinfo                         |   6 +-
 devel/qt6-base/Makefile                            |  22 +--
 devel/qt6-base/distinfo                            |  12 +-
 devel/qt6-base/pkg-plist                           |  21 ++-
 devel/qt6-grpc/Makefile                            |   1 -
 devel/qt6-grpc/distinfo                            |   6 +-
 devel/qt6-grpc/pkg-plist                           |   2 +
 devel/qt6-languageserver/distinfo                  |   6 +-
 devel/qt6-location/Makefile                        |   1 -
 devel/qt6-location/distinfo                        |   6 +-
 devel/qt6-positioning/Makefile                     |   1 -
 devel/qt6-positioning/distinfo                     |   6 +-
 devel/qt6-remoteobjects/Makefile                   |   1 -
 devel/qt6-remoteobjects/distinfo                   |   6 +-
 devel/qt6-scxml/Makefile                           |   1 -
 devel/qt6-scxml/distinfo                           |   6 +-
 devel/qt6-tools/Makefile                           |  12 +-
 devel/qt6-tools/distinfo                           |   6 +-
 devel/qt6-translations/distinfo                    |   6 +-
 devel/qt6-translations/pkg-plist                   |   2 +
 devel/qt6/Makefile                                 |   1 -
 devel/shiboken6/distinfo                           |   6 +-
 graphics/qt6-3d/distinfo                           |   6 +-
 graphics/qt6-imageformats/distinfo                 |   6 +-
 graphics/qt6-lottie/Makefile                       |   1 -
 graphics/qt6-lottie/distinfo                       |   6 +-
 graphics/qt6-quickeffectmaker/distinfo             |   6 +-
 graphics/qt6-svg/distinfo                          |   6 +-
 graphics/qt6-wayland/distinfo                      |   6 +-
 misc/qt6-doc/distinfo                              |   6 +-
 misc/qt6-doc/pkg-plist                             |   6 -
 misc/qt6-examples/distinfo                         |   6 +-
 misc/qt6-examples/pkg-plist                        |  19 +--
 multimedia/qt6-multimedia/Makefile                 |   1 -
 multimedia/qt6-multimedia/distinfo                 |   6 +-
 ...src_multimedia_pipewire_qpipewire__instance.cpp |  24 +++
 ...dia_pipewire_qpipewire__screencapturehelper.cpp |  19 ---
 ...multimedia_pipewire_qpipewire__symbolloader.cpp |  14 +-
 ...ch-src_plugins_multimedia_ffmpeg_CMakeLists.txt |   8 +-
 multimedia/qt6-multimedia/pkg-plist                | 189 +++++++++++++++------
 net/qt6-coap/Makefile                              |   1 -
 net/qt6-coap/distinfo                              |   6 +-
 net/qt6-mqtt/distinfo                              |   6 +-
 net/qt6-networkauth/distinfo                       |   6 +-
 print/qt6-pdf/pkg-plist                            |   1 +
 science/qt6-quick3dphysics/distinfo                |   6 +-
 www/qt6-httpserver/Makefile                        |   1 -
 www/qt6-httpserver/distinfo                        |   6 +-
 www/qt6-webchannel/Makefile                        |   1 -
 www/qt6-webchannel/distinfo                        |   6 +-
 www/qt6-webengine/Makefile                         |   5 +-
 www/qt6-webengine/distinfo                         |   6 +-
 ...rty_chromium_third__party_lzma__sdk_C_CpuArch.c |  19 ++-
 www/qt6-webengine/pkg-plist                        |   1 -
 www/qt6-websockets/Makefile                        |   1 -
 www/qt6-websockets/distinfo                        |   6 +-
 www/qt6-webview/Makefile                           |   1 -
 www/qt6-webview/distinfo                           |   6 +-
 x11-toolkits/qt6-charts/Makefile                   |   1 -
 x11-toolkits/qt6-charts/distinfo                   |   6 +-
 x11-toolkits/qt6-datavis3d/Makefile                |   1 -
 x11-toolkits/qt6-datavis3d/distinfo                |   6 +-
 x11-toolkits/qt6-declarative/Makefile              |  14 +-
 x11-toolkits/qt6-declarative/distinfo              |   6 +-
 x11-toolkits/qt6-graphs/Makefile                   |   1 -
 x11-toolkits/qt6-graphs/distinfo                   |   6 +-
 x11-toolkits/qt6-quick3d/distinfo                  |   6 +-
 x11-toolkits/qt6-quicktimeline/distinfo            |   6 +-
 x11-toolkits/qt6-shadertools/distinfo              |   6 +-
 x11-toolkits/qt6-virtualkeyboard/Makefile          |   1 -
 x11-toolkits/qt6-virtualkeyboard/distinfo          |   6 +-
 88 files changed, 395 insertions(+), 308 deletions(-)

diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 0717986716b7..038a82dc4ab6 100644
--- 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.16
-QT6_VERSION?=		6.8.2
-PYSIDE6_VERSION?=	6.8.2
+QT6_VERSION?=		6.8.3
+PYSIDE6_VERSION?=	6.8.3
 
 # Support for intermediate Qt6 releases. This partially defines
 # _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk,
diff --git a/accessibility/qt6-speech/Makefile b/accessibility/qt6-speech/Makefile
index 7d2d11bee0c9..d7e0457e5346 100644
--- a/accessibility/qt6-speech/Makefile
+++ b/accessibility/qt6-speech/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	speech
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility
 PKGNAMEPREFIX=	qt6-
 
diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo
index 0fd5e1d96c4c..5b2926084c1e 100644
--- a/accessibility/qt6-speech/distinfo
+++ b/accessibility/qt6-speech/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340226
-SHA256 (KDE/Qt/6.8.2/qtspeech-everywhere-src-6.8.2.tar.xz) = e09b52336bb90090f4582a382fa084f7573ebd207cc81f3066ef94cc1bf202c3
-SIZE (KDE/Qt/6.8.2/qtspeech-everywhere-src-6.8.2.tar.xz) = 262484
+TIMESTAMP = 1743027793
+SHA256 (KDE/Qt/6.8.3/qtspeech-everywhere-src-6.8.3.tar.xz) = b0dd3e3bf993e15dc03d3486ee1b452c2b92f0460a621eb32d261eecc040504b
+SIZE (KDE/Qt/6.8.3/qtspeech-everywhere-src-6.8.3.tar.xz) = 264416
diff --git a/comms/qt6-connectivity/Makefile b/comms/qt6-connectivity/Makefile
index 9e2b0b56b604..c67a3eaaae84 100644
--- a/comms/qt6-connectivity/Makefile
+++ b/comms/qt6-connectivity/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	connectivity
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt6-
 
diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo
index 3d4e3d8d282e..a8ba3ada90f4 100644
--- a/comms/qt6-connectivity/distinfo
+++ b/comms/qt6-connectivity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340227
-SHA256 (KDE/Qt/6.8.2/qtconnectivity-everywhere-src-6.8.2.tar.xz) = e617120e084ac369fd6064f2c177de9e1c2cd9989a1f1774eea131800d52812a
-SIZE (KDE/Qt/6.8.2/qtconnectivity-everywhere-src-6.8.2.tar.xz) = 1069068
+TIMESTAMP = 1743027794
+SHA256 (KDE/Qt/6.8.3/qtconnectivity-everywhere-src-6.8.3.tar.xz) = 477176383308ce77f974a16f118027e833061caed57aeb30eeb4306a583c9b39
+SIZE (KDE/Qt/6.8.3/qtconnectivity-everywhere-src-6.8.3.tar.xz) = 1071152
diff --git a/comms/qt6-sensors/Makefile b/comms/qt6-sensors/Makefile
index 601eaec358d0..519626d7b4a6 100644
--- a/comms/qt6-sensors/Makefile
+++ b/comms/qt6-sensors/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	sensors
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt6-
 
diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo
index b3bd73caaaa5..3c7bf0560c81 100644
--- a/comms/qt6-sensors/distinfo
+++ b/comms/qt6-sensors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340228
-SHA256 (KDE/Qt/6.8.2/qtsensors-everywhere-src-6.8.2.tar.xz) = 8a817c9b001ad0abdbf15064826ca6a8ee6b66fef8f04b4343ac9f7b2ddbf4ca
-SIZE (KDE/Qt/6.8.2/qtsensors-everywhere-src-6.8.2.tar.xz) = 1498148
+TIMESTAMP = 1743027795
+SHA256 (KDE/Qt/6.8.3/qtsensors-everywhere-src-6.8.3.tar.xz) = b871a7501f9fa609f35260ea39a0f198427d6d6b9ee8d1a6ddb987cc26511eae
+SIZE (KDE/Qt/6.8.3/qtsensors-everywhere-src-6.8.3.tar.xz) = 1500140
diff --git a/comms/qt6-serialbus/Makefile b/comms/qt6-serialbus/Makefile
index 9a4d0c8cc94f..061721e4fa20 100644
--- a/comms/qt6-serialbus/Makefile
+++ b/comms/qt6-serialbus/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	serialbus
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt6-
 
diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo
index 0246d8b47a4c..88070682f45f 100644
--- a/comms/qt6-serialbus/distinfo
+++ b/comms/qt6-serialbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340228
-SHA256 (KDE/Qt/6.8.2/qtserialbus-everywhere-src-6.8.2.tar.xz) = 1919d6bad2d935587fdb629c9737ced2ffe3c104c6b54bedb350ea9593b9a112
-SIZE (KDE/Qt/6.8.2/qtserialbus-everywhere-src-6.8.2.tar.xz) = 548272
+TIMESTAMP = 1743027796
+SHA256 (KDE/Qt/6.8.3/qtserialbus-everywhere-src-6.8.3.tar.xz) = 43480eeb7172757d2af2c5717cfed84a9254bef775cd715fd27258a81c7b7e9e
+SIZE (KDE/Qt/6.8.3/qtserialbus-everywhere-src-6.8.3.tar.xz) = 550256
diff --git a/comms/qt6-serialport/Makefile b/comms/qt6-serialport/Makefile
index 18ddff66ccd3..76fc04db4281 100644
--- a/comms/qt6-serialport/Makefile
+++ b/comms/qt6-serialport/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	serialport
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt6-
 
diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo
index 7a5c2d21db80..1fe21234e056 100644
--- a/comms/qt6-serialport/distinfo
+++ b/comms/qt6-serialport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340229
-SHA256 (KDE/Qt/6.8.2/qtserialport-everywhere-src-6.8.2.tar.xz) = ed17e02361e989f149f58d021ab8cd66f21db4cdfb8cde0a462017e6ac1e3be7
-SIZE (KDE/Qt/6.8.2/qtserialport-everywhere-src-6.8.2.tar.xz) = 274700
+TIMESTAMP = 1743027797
+SHA256 (KDE/Qt/6.8.3/qtserialport-everywhere-src-6.8.3.tar.xz) = c164a0392dc7cab3d072fa8fdcacc8fc4f3e685234b021b3128020719cdf5fa5
+SIZE (KDE/Qt/6.8.3/qtserialport-everywhere-src-6.8.3.tar.xz) = 276532
diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo
index f638dd2559c4..a847da8eb3e7 100644
--- a/databases/qt6-base_sqldriver/distinfo
+++ b/databases/qt6-base_sqldriver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340230
-SHA256 (KDE/Qt/6.8.2/qtbase-everywhere-src-6.8.2.tar.xz) = 012043ce6d411e6e8a91fdc4e05e6bedcfa10fcb1347d3c33908f7fdd10dfe05
-SIZE (KDE/Qt/6.8.2/qtbase-everywhere-src-6.8.2.tar.xz) = 48264736
+TIMESTAMP = 1743027799
+SHA256 (KDE/Qt/6.8.3/qtbase-everywhere-src-6.8.3.tar.xz) = 56001b905601bb9023d399f3ba780d7fa940f3e4861e496a7c490331f49e0b80
+SIZE (KDE/Qt/6.8.3/qtbase-everywhere-src-6.8.3.tar.xz) = 48426536
diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo
index 0c60199918c2..0d52f8ea51c3 100644
--- a/devel/pyside6-tools/distinfo
+++ b/devel/pyside6-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738430345
-SHA256 (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 8422e9aa403f4119e3192853e9b0cfa09e57e3e0a1a3393e7fdf394179c112f8
-SIZE (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 16609596
+TIMESTAMP = 1743103551
+SHA256 (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = d2c896f7f1a6a7ea4c9f98cfe317272fd139703ddf612b86999f09e48aeef0e6
+SIZE (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = 16611768
diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo
index 29faa9fe21e4..9e69ddeedc96 100644
--- a/devel/pyside6/distinfo
+++ b/devel/pyside6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738430251
-SHA256 (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 8422e9aa403f4119e3192853e9b0cfa09e57e3e0a1a3393e7fdf394179c112f8
-SIZE (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 16609596
+TIMESTAMP = 1743103521
+SHA256 (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = d2c896f7f1a6a7ea4c9f98cfe317272fd139703ddf612b86999f09e48aeef0e6
+SIZE (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = 16611768
diff --git a/devel/pyside6/files/patch-sources_pyside6_PySide6_QtAsyncio_events.py b/devel/pyside6/files/patch-sources_pyside6_PySide6_QtAsyncio_events.py
new file mode 100644
index 000000000000..da3500fec014
--- /dev/null
+++ b/devel/pyside6/files/patch-sources_pyside6_PySide6_QtAsyncio_events.py
@@ -0,0 +1,21 @@
+Fix stage.
+
+Compiling '/wrkdirs/usr/ports/devel/pyside6/work-py311/stage/usr/local/lib/python3.11/site-packages/PySide6/QtAsyncio/events.py'...
+***   File "/usr/local/lib/python3.11/site-packages/PySide6/QtAsyncio/events.py", line 601
+    print(f"{context["message"]} from task {context["task"]._name},"+
+                      ^^^^^^^
+SyntaxError: f-string: unmatched '['
+
+Regressed by: https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?h=6.8.3&id=6aadd4a61d3cc363adeab7589d90e5faecf55f6e
+
+--- sources/pyside6/PySide6/QtAsyncio/events.py.orig	2025-03-24 09:13:54 UTC
++++ sources/pyside6/PySide6/QtAsyncio/events.py
+@@ -598,7 +598,7 @@ class QAsyncioEventLoop(asyncio.BaseEventLoop, QObject
+     def default_exception_handler(self, context: dict[str, Any]) -> None:
+         # TODO
+         if context["message"]:
+-            print(f"{context["message"]} from task {context["task"]._name},"+
++            print(f"{context['message']} from task {context['task']._name},"+
+                     "read the following traceback:")
+             print(context["traceback"])
+ 
diff --git a/devel/pyside6/pkg-plist b/devel/pyside6/pkg-plist
index a630ef2b247f..7dd18b4edb8a 100644
--- a/devel/pyside6/pkg-plist
+++ b/devel/pyside6/pkg-plist
@@ -309,7 +309,6 @@ share/PySide6/typesystems/glue/plugins.h
 share/PySide6/typesystems/glue/qeasingcurve_glue.cpp
 share/PySide6/typesystems/glue/qeasingcurve_glue.h
 share/PySide6/typesystems/gui_common.xml
-share/PySide6/typesystems/opengl_common.xml
 share/PySide6/typesystems/typesystem_3danimation.xml
 share/PySide6/typesystems/typesystem_3dcore.xml
 share/PySide6/typesystems/typesystem_3dextras.xml
diff --git a/devel/qt6-5compat/Makefile b/devel/qt6-5compat/Makefile
index 5c8a04339f9f..1523282d4425 100644
--- a/devel/qt6-5compat/Makefile
+++ b/devel/qt6-5compat/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	5compat
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo
index ceb7557ebefd..83a0e10853a4 100644
--- a/devel/qt6-5compat/distinfo
+++ b/devel/qt6-5compat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340230
-SHA256 (KDE/Qt/6.8.2/qt5compat-everywhere-src-6.8.2.tar.xz) = b53154bc95ec08e2ddc266bef250fbd684b4eb2df96bc8c27d26b1e953495316
-SIZE (KDE/Qt/6.8.2/qt5compat-everywhere-src-6.8.2.tar.xz) = 14637788
+TIMESTAMP = 1743027800
+SHA256 (KDE/Qt/6.8.3/qt5compat-everywhere-src-6.8.3.tar.xz) = 54b9c84bff34b423dd8c472862ce1009753ff505e418b4ef33907416da16b82e
+SIZE (KDE/Qt/6.8.3/qt5compat-everywhere-src-6.8.3.tar.xz) = 14634168
diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile
index 55776ab54202..3ad3c1f254f3 100644
--- a/devel/qt6-base/Makefile
+++ b/devel/qt6-base/Makefile
@@ -1,14 +1,8 @@
 PORTNAME=	base
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	4
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
-PATCH_SITES=	https://invent.kde.org/qt/qt/qtbase/-/commit/
-PATCHFILES+=	12d4bf1ab52748cb84894f50d437064b439e0b7d.patch:-p1
-PATCHFILES+=	2ef615228bba9a8eb282437bfb7472f925610e89.patch:-p1
-PATCHFILES+=	a43c7e58046604796aa69974ea1c5d3e2648c755.patch:-p1
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt base (core, gui, widgets, network,...)
 
@@ -51,7 +45,6 @@ USE_LOCALE=	C.UTF-8
 SHEBANG_FILES=	${WRKSRC}/libexec/qt-android-runner.py \
 		${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \
 		${WRKSRC}/mkspecs/features/uikit/devices.py \
-		${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \
 		${WRKSRC}/util/testrunner/qt-testrunner.py \
 		${WRKSRC}/util/testrunner/sanitizer-testrunner.py
 
@@ -107,15 +100,12 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \
 		${WRKSRC}/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
 
-# TODO: do this cleaner -- somewhere cmake/qmake still creates empty directories
-# for the cmake files in INSTALL_PREFIX/lib/cmake
 post-install:
-	${RM} -vr ${STAGEDIR}${PREFIX}/${QT_LIBDIR_REL}/cmake
-	# Install symlinks for user-facing tools
-	${REINPLACE_CMD} -e "s#^#${STAGEDIR}#" -e "s# # ${STAGEDIR}#" \
-		${WRKDIR}/.build/user_facing_tool_links.txt
-	while read t; do \
-		${RLN} $$t; \
-	done <${WRKDIR}/.build/user_facing_tool_links.txt
+# Install symlinks for user-facing tools
+	while read line; do \
+		source="$$(${ECHO_CMD} $${line} | ${AWK} '{print $$1}')"; \
+		target="${STAGEDIR}${PREFIX}/$$(${ECHO_CMD} $${line} | ${AWK} '{print $$2}')"; \
+		${RLN} $${source} $${target}; \
+	done <${BUILD_WRKSRC}/user_facing_tool_links.txt
 
 .include <bsd.port.post.mk>
diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo
index d9f7e7107514..e2f47ad60ff8 100644
--- a/devel/qt6-base/distinfo
+++ b/devel/qt6-base/distinfo
@@ -1,9 +1,3 @@
-TIMESTAMP = 1739334694
-SHA256 (KDE/Qt/6.8.2/qtbase-everywhere-src-6.8.2.tar.xz) = 012043ce6d411e6e8a91fdc4e05e6bedcfa10fcb1347d3c33908f7fdd10dfe05
-SIZE (KDE/Qt/6.8.2/qtbase-everywhere-src-6.8.2.tar.xz) = 48264736
-SHA256 (KDE/Qt/6.8.2/12d4bf1ab52748cb84894f50d437064b439e0b7d.patch) = 76d765b01ea3fb904646606bbcd9d971bdfc69fdb7ab9e46a65d03ec581527c5
-SIZE (KDE/Qt/6.8.2/12d4bf1ab52748cb84894f50d437064b439e0b7d.patch) = 1664
-SHA256 (KDE/Qt/6.8.2/2ef615228bba9a8eb282437bfb7472f925610e89.patch) = 57748ef981417d5d162dfe01e266634912b463392958a0c01766e8aad2ded55d
-SIZE (KDE/Qt/6.8.2/2ef615228bba9a8eb282437bfb7472f925610e89.patch) = 1872
-SHA256 (KDE/Qt/6.8.2/a43c7e58046604796aa69974ea1c5d3e2648c755.patch) = 6b96ba440ebbc8e024e4ca74d23d8e3edabf68e7213e22a0ab630bd7739090ba
-SIZE (KDE/Qt/6.8.2/a43c7e58046604796aa69974ea1c5d3e2648c755.patch) = 2113
+TIMESTAMP = 1743028326
+SHA256 (KDE/Qt/6.8.3/qtbase-everywhere-src-6.8.3.tar.xz) = 56001b905601bb9023d399f3ba780d7fa940f3e4861e496a7c490331f49e0b80
+SIZE (KDE/Qt/6.8.3/qtbase-everywhere-src-6.8.3.tar.xz) = 48426536
diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist
index 234940ae9b7d..dc65f9357fea 100644
--- a/devel/qt6-base/pkg-plist
+++ b/devel/qt6-base/pkg-plist
@@ -591,6 +591,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/QtProcessorDetection
 %%QT_INCDIR%%/QtCore/QtResource
 %%QT_INCDIR%%/QtCore/QtStartUpFunction
+%%QT_INCDIR%%/QtCore/QtStdLibDetection
 %%QT_INCDIR%%/QtCore/QtSwap
 %%QT_INCDIR%%/QtCore/QtSystemDetection
 %%QT_INCDIR%%/QtCore/QtTranslation
@@ -605,6 +606,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/q20map.h
 %%QT_INCDIR%%/QtCore/q20memory.h
 %%QT_INCDIR%%/QtCore/q20type_traits.h
+%%QT_INCDIR%%/QtCore/q20utility.h
 %%QT_INCDIR%%/QtCore/q20vector.h
 %%QT_INCDIR%%/QtCore/q23functional.h
 %%QT_INCDIR%%/QtCore/q23utility.h
@@ -789,6 +791,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/qstack.h
 %%QT_INCDIR%%/QtCore/qstandardpaths.h
 %%QT_INCDIR%%/QtCore/qstaticlatin1stringmatcher.h
+%%QT_INCDIR%%/QtCore/qstdlibdetection.h
 %%QT_INCDIR%%/QtCore/qstorageinfo.h
 %%QT_INCDIR%%/QtCore/qstring.h
 %%QT_INCDIR%%/QtCore/qstringalgorithms.h
@@ -2690,6 +2693,7 @@ lib/cmake/Qt6/QtPublicSbomLicenseHelpers.cmake
 lib/cmake/Qt6/QtPublicSbomOpsHelpers.cmake
 lib/cmake/Qt6/QtPublicSbomPurlHelpers.cmake
 lib/cmake/Qt6/QtPublicSbomPythonHelpers.cmake
+lib/cmake/Qt6/QtPublicSbomQtEntityHelpers.cmake
 lib/cmake/Qt6/QtPublicSbomSystemDepHelpers.cmake
 lib/cmake/Qt6/QtPublicTargetHelpers.cmake
 lib/cmake/Qt6/QtPublicTestHelpers.cmake
@@ -3068,6 +3072,14 @@ lib/cmake/Qt6Test/Qt6TestTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Qt6Test/Qt6TestTargets.cmake
 lib/cmake/Qt6Test/Qt6TestVersionlessAliasTargets.cmake
 lib/cmake/Qt6Test/Qt6TestVersionlessTargets.cmake
+lib/cmake/Qt6TestInternalsPrivate/3rdparty/cmake/QtRunCMakeTestHelpers.cmake
+lib/cmake/Qt6TestInternalsPrivate/3rdparty/cmake/RunCMake.cmake
+lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateConfig.cmake
+lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateConfigVersion.cmake
+lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateConfigVersionImpl.cmake
+lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateTargets.cmake
+lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateVersionlessAliasTargets.cmake
+lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateVersionlessTargets.cmake
 lib/cmake/Qt6Widgets/Qt6WidgetsAdditionalTargetInfo.cmake
 lib/cmake/Qt6Widgets/Qt6WidgetsConfig.cmake
 lib/cmake/Qt6Widgets/Qt6WidgetsConfigVersion.cmake
@@ -3200,8 +3212,6 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_LIBDIR%%/metatypes/qt6widgets_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%X11%%%%QT_LIBDIR%%/metatypes/qt6xcbqpaprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6xml_%%CMAKE_BUILD_TYPE%%_metatypes.json
-%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
-%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
 %%QT_MKSPECDIR%%/REUSE.toml
 %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf
 %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h
@@ -3376,7 +3386,6 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/features/data/configure.json
 %%QT_MKSPECDIR%%/features/data/dummy.cpp
 %%QT_MKSPECDIR%%/features/data/dumpvcvars.bat
-%%QT_MKSPECDIR%%/features/data/mac/objc_namespace.sh
 %%QT_MKSPECDIR%%/features/data/macros.cpp
 %%QT_MKSPECDIR%%/features/data/testserver/Dockerfile
 %%QT_MKSPECDIR%%/features/data/testserver/docker-compose-common.yml
@@ -3605,6 +3614,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/modules/qt_lib_printsupport_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_sql.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_sql_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_testinternals_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_testlib.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_testlib_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_widgets.pri
@@ -3679,6 +3689,8 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/win32-icc/qplatformdefs.h
 %%QT_MKSPECDIR%%/win32-msvc/qmake.conf
 %%QT_MKSPECDIR%%/win32-msvc/qplatformdefs.h
+%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
+%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
 %%QT_PLUGINDIR%%/generic/libqevdevkeyboardplugin.so
 %%QT_PLUGINDIR%%/generic/libqevdevmouseplugin.so
 %%QT_PLUGINDIR%%/generic/libqevdevtabletplugin.so
@@ -3837,8 +3849,6 @@ libdata/pkgconfig/Qt6Xml.pc
 %%QT_DOCDIR%%/global/template/images/header_bg.png
 %%QT_DOCDIR%%/global/template/images/home.png
 %%QT_DOCDIR%%/global/template/images/horBar.png
-%%QT_DOCDIR%%/global/template/images/ico_note.png
-%%QT_DOCDIR%%/global/template/images/ico_note_attention.png
 %%QT_DOCDIR%%/global/template/images/ico_out.png
 %%QT_DOCDIR%%/global/template/images/logo.png
 %%QT_DOCDIR%%/global/template/images/page.png
@@ -3881,6 +3891,7 @@ libdata/pkgconfig/Qt6Xml.pc
 %%QT_DATADIR%%/modules/PrintSupport.json
 %%QT_DATADIR%%/modules/Sql.json
 %%QT_DATADIR%%/modules/Test.json
+%%QT_DATADIR%%/modules/TestInternalsPrivate.json
 %%QT_DATADIR%%/modules/Widgets.json
 %%X11%%%%QT_DATADIR%%/modules/XcbQpaPrivate.json
 %%QT_DATADIR%%/modules/Xml.json
diff --git a/devel/qt6-grpc/Makefile b/devel/qt6-grpc/Makefile
index 092ca61b2f0d..75095af4897b 100644
--- a/devel/qt6-grpc/Makefile
+++ b/devel/qt6-grpc/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	grpc
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
diff --git a/devel/qt6-grpc/distinfo b/devel/qt6-grpc/distinfo
index a01f21b90f24..debaf235940d 100644
--- a/devel/qt6-grpc/distinfo
+++ b/devel/qt6-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340232
-SHA256 (KDE/Qt/6.8.2/qtgrpc-everywhere-src-6.8.2.tar.xz) = 8c65f10dda181024aa1c603e0b5d734c3d06df4001e312a6d93edc58bc6936db
-SIZE (KDE/Qt/6.8.2/qtgrpc-everywhere-src-6.8.2.tar.xz) = 493488
+TIMESTAMP = 1743027810
+SHA256 (KDE/Qt/6.8.3/qtgrpc-everywhere-src-6.8.3.tar.xz) = 052fa489d1c45b9df27319ee614f1534e49c9103a8b504024ab7e2c9e5b0849b
+SIZE (KDE/Qt/6.8.3/qtgrpc-everywhere-src-6.8.3.tar.xz) = 606692
diff --git a/devel/qt6-grpc/pkg-plist b/devel/qt6-grpc/pkg-plist
index 00db147afe0a..cd4ce204373c 100644
--- a/devel/qt6-grpc/pkg-plist
+++ b/devel/qt6-grpc/pkg-plist
@@ -53,6 +53,7 @@
 %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/protobufscalarjsonserializers_p.h
 %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/protobufscalarserializers_p.h
 %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qprotobufdeserializerbase_p.h
+%%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qprotobufjsonserializer_p.h
 %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qprotobufmessage_p.h
 %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qprotobufpropertyorderingbuilder_p.h
 %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qprotobufregistration_p.h
@@ -117,6 +118,7 @@
 %%QT_INCDIR%%/QtProtobufQuick/QtProtobufQuickVersion
 %%QT_INCDIR%%/QtProtobufQuick/qtprotobufquickexports.h
 %%QT_INCDIR%%/QtProtobufQuick/qtprotobufquickversion.h
+%%QT_INCDIR%%/QtProtobufWellKnownTypes/%%FULLVER%%/QtProtobufWellKnownTypes/private/qprotobufwellknowntypesjsonserializers_p.h
 %%QT_INCDIR%%/QtProtobufWellKnownTypes/QtProtobufWellKnownTypes
 %%QT_INCDIR%%/QtProtobufWellKnownTypes/QtProtobufWellKnownTypesDepends
 %%QT_INCDIR%%/QtProtobufWellKnownTypes/QtProtobufWellKnownTypesVersion
diff --git a/devel/qt6-languageserver/distinfo b/devel/qt6-languageserver/distinfo
index 59bda94c71a2..4a2344f516f2 100644
--- a/devel/qt6-languageserver/distinfo
+++ b/devel/qt6-languageserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340233
-SHA256 (KDE/Qt/6.8.2/qtlanguageserver-everywhere-src-6.8.2.tar.xz) = 9eeb74ac15334c08777548c01e4ede80a4e2d36f1ebcb322423f24f14c2785fb
-SIZE (KDE/Qt/6.8.2/qtlanguageserver-everywhere-src-6.8.2.tar.xz) = 150280
+TIMESTAMP = 1743027811
+SHA256 (KDE/Qt/6.8.3/qtlanguageserver-everywhere-src-6.8.3.tar.xz) = e4d320073c55b3a418a784e7866c43bc3e3d52817368be56e7d468866ff8b469
+SIZE (KDE/Qt/6.8.3/qtlanguageserver-everywhere-src-6.8.3.tar.xz) = 152144
diff --git a/devel/qt6-location/Makefile b/devel/qt6-location/Makefile
index d740988f1373..7579c1d8daba 100644
--- a/devel/qt6-location/Makefile
+++ b/devel/qt6-location/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	location
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
diff --git a/devel/qt6-location/distinfo b/devel/qt6-location/distinfo
index 7f40ce6226a3..533a5b1f7a74 100644
--- a/devel/qt6-location/distinfo
+++ b/devel/qt6-location/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340234
-SHA256 (KDE/Qt/6.8.2/qtlocation-everywhere-src-6.8.2.tar.xz) = 93490bcb416b8602ead6f335fb97f82c996e13bb8af25ea991f541a39b7d1719
-SIZE (KDE/Qt/6.8.2/qtlocation-everywhere-src-6.8.2.tar.xz) = 3164164
+TIMESTAMP = 1743027812
+SHA256 (KDE/Qt/6.8.3/qtlocation-everywhere-src-6.8.3.tar.xz) = 1d05e95aa5b6bd26bffa004cd8c5c70ae2af649496010a1a70124293bc09fd43
+SIZE (KDE/Qt/6.8.3/qtlocation-everywhere-src-6.8.3.tar.xz) = 3165768
diff --git a/devel/qt6-positioning/Makefile b/devel/qt6-positioning/Makefile
index c28742f0871d..f327789ce99c 100644
--- a/devel/qt6-positioning/Makefile
+++ b/devel/qt6-positioning/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	positioning
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
diff --git a/devel/qt6-positioning/distinfo b/devel/qt6-positioning/distinfo
index 28a5fc7afbec..f47b5b933afb 100644
--- a/devel/qt6-positioning/distinfo
+++ b/devel/qt6-positioning/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340234
-SHA256 (KDE/Qt/6.8.2/qtpositioning-everywhere-src-6.8.2.tar.xz) = df30664f4e936466a7e1157ff26abc61efb5e94c9eb8750e1bcdffeec95db8e5
-SIZE (KDE/Qt/6.8.2/qtpositioning-everywhere-src-6.8.2.tar.xz) = 661464
+TIMESTAMP = 1743027813
+SHA256 (KDE/Qt/6.8.3/qtpositioning-everywhere-src-6.8.3.tar.xz) = 6ab69a7e71a7795aab9ca2798eea126e36df55159a771ebd2f37cad3da63e9d3
+SIZE (KDE/Qt/6.8.3/qtpositioning-everywhere-src-6.8.3.tar.xz) = 663612
diff --git a/devel/qt6-remoteobjects/Makefile b/devel/qt6-remoteobjects/Makefile
index 771d578a8c1b..bad7f03b807d 100644
--- a/devel/qt6-remoteobjects/Makefile
+++ b/devel/qt6-remoteobjects/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	remoteobjects
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
diff --git a/devel/qt6-remoteobjects/distinfo b/devel/qt6-remoteobjects/distinfo
index ce152ab4dc58..28b3436baec3 100644
--- a/devel/qt6-remoteobjects/distinfo
+++ b/devel/qt6-remoteobjects/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340235
-SHA256 (KDE/Qt/6.8.2/qtremoteobjects-everywhere-src-6.8.2.tar.xz) = d02ad3ede11b0bbf8187cb79227383aed5b4538107b522d1249eab7b1b5eb629
-SIZE (KDE/Qt/6.8.2/qtremoteobjects-everywhere-src-6.8.2.tar.xz) = 537584
+TIMESTAMP = 1743027814
+SHA256 (KDE/Qt/6.8.3/qtremoteobjects-everywhere-src-6.8.3.tar.xz) = 5a40d1a67c2e02911f3014977cdce59eb49e8af2c82f4e18c06ce7031744aeaf
+SIZE (KDE/Qt/6.8.3/qtremoteobjects-everywhere-src-6.8.3.tar.xz) = 539556
diff --git a/devel/qt6-scxml/Makefile b/devel/qt6-scxml/Makefile
index 0d9bbcaa61a3..f4d9f29cb3b4 100644
--- a/devel/qt6-scxml/Makefile
+++ b/devel/qt6-scxml/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	scxml
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
diff --git a/devel/qt6-scxml/distinfo b/devel/qt6-scxml/distinfo
index 83dc2d45fa58..30fb702b293c 100644
--- a/devel/qt6-scxml/distinfo
+++ b/devel/qt6-scxml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340236
-SHA256 (KDE/Qt/6.8.2/qtscxml-everywhere-src-6.8.2.tar.xz) = 683c4a11a24001e901cc84853723046a1ba27004bcc06680a72eaac6cf8ea193
-SIZE (KDE/Qt/6.8.2/qtscxml-everywhere-src-6.8.2.tar.xz) = 558848
+TIMESTAMP = 1743027815
+SHA256 (KDE/Qt/6.8.3/qtscxml-everywhere-src-6.8.3.tar.xz) = dbac976ab7299fb782dfc4c1e4bb1cafc059929bef2271a275f11d97ce7f2f5c
+SIZE (KDE/Qt/6.8.3/qtscxml-everywhere-src-6.8.3.tar.xz) = 560632
diff --git a/devel/qt6-tools/Makefile b/devel/qt6-tools/Makefile
index ac5626146844..f698e7729c97 100644
--- a/devel/qt6-tools/Makefile
+++ b/devel/qt6-tools/Makefile
@@ -20,11 +20,11 @@ CMAKE_ARGS+=	-DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \
 		-DLLVM_DIR:PATH="${LLVM_PREFIX}/lib/cmake/llvm"
 
 post-install:
-	# Install symlinks for user-facing tools
-	${REINPLACE_CMD} -e "s#^#${STAGEDIR}#" -e "s# # ${STAGEDIR}#" \
-		${WRKDIR}/.build/user_facing_tool_links.txt
-	while read t; do \
-		${RLN} $$t; \
-	done <${WRKDIR}/.build/user_facing_tool_links.txt
+# Install symlinks for user-facing tools
+	while read line; do \
+		source="$$(${ECHO_CMD} $${line} | ${AWK} '{print $$1}')"; \
+		target="${STAGEDIR}${PREFIX}/$$(${ECHO_CMD} $${line} | ${AWK} '{print $$2}')"; \
+		${RLN} $${source} $${target}; \
+	done <${BUILD_WRKSRC}/user_facing_tool_links.txt
 
 .include <bsd.port.mk>
diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo
index cd5a7812021e..4f4bffa3c67c 100644
--- a/devel/qt6-tools/distinfo
+++ b/devel/qt6-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340236
-SHA256 (KDE/Qt/6.8.2/qttools-everywhere-src-6.8.2.tar.xz) = 326381b7d43f07913612f291abc298ae79bd95382e2233abce982cff2b53d2c0
-SIZE (KDE/Qt/6.8.2/qttools-everywhere-src-6.8.2.tar.xz) = 10297596
+TIMESTAMP = 1743027817
+SHA256 (KDE/Qt/6.8.3/qttools-everywhere-src-6.8.3.tar.xz) = 02a4e219248b94f1333df843d25763f35251c1074cdc4fb5bda67d340f8c8b3a
+SIZE (KDE/Qt/6.8.3/qttools-everywhere-src-6.8.3.tar.xz) = 10301984
diff --git a/devel/qt6-translations/distinfo b/devel/qt6-translations/distinfo
index 32f5ec99e6e4..2a2c0176489d 100644
--- a/devel/qt6-translations/distinfo
+++ b/devel/qt6-translations/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340237
-SHA256 (KDE/Qt/6.8.2/qttranslations-everywhere-src-6.8.2.tar.xz) = d2106e8a580bfd77702c4c1840299288d344902b0e2c758ca813ea04c6d6a3d1
-SIZE (KDE/Qt/6.8.2/qttranslations-everywhere-src-6.8.2.tar.xz) = 1550960
+TIMESTAMP = 1743027818
+SHA256 (KDE/Qt/6.8.3/qttranslations-everywhere-src-6.8.3.tar.xz) = c3c61d79c3d8fe316a20b3617c64673ce5b5519b2e45535f49bee313152fa531
+SIZE (KDE/Qt/6.8.3/qttranslations-everywhere-src-6.8.3.tar.xz) = 1577680
diff --git a/devel/qt6-translations/pkg-plist b/devel/qt6-translations/pkg-plist
index 18cc51882b87..efd426236584 100644
--- a/devel/qt6-translations/pkg-plist
+++ b/devel/qt6-translations/pkg-plist
@@ -116,6 +116,7 @@
 %%QT_L10NDIR%%/qt_ja.qm
 %%QT_L10NDIR%%/qt_ka.qm
 %%QT_L10NDIR%%/qt_ko.qm
+%%QT_L10NDIR%%/qt_lg.qm
 %%QT_L10NDIR%%/qt_lt.qm
 %%QT_L10NDIR%%/qt_lv.qm
 %%QT_L10NDIR%%/qt_nl.qm
@@ -150,6 +151,7 @@
 %%QT_L10NDIR%%/qtbase_ja.qm
 %%QT_L10NDIR%%/qtbase_ka.qm
 %%QT_L10NDIR%%/qtbase_ko.qm
+%%QT_L10NDIR%%/qtbase_lg.qm
 %%QT_L10NDIR%%/qtbase_lv.qm
 %%QT_L10NDIR%%/qtbase_nl.qm
 %%QT_L10NDIR%%/qtbase_nn.qm
diff --git a/devel/qt6/Makefile b/devel/qt6/Makefile
index ef815c0d2e94..c4e795320e42 100644
--- a/devel/qt6/Makefile
+++ b/devel/qt6/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	qt6
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo
index da91cfd3bcc5..ca5e0d182e35 100644
--- a/devel/shiboken6/distinfo
+++ b/devel/shiboken6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738430156
-SHA256 (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 8422e9aa403f4119e3192853e9b0cfa09e57e3e0a1a3393e7fdf394179c112f8
-SIZE (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 16609596
+TIMESTAMP = 1743103533
+SHA256 (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = d2c896f7f1a6a7ea4c9f98cfe317272fd139703ddf612b86999f09e48aeef0e6
+SIZE (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = 16611768
diff --git a/graphics/qt6-3d/distinfo b/graphics/qt6-3d/distinfo
index c9f57fe2e51b..71a862ac7676 100644
--- a/graphics/qt6-3d/distinfo
+++ b/graphics/qt6-3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340238
-SHA256 (KDE/Qt/6.8.2/qt3d-everywhere-src-6.8.2.tar.xz) = 577a6352f091a8d5fd087a0ac948befb185583959ee4048009073f0b377b8c44
-SIZE (KDE/Qt/6.8.2/qt3d-everywhere-src-6.8.2.tar.xz) = 141821364
+TIMESTAMP = 1743027820
+SHA256 (KDE/Qt/6.8.3/qt3d-everywhere-src-6.8.3.tar.xz) = 095e1be77ffd4b158d9e57f16ee898caf7d0d6e5406f466d9d8315d5b1e79563
+SIZE (KDE/Qt/6.8.3/qt3d-everywhere-src-6.8.3.tar.xz) = 141825440
diff --git a/graphics/qt6-imageformats/distinfo b/graphics/qt6-imageformats/distinfo
index 8faa325636f1..8a22165874ed 100644
--- a/graphics/qt6-imageformats/distinfo
+++ b/graphics/qt6-imageformats/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340239
-SHA256 (KDE/Qt/6.8.2/qtimageformats-everywhere-src-6.8.2.tar.xz) = d2a1bbb84707b8a0aec29227b170be00f04383fbf2361943596d09e7e443c8e1
-SIZE (KDE/Qt/6.8.2/qtimageformats-everywhere-src-6.8.2.tar.xz) = 2036976
+TIMESTAMP = 1743027821
+SHA256 (KDE/Qt/6.8.3/qtimageformats-everywhere-src-6.8.3.tar.xz) = 049bfb99845e4801672aca07c3c4fc4c140f932a3a33faa899419579e33ef1c8
+SIZE (KDE/Qt/6.8.3/qtimageformats-everywhere-src-6.8.3.tar.xz) = 2035140
diff --git a/graphics/qt6-lottie/Makefile b/graphics/qt6-lottie/Makefile
index 353267352e2c..9bdc71a88aa9 100644
--- a/graphics/qt6-lottie/Makefile
+++ b/graphics/qt6-lottie/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	lottie
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt6-
 
diff --git a/graphics/qt6-lottie/distinfo b/graphics/qt6-lottie/distinfo
index ac1f3025f2b9..640bfd5c085d 100644
--- a/graphics/qt6-lottie/distinfo
+++ b/graphics/qt6-lottie/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340240
-SHA256 (KDE/Qt/6.8.2/qtlottie-everywhere-src-6.8.2.tar.xz) = 5ed43eb20d0393dd05c890fb3548deb3b82bad6b0265c12d4995940b238ebe20
-SIZE (KDE/Qt/6.8.2/qtlottie-everywhere-src-6.8.2.tar.xz) = 84196
+TIMESTAMP = 1743027822
+SHA256 (KDE/Qt/6.8.3/qtlottie-everywhere-src-6.8.3.tar.xz) = d732e754497a1295c4f512312828a11551fe89433259af9ee9f1e62bb7263d24
+SIZE (KDE/Qt/6.8.3/qtlottie-everywhere-src-6.8.3.tar.xz) = 86104
diff --git a/graphics/qt6-quickeffectmaker/distinfo b/graphics/qt6-quickeffectmaker/distinfo
index 4916f52400dc..b3ce55f962a0 100644
--- a/graphics/qt6-quickeffectmaker/distinfo
+++ b/graphics/qt6-quickeffectmaker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340241
-SHA256 (KDE/Qt/6.8.2/qtquickeffectmaker-everywhere-src-6.8.2.tar.xz) = 4fcf3c5893172816dfdc438bd4b6b105e15eafd4aeb9c5ac48ea6d7d720e607c
-SIZE (KDE/Qt/6.8.2/qtquickeffectmaker-everywhere-src-6.8.2.tar.xz) = 4348100
+TIMESTAMP = 1743027823
+SHA256 (KDE/Qt/6.8.3/qtquickeffectmaker-everywhere-src-6.8.3.tar.xz) = cff4818ea0de7d1e0b9ab221faca6266d328dd97aa79bf9f0085390cac4dba07
+SIZE (KDE/Qt/6.8.3/qtquickeffectmaker-everywhere-src-6.8.3.tar.xz) = 4350080
diff --git a/graphics/qt6-svg/distinfo b/graphics/qt6-svg/distinfo
index 336a55337d84..ab2172d69665 100644
--- a/graphics/qt6-svg/distinfo
+++ b/graphics/qt6-svg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340241
-SHA256 (KDE/Qt/6.8.2/qtsvg-everywhere-src-6.8.2.tar.xz) = aa2579f21ca66d19cbcf31d87e9067e07932635d36869c8239d4decd0a9dc1fa
-SIZE (KDE/Qt/6.8.2/qtsvg-everywhere-src-6.8.2.tar.xz) = 2006996
+TIMESTAMP = 1743027824
+SHA256 (KDE/Qt/6.8.3/qtsvg-everywhere-src-6.8.3.tar.xz) = 35eb516460f00f264eb504baa253432384351cf23fb9980a5857190e8deef438
+SIZE (KDE/Qt/6.8.3/qtsvg-everywhere-src-6.8.3.tar.xz) = 2009072
diff --git a/graphics/qt6-wayland/distinfo b/graphics/qt6-wayland/distinfo
index 8ef74b9b6b35..56feec3c1381 100644
--- a/graphics/qt6-wayland/distinfo
+++ b/graphics/qt6-wayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340242
-SHA256 (KDE/Qt/6.8.2/qtwayland-everywhere-src-6.8.2.tar.xz) = 5e46157908295f2bf924462d8c0855b0508ba338ced9e810891fefa295dc9647
-SIZE (KDE/Qt/6.8.2/qtwayland-everywhere-src-6.8.2.tar.xz) = 1138764
+TIMESTAMP = 1743027825
+SHA256 (KDE/Qt/6.8.3/qtwayland-everywhere-src-6.8.3.tar.xz) = 20fe385887d21190165a3180c17dcfc8b9a0e1da4ec76865b6334bdc709994b0
+SIZE (KDE/Qt/6.8.3/qtwayland-everywhere-src-6.8.3.tar.xz) = 1141132
diff --git a/misc/qt6-doc/distinfo b/misc/qt6-doc/distinfo
index 19537b6d7d78..01debb859f82 100644
--- a/misc/qt6-doc/distinfo
+++ b/misc/qt6-doc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340243
-SHA256 (KDE/Qt/6.8.2/qtdoc-everywhere-src-6.8.2.tar.xz) = b3ce5b04c5c950ed3052b247d10ca6929319f03dc276cc2bd8884dad9e555dc5
-SIZE (KDE/Qt/6.8.2/qtdoc-everywhere-src-6.8.2.tar.xz) = 46012392
+TIMESTAMP = 1743027827
+SHA256 (KDE/Qt/6.8.3/qtdoc-everywhere-src-6.8.3.tar.xz) = f55371489e97325ec8e9e8683ec6f9f581a20a8b27736e2b4df8a8414fddeb59
+SIZE (KDE/Qt/6.8.3/qtdoc-everywhere-src-6.8.3.tar.xz) = 46015000
diff --git a/misc/qt6-doc/pkg-plist b/misc/qt6-doc/pkg-plist
index 4f3189464163..2964c6d79ffc 100644
--- a/misc/qt6-doc/pkg-plist
+++ b/misc/qt6-doc/pkg-plist
@@ -18,8 +18,6 @@
 %%QT_DOCDIR%%/qtcmake/images/bullet_dn.png
 %%QT_DOCDIR%%/qtcmake/images/bullet_sq.png
 %%QT_DOCDIR%%/qtcmake/images/home.png
-%%QT_DOCDIR%%/qtcmake/images/ico_note.png
-%%QT_DOCDIR%%/qtcmake/images/ico_note_attention.png
 %%QT_DOCDIR%%/qtcmake/images/ico_out.png
 %%QT_DOCDIR%%/qtcmake/images/logo.png
 %%QT_DOCDIR%%/qtcmake/qt-cmake-policies.html
@@ -145,8 +143,6 @@
 %%QT_DOCDIR%%/qtdoc/images/home.png
 %%QT_DOCDIR%%/qtdoc/images/iOS_Dark.png
 %%QT_DOCDIR%%/qtdoc/images/iOS_Light.png
-%%QT_DOCDIR%%/qtdoc/images/ico_note.png
-%%QT_DOCDIR%%/qtdoc/images/ico_note_attention.png
 %%QT_DOCDIR%%/qtdoc/images/ico_out.png
 %%QT_DOCDIR%%/qtdoc/images/integrity-os.png
 %%QT_DOCDIR%%/qtdoc/images/ios.webp
@@ -455,8 +451,6 @@
 %%QT_DOCDIR%%/qtplatformintegration/images/bullet_dn.png
 %%QT_DOCDIR%%/qtplatformintegration/images/bullet_sq.png
 %%QT_DOCDIR%%/qtplatformintegration/images/home.png
-%%QT_DOCDIR%%/qtplatformintegration/images/ico_note.png
-%%QT_DOCDIR%%/qtplatformintegration/images/ico_note_attention.png
 %%QT_DOCDIR%%/qtplatformintegration/images/ico_out.png
 %%QT_DOCDIR%%/qtplatformintegration/images/logo.png
 %%QT_DOCDIR%%/qtplatformintegration/native-interfaces.html
diff --git a/misc/qt6-examples/distinfo b/misc/qt6-examples/distinfo
index e42a579b8a14..8dd7ead3b246 100644
--- a/misc/qt6-examples/distinfo
+++ b/misc/qt6-examples/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340268
-SHA256 (KDE/Qt/6.8.2/qt-everywhere-src-6.8.2.tar.xz) = 659d8bb5931afac9ed5d89a78e868e6bd00465a58ab566e2123db02d674be559
-SIZE (KDE/Qt/6.8.2/qt-everywhere-src-6.8.2.tar.xz) = 994278216
+TIMESTAMP = 1743027852
+SHA256 (KDE/Qt/6.8.3/qt-everywhere-src-6.8.3.tar.xz) = cdd3a69967208276bb01af7ace7dba0ba53e679f886a4cbe624225c60fb73f2c
+SIZE (KDE/Qt/6.8.3/qt-everywhere-src-6.8.3.tar.xz) = 994812276
diff --git a/misc/qt6-examples/pkg-plist b/misc/qt6-examples/pkg-plist
index 3a3e22a0ede8..0ec028939e0e 100644
--- a/misc/qt6-examples/pkg-plist
+++ b/misc/qt6-examples/pkg-plist
@@ -3052,6 +3052,8 @@
 %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/qmlcamera.cpp
 %%QT_EXAMPLEDIR%%/multimedia/multimedia.pro
 %%QT_EXAMPLEDIR%%/multimedia/player/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/multimedia/player/audiolevelmeter.cpp
+%%QT_EXAMPLEDIR%%/multimedia/player/audiolevelmeter.h
 %%QT_EXAMPLEDIR%%/multimedia/player/doc/images/mediaplayerex.jpg
 %%QT_EXAMPLEDIR%%/multimedia/player/doc/src/player.qdoc
 %%QT_EXAMPLEDIR%%/multimedia/player/main.cpp
@@ -3121,21 +3123,15 @@
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/Info.plist.in
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/doc/images/qmlvideo-menu.jpg
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/doc/images/qmlvideo-overlay.jpg
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/doc/images/video-qml-paint-rate.png
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/doc/src/qmlvideo.qdoc
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor.cpp
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor.h
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor/FrequencyItem.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor/PerformanceItem.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor/frequencymonitor.cpp
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor/frequencymonitor.h
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor/qmldir
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitordeclarative.cpp
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/main.cpp
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitor.cpp
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitor.h
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitor/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitor/PerformanceItem.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitor/qmldir
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitordeclarative.cpp
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitordeclarative.h
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.png
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.pro
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.svg
@@ -3760,6 +3756,7 @@
 %%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/java/com/example/qtabstractitemmodel_java/MyDataModel.java
 %%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/drawable/ic_launcher_background.xml
 %%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/drawable/ic_launcher_foreground.xml
+%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/layout-land/activity_main.xml
 %%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/layout/activity_main.xml
 %%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 %%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -3847,6 +3844,7 @@
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/drawable/ic_launcher_foreground.xml
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/drawable/switch_thumb.xml
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/drawable/switch_track.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/layout-land/activity_main.xml
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/layout/activity_main.xml
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -3889,6 +3887,7 @@
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/drawable/ic_launcher_foreground.xml
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/drawable/switch_thumb.xml
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/drawable/switch_track.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/layout-land/activity_main.xml
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/layout/activity_main.xml
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 %%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/multimedia/qt6-multimedia/Makefile b/multimedia/qt6-multimedia/Makefile
index 3f33e1528b69..6cfb8fc62768 100644
--- a/multimedia/qt6-multimedia/Makefile
+++ b/multimedia/qt6-multimedia/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	multimedia
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	2
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	qt6-
 
diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo
index b95b9fdb977a..26709f63bb7c 100644
--- a/multimedia/qt6-multimedia/distinfo
+++ b/multimedia/qt6-multimedia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738340269
-SHA256 (KDE/Qt/6.8.2/qtmultimedia-everywhere-src-6.8.2.tar.xz) = 34f561fdc07b158bcc4ad040b596fc6086c48908060e854b473b557e4feb1569
-SIZE (KDE/Qt/6.8.2/qtmultimedia-everywhere-src-6.8.2.tar.xz) = 9646120
+TIMESTAMP = 1743027853
+SHA256 (KDE/Qt/6.8.3/qtmultimedia-everywhere-src-6.8.3.tar.xz) = 32e82307d783172a3b984cc3c47c5e4e8b819cee3cbfc702c7012c47f15f6b01
+SIZE (KDE/Qt/6.8.3/qtmultimedia-everywhere-src-6.8.3.tar.xz) = 9705340
diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__instance.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__instance.cpp
new file mode 100644
index 000000000000..9139b9f3957a
--- /dev/null
+++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__instance.cpp
@@ -0,0 +1,24 @@
+Adapt to local symbols from multimedia/pipewire
+
+PR: 284719
+
+--- src/multimedia/pipewire/qpipewire_instance.cpp.orig	2025-02-20 14:13:07 UTC
++++ src/multimedia/pipewire/qpipewire_instance.cpp
+@@ -43,7 +43,7 @@ QPipeWireInstance::QPipeWireInstance()
+ 
+ QPipeWireInstance::QPipeWireInstance()
+ {
+-    pw_init(nullptr, nullptr);
++    pipewire_init(nullptr, nullptr);
+ 
+     qCDebug(lcPipewire) << "PipeWire initialized: compiled against" << pw_get_headers_version()
+                         << " running " << pw_get_library_version();
+@@ -52,7 +52,7 @@ QPipeWireInstance::~QPipeWireInstance()
+ QPipeWireInstance::~QPipeWireInstance()
+ {
+     if (pw_check_library_version(0, 3, 49))
+-        pw_deinit();
++        pipewire_deinit();
+ }
+ 
+ } // namespace QtPipeWire
diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__screencapturehelper.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__screencapturehelper.cpp
deleted file mode 100644
index cc8aaec88e6a..000000000000
--- a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__screencapturehelper.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-Adapt to local symbols from multimedia/pipewire
-
*** 777 LINES SKIPPED ***