pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Update qt6 to version 6.4.0



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Sat Oct 1 10:25:08 2022 +0200
Changeset:	7c2fb20a0b6a10f6d5820d620dc5df7be3dff4c5

Modified Files:
	qt6-odbc/buildlink3.mk
	qt6-odbc/distinfo
	qt6-psql/buildlink3.mk
	qt6-psql/distinfo
	qt6-qt3d/PLIST
	qt6-qt3d/buildlink3.mk
	qt6-qt3d/distinfo
	qt6-qt5compat/Makefile
	qt6-qt5compat/PLIST
	qt6-qt5compat/buildlink3.mk
	qt6-qt5compat/distinfo
	qt6-qtbase/Makefile.common
	qt6-qtbase/PLIST
	qt6-qtbase/buildlink3.mk
	qt6-qtbase/distinfo
	qt6-qtcharts/buildlink3.mk
	qt6-qtcharts/distinfo
	qt6-qtdatavis3d/buildlink3.mk
	qt6-qtdatavis3d/distinfo
	qt6-qtdeclarative/PLIST
	qt6-qtdeclarative/buildlink3.mk
	qt6-qtdeclarative/distinfo
	qt6-qtimageformats/buildlink3.mk
	qt6-qtimageformats/distinfo
	qt6-qtlanguageserver/buildlink3.mk
	qt6-qtlanguageserver/distinfo
	qt6-qtlottie/distinfo
	qt6-qtmultimedia/Makefile
	qt6-qtmultimedia/PLIST
	qt6-qtmultimedia/buildlink3.mk
	qt6-qtmultimedia/distinfo
	qt6-qtmultimedia/options.mk
	qt6-qtnetworkauth/buildlink3.mk
	qt6-qtnetworkauth/distinfo
	qt6-qtquick3d/PLIST
	qt6-qtquick3d/buildlink3.mk
	qt6-qtquick3d/distinfo
	qt6-qtquicktimeline/buildlink3.mk
	qt6-qtquicktimeline/distinfo
	qt6-qtremoteobjects/buildlink3.mk
	qt6-qtremoteobjects/distinfo
	qt6-qtscxml/PLIST
	qt6-qtscxml/buildlink3.mk
	qt6-qtscxml/distinfo
	qt6-qtshadertools/buildlink3.mk
	qt6-qtshadertools/distinfo
	qt6-qtsvg/buildlink3.mk
	qt6-qtsvg/distinfo
	qt6-qttools/Makefile
	qt6-qttools/PLIST
	qt6-qttools/buildlink3.mk
	qt6-qttools/distinfo
	qt6-qtwayland/Makefile
	qt6-qtwayland/PLIST
	qt6-qtwayland/buildlink3.mk
	qt6-qtwayland/distinfo
	qt6-qtwebchannel/buildlink3.mk
	qt6-qtwebchannel/distinfo
	qt6-qtwebsockets/PLIST
	qt6-qtwebsockets/buildlink3.mk
	qt6-qtwebsockets/distinfo
	qt6/Makefile.common
Removed Files:
	qt6-qtbase/patches/patch-src_corelib_thread_qthread__unix.cpp
	qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter.cpp
	qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter__p.h

Log Message:
Update qt6 to version 6.4.0

Update qt6 to version 6.4.0 .

Includes tons of fixes.
Includes some of our patches.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7c2fb20a0b6a10f6d5820d620dc5df7be3dff4c5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qt6-odbc/buildlink3.mk                             |   2 +-
 qt6-odbc/distinfo                                  |   6 +-
 qt6-psql/buildlink3.mk                             |   2 +-
 qt6-psql/distinfo                                  |   6 +-
 qt6-qt3d/PLIST                                     |   1 +
 qt6-qt3d/buildlink3.mk                             |   2 +-
 qt6-qt3d/distinfo                                  |   6 +-
 qt6-qt5compat/Makefile                             |   1 +
 qt6-qt5compat/PLIST                                |  14 ++
 qt6-qt5compat/buildlink3.mk                        |   2 +-
 qt6-qt5compat/distinfo                             |   6 +-
 qt6-qtbase/Makefile.common                         |   1 -
 qt6-qtbase/PLIST                                   |  42 +++-
 qt6-qtbase/buildlink3.mk                           |   5 +-
 qt6-qtbase/distinfo                                |   7 +-
 .../patch-src_corelib_thread_qthread__unix.cpp     |  21 --
 qt6-qtcharts/buildlink3.mk                         |   2 +-
 qt6-qtcharts/distinfo                              |   6 +-
 qt6-qtdatavis3d/buildlink3.mk                      |   2 +-
 qt6-qtdatavis3d/distinfo                           |   6 +-
 qt6-qtdeclarative/PLIST                            |  79 ++++---
 qt6-qtdeclarative/buildlink3.mk                    |   2 +-
 qt6-qtdeclarative/distinfo                         |   6 +-
 qt6-qtimageformats/buildlink3.mk                   |   2 +-
 qt6-qtimageformats/distinfo                        |   6 +-
 qt6-qtlanguageserver/buildlink3.mk                 |   2 +-
 qt6-qtlanguageserver/distinfo                      |   6 +-
 qt6-qtlottie/distinfo                              |   6 +-
 qt6-qtmultimedia/Makefile                          |   3 +
 qt6-qtmultimedia/PLIST                             | 228 ++++++++++-----------
 qt6-qtmultimedia/buildlink3.mk                     |   2 +-
 qt6-qtmultimedia/distinfo                          |   6 +-
 qt6-qtmultimedia/options.mk                        |  13 +-
 qt6-qtnetworkauth/buildlink3.mk                    |   2 +-
 qt6-qtnetworkauth/distinfo                         |   6 +-
 qt6-qtquick3d/PLIST                                |  56 +++--
 qt6-qtquick3d/buildlink3.mk                        |   2 +-
 qt6-qtquick3d/distinfo                             |   6 +-
 qt6-qtquicktimeline/buildlink3.mk                  |   2 +-
 qt6-qtquicktimeline/distinfo                       |   6 +-
 qt6-qtremoteobjects/buildlink3.mk                  |   2 +-
 qt6-qtremoteobjects/distinfo                       |   6 +-
 qt6-qtscxml/PLIST                                  |   1 +
 qt6-qtscxml/buildlink3.mk                          |   2 +-
 qt6-qtscxml/distinfo                               |   6 +-
 qt6-qtshadertools/buildlink3.mk                    |   2 +-
 qt6-qtshadertools/distinfo                         |   6 +-
 qt6-qtsvg/buildlink3.mk                            |   2 +-
 qt6-qtsvg/distinfo                                 |   6 +-
 qt6-qttools/Makefile                               |   2 +
 qt6-qttools/PLIST                                  |   5 +-
 qt6-qttools/buildlink3.mk                          |   2 +-
 qt6-qttools/distinfo                               |   8 +-
 ...assistant_qlitehtml_src_container__qpainter.cpp |  15 --
 ...ssistant_qlitehtml_src_container__qpainter__p.h |  15 --
 qt6-qtwayland/Makefile                             |   1 -
 qt6-qtwayland/PLIST                                |   5 +
 qt6-qtwayland/buildlink3.mk                        |   2 +-
 qt6-qtwayland/distinfo                             |   6 +-
 qt6-qtwebchannel/buildlink3.mk                     |   2 +-
 qt6-qtwebchannel/distinfo                          |   6 +-
 qt6-qtwebsockets/PLIST                             |   4 +-
 qt6-qtwebsockets/buildlink3.mk                     |   2 +-
 qt6-qtwebsockets/distinfo                          |   6 +-
 qt6/Makefile.common                                |   2 +-
 65 files changed, 374 insertions(+), 323 deletions(-)

diffs:
diff --git a/qt6-odbc/buildlink3.mk b/qt6-odbc/buildlink3.mk
index 2c1277369d..7fce5083aa 100644
--- a/qt6-odbc/buildlink3.mk
+++ b/qt6-odbc/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-odbc
 .if !defined(QT6_ODBC_BUILDLINK3_MK)
 QT6_ODBC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-odbc+=	qt6-odbc>=6.0.1
+BUILDLINK_API_DEPENDS.qt6-odbc+=	qt6-odbc>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-odbc?=		../../wip/qt6-odbc
 
 BUILDLINK_LIBDIRS.qt6-odbc+=		qt6/plugins/sqldrivers
diff --git a/qt6-odbc/distinfo b/qt6-odbc/distinfo
index f36a1da1d6..d12b6248f9 100644
--- a/qt6-odbc/distinfo
+++ b/qt6-odbc/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtbase-everywhere-src-6.3.2.tar.xz) = f9de810b7804d87da74fb73d06a1554024c6b236af42488918fd85a2533515c0
-SHA512 (qtbase-everywhere-src-6.3.2.tar.xz) = e164ed6511cf6d5aa39f91cfb624c89b4dd3fc7d3c6c14b60d0c211e5b40ba1ad379ecca653db33dfa944ecfbd9c7044a8d7a968c660e8a76c4897c869584822
-Size (qtbase-everywhere-src-6.3.2.tar.xz) = 47507396 bytes
+BLAKE2s (qtbase-everywhere-src-6.4.0.tar.xz) = f21b823fd591a92f5e62ccb997ec8ba44df012e27b723f5c849bdd470a39c86b
+SHA512 (qtbase-everywhere-src-6.4.0.tar.xz) = 7c9430da115529fa5697d134bf53d185259de23529d6db17398d91d48a0b7a95acd1fbe55189a2d2b3a2ecdafb27065ea99f29f7022110c95a45d6c04ebf46a3
+Size (qtbase-everywhere-src-6.4.0.tar.xz) = 47957680 bytes
diff --git a/qt6-psql/buildlink3.mk b/qt6-psql/buildlink3.mk
index c5582046ed..d229457cce 100644
--- a/qt6-psql/buildlink3.mk
+++ b/qt6-psql/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-psql
 .if !defined(QT6_PSQL_BUILDLINK3_MK)
 QT6_PSQL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-psql+=	qt6-psql>=6.0.1
+BUILDLINK_API_DEPENDS.qt6-psql+=	qt6-psql>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-psql?=		../../wip/qt6-psql
 
 BUILDLINK_LIBDIRS.qt6-psql+=		qt6/plugins/sqldrivers
diff --git a/qt6-psql/distinfo b/qt6-psql/distinfo
index f36a1da1d6..d12b6248f9 100644
--- a/qt6-psql/distinfo
+++ b/qt6-psql/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtbase-everywhere-src-6.3.2.tar.xz) = f9de810b7804d87da74fb73d06a1554024c6b236af42488918fd85a2533515c0
-SHA512 (qtbase-everywhere-src-6.3.2.tar.xz) = e164ed6511cf6d5aa39f91cfb624c89b4dd3fc7d3c6c14b60d0c211e5b40ba1ad379ecca653db33dfa944ecfbd9c7044a8d7a968c660e8a76c4897c869584822
-Size (qtbase-everywhere-src-6.3.2.tar.xz) = 47507396 bytes
+BLAKE2s (qtbase-everywhere-src-6.4.0.tar.xz) = f21b823fd591a92f5e62ccb997ec8ba44df012e27b723f5c849bdd470a39c86b
+SHA512 (qtbase-everywhere-src-6.4.0.tar.xz) = 7c9430da115529fa5697d134bf53d185259de23529d6db17398d91d48a0b7a95acd1fbe55189a2d2b3a2ecdafb27065ea99f29f7022110c95a45d6c04ebf46a3
+Size (qtbase-everywhere-src-6.4.0.tar.xz) = 47957680 bytes
diff --git a/qt6-qt3d/PLIST b/qt6-qt3d/PLIST
index 42358d19d8..3af3900f84 100644
--- a/qt6-qt3d/PLIST
+++ b/qt6-qt3d/PLIST
@@ -1200,6 +1200,7 @@ qt6/lib/cmake/Qt63DRender/Qt63DRenderConfig.cmake
 qt6/lib/cmake/Qt63DRender/Qt63DRenderConfigVersion.cmake
 qt6/lib/cmake/Qt63DRender/Qt63DRenderConfigVersionImpl.cmake
 qt6/lib/cmake/Qt63DRender/Qt63DRenderDependencies.cmake
+qt6/lib/cmake/Qt63DRender/Qt63DRenderPlugins.cmake
 qt6/lib/cmake/Qt63DRender/Qt63DRenderTargets-release.cmake
 qt6/lib/cmake/Qt63DRender/Qt63DRenderTargets.cmake
 qt6/lib/cmake/Qt63DRender/Qt63DRenderVersionlessTargets.cmake
diff --git a/qt6-qt3d/buildlink3.mk b/qt6-qt3d/buildlink3.mk
index 0747c8c58b..7071e31349 100644
--- a/qt6-qt3d/buildlink3.mk
+++ b/qt6-qt3d/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qt3d
 .if !defined(QT6_QT3D_BUILDLINK3_MK)
 QT6_QT3D_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qt3d+=	qt6-qt3d>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qt3d+=	qt6-qt3d>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qt3d?=		../../wip/qt6-qt3d
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qt3d/distinfo b/qt6-qt3d/distinfo
index be9e569ee8..79732721e1 100644
--- a/qt6-qt3d/distinfo
+++ b/qt6-qt3d/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (qt3d-everywhere-src-6.3.2.tar.xz) = 44a0fd3ac5545048bf4571ab22168c20a2f97c5ed0a9cf33550ec5f90bc99bd2
-SHA512 (qt3d-everywhere-src-6.3.2.tar.xz) = 1856aaf3ae7f91129b7eb0524497b0505f7ba9e1a7cbfee5eec26400d8ea36f88115f8d49ad93b3ef94c09f1ee11246482d6ab0416972a56431bd084cab44aa8
-Size (qt3d-everywhere-src-6.3.2.tar.xz) = 104036300 bytes
+BLAKE2s (qt3d-everywhere-src-6.4.0.tar.xz) = 0cec938fdb8ce454ea401cd035940a1976618d4923b5a9aabe78117437f970b5
+SHA512 (qt3d-everywhere-src-6.4.0.tar.xz) = c057b85877e7bb54ef5287311be3a3ba1bafcd9c2436f37663d43c997b028720d52541731327151b5534063c12ab496887251ec50944fdbe3946f1bbcb00a582
+Size (qt3d-everywhere-src-6.4.0.tar.xz) = 104010020 bytes
 SHA1 (patch-qt__cmdline.cmake) = 700aeffe48a623135ebc92049eedda896f0b272a
 SHA1 (patch-src_plugins_geometryloaders_configure.cmake) = 02401ea3019229fdc448fe2b31c17ebeca69ca76
 SHA1 (patch-src_plugins_renderers_opengl_CMakeLists.txt) = 0a94746a8767cd9244ae394d95872b15b6eaefb0
diff --git a/qt6-qt5compat/Makefile b/qt6-qt5compat/Makefile
index b693e7794a..ca709c2ca5 100644
--- a/qt6-qt5compat/Makefile
+++ b/qt6-qt5compat/Makefile
@@ -13,4 +13,5 @@ PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Core5Compat.pc
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
 .include "../../wip/qt6-qtdeclarative/buildlink3.mk"
+.include "../../wip/qt6-qtshadertools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qt5compat/PLIST b/qt6-qt5compat/PLIST
index b0ac3c1c01..0d1ff47d3f 100644
--- a/qt6-qt5compat/PLIST
+++ b/qt6-qt5compat/PLIST
@@ -92,26 +92,40 @@ qt6/lib/pkgconfig/Qt6Core5Compat.pc
 qt6/mkspecs/modules/qt_lib_core5compat.pri
 qt6/mkspecs/modules/qt_lib_core5compat_private.pri
 qt6/modules/Core5Compat.json
+qt6/qml/Qt5Compat/GraphicalEffects/Blend.qml
 qt6/qml/Qt5Compat/GraphicalEffects/BrightnessContrast.qml
 qt6/qml/Qt5Compat/GraphicalEffects/ColorOverlay.qml
 qt6/qml/Qt5Compat/GraphicalEffects/Colorize.qml
 qt6/qml/Qt5Compat/GraphicalEffects/ConicalGradient.qml
 qt6/qml/Qt5Compat/GraphicalEffects/Desaturate.qml
+qt6/qml/Qt5Compat/GraphicalEffects/DirectionalBlur.qml
 qt6/qml/Qt5Compat/GraphicalEffects/Displace.qml
 qt6/qml/Qt5Compat/GraphicalEffects/DropShadow.qml
 qt6/qml/Qt5Compat/GraphicalEffects/FastBlur.qml
 qt6/qml/Qt5Compat/GraphicalEffects/GammaAdjust.qml
+qt6/qml/Qt5Compat/GraphicalEffects/GaussianBlur.qml
 qt6/qml/Qt5Compat/GraphicalEffects/Glow.qml
 qt6/qml/Qt5Compat/GraphicalEffects/HueSaturation.qml
+qt6/qml/Qt5Compat/GraphicalEffects/InnerShadow.qml
 qt6/qml/Qt5Compat/GraphicalEffects/LevelAdjust.qml
 qt6/qml/Qt5Compat/GraphicalEffects/LinearGradient.qml
+qt6/qml/Qt5Compat/GraphicalEffects/MaskedBlur.qml
 qt6/qml/Qt5Compat/GraphicalEffects/OpacityMask.qml
+qt6/qml/Qt5Compat/GraphicalEffects/RadialBlur.qml
 qt6/qml/Qt5Compat/GraphicalEffects/RadialGradient.qml
 qt6/qml/Qt5Compat/GraphicalEffects/RectangularGlow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/RecursiveBlur.qml
 qt6/qml/Qt5Compat/GraphicalEffects/ThresholdMask.qml
+qt6/qml/Qt5Compat/GraphicalEffects/ZoomBlur.qml
 qt6/qml/Qt5Compat/GraphicalEffects/libqtgraphicaleffectsplugin.so
 qt6/qml/Qt5Compat/GraphicalEffects/plugins.qmltypes
+qt6/qml/Qt5Compat/GraphicalEffects/private/DropShadowBase.qml
 qt6/qml/Qt5Compat/GraphicalEffects/private/FastGlow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/FastInnerShadow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianDirectionalBlur.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianGlow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianInnerShadow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianMaskedBlur.qml
 qt6/qml/Qt5Compat/GraphicalEffects/private/libqtgraphicaleffectsprivateplugin.so
 qt6/qml/Qt5Compat/GraphicalEffects/private/qmldir
 qt6/qml/Qt5Compat/GraphicalEffects/qmldir
diff --git a/qt6-qt5compat/buildlink3.mk b/qt6-qt5compat/buildlink3.mk
index 9a5850c97a..c711b30465 100644
--- a/qt6-qt5compat/buildlink3.mk
+++ b/qt6-qt5compat/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qt5compat
 .if !defined(QT6_QT5COMPAT_BUILDLINK3_MK)
 QT6_QT5COMPAT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qt5compat+=	qt6-qt5compat>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qt5compat+=	qt6-qt5compat>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qt5compat?=	../../wip/qt6-qt5compat
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qt5compat/distinfo b/qt6-qt5compat/distinfo
index a02b6b39b7..9a812bca00 100644
--- a/qt6-qt5compat/distinfo
+++ b/qt6-qt5compat/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qt5compat-everywhere-src-6.3.2.tar.xz) = 1e9dacda1fdbe4c5862bf97df54d2ebec6fdb2f38c8aa215a0394d7b7ce4b9cd
-SHA512 (qt5compat-everywhere-src-6.3.2.tar.xz) = 12407b27871a3972e3400d9832e454ea221fd18f6c5ce19be8084d085c148d70097b5de8fcedf2a53777b38ce9511f215e56dc145a618e472ceb2caf584c689e
-Size (qt5compat-everywhere-src-6.3.2.tar.xz) = 8194996 bytes
+BLAKE2s (qt5compat-everywhere-src-6.4.0.tar.xz) = 4d55dbeeece249e7391cbec2d8e749d1f7357f2780b9b2d6a52eb838c260ff36
+SHA512 (qt5compat-everywhere-src-6.4.0.tar.xz) = d14ebf4ed6061b7154fdd67ac71849bcfb109c9911dcc9279c01bf07b6f58cf26a882f16be6228040e6465345259a16be2296481c2129c88710fa7b4da747ba5
+Size (qt5compat-everywhere-src-6.4.0.tar.xz) = 14641720 bytes
diff --git a/qt6-qtbase/Makefile.common b/qt6-qtbase/Makefile.common
index 67aed710d7..a35a21f7de 100644
--- a/qt6-qtbase/Makefile.common
+++ b/qt6-qtbase/Makefile.common
@@ -101,4 +101,3 @@ pkgconfig-link:
 			${LN} -f -s ${QTPREFIX}/lib/pkgconfig/$${pcfile} $${pcfile};	\
 		done									\
 		fi
-
diff --git a/qt6-qtbase/PLIST b/qt6-qtbase/PLIST
index 6deaa192c7..a4b455042d 100644
--- a/qt6-qtbase/PLIST
+++ b/qt6-qtbase/PLIST
@@ -181,6 +181,7 @@ qt6/include/QtCore/${PKGVERSION}/QtCore/private/qabstractitemmodel_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qabstractproxymodel_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qandroidextras_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qanimationgroup_p.h
+qt6/include/QtCore/${PKGVERSION}/QtCore/private/qatomicscopedvaluerollback_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qbytearray_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qbytedata_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qcalendarbackend_p.h
@@ -260,6 +261,7 @@ qt6/include/QtCore/${PKGVERSION}/QtCore/private/qlibraryinfo_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qlocale_data_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qlocale_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qlocale_tools_p.h
+qt6/include/QtCore/${PKGVERSION}/QtCore/private/qlocaltime_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qlockfile_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qlocking_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qlogging_p.h
@@ -284,6 +286,7 @@ qt6/include/QtCore/${PKGVERSION}/QtCore/private/qnoncontiguousbytedevice_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qntdll_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qnumeric_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qobject_p.h
+qt6/include/QtCore/${PKGVERSION}/QtCore/private/qobject_p_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qoffsetstringarray_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qoperatingsystemversion_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qoperatingsystemversion_win_p.h
@@ -390,6 +393,7 @@ qt6/include/QtCore/QCborParserError
 qt6/include/QtCore/QCborStreamReader
 qt6/include/QtCore/QCborStreamWriter
 qt6/include/QtCore/QCborValue
+qt6/include/QtCore/QCborValueConstRef
 qt6/include/QtCore/QCborValueRef
 qt6/include/QtCore/QChar
 qt6/include/QtCore/QChildEvent
@@ -433,6 +437,7 @@ qt6/include/QtCore/QFileSystemWatcher
 qt6/include/QtCore/QFlag
 qt6/include/QtCore/QFlags
 qt6/include/QtCore/QFloat16
+qt6/include/QtCore/QForeach
 qt6/include/QtCore/QFunctionPointer
 qt6/include/QtCore/QFuture
 qt6/include/QtCore/QFutureInterface
@@ -467,12 +472,14 @@ qt6/include/QtCore/QJsonDocument
 qt6/include/QtCore/QJsonObject
 qt6/include/QtCore/QJsonParseError
 qt6/include/QtCore/QJsonValue
+qt6/include/QtCore/QJsonValueConstRef
 qt6/include/QtCore/QJsonValueRef
 qt6/include/QtCore/QKeyCombination
 qt6/include/QtCore/QKeyValueIterator
 qt6/include/QtCore/QLEInteger
 qt6/include/QtCore/QLatin1Char
 qt6/include/QtCore/QLatin1String
+qt6/include/QtCore/QLatin1StringView
 qt6/include/QtCore/QLibrary
 qt6/include/QtCore/QLibraryInfo
 qt6/include/QtCore/QLine
@@ -706,6 +713,7 @@ qt6/include/QtCore/QtPluginMetaDataFunction
 qt6/include/QtCore/q20algorithm.h
 qt6/include/QtCore/q20functional.h
 qt6/include/QtCore/q20iterator.h
+qt6/include/QtCore/q23functional.h
 qt6/include/QtCore/qabstractanimation.h
 qt6/include/QtCore/qabstracteventdispatcher.h
 qt6/include/QtCore/qabstractitemmodel.h
@@ -778,6 +786,7 @@ qt6/include/QtCore/qfileselector.h
 qt6/include/QtCore/qfilesystemwatcher.h
 qt6/include/QtCore/qflags.h
 qt6/include/QtCore/qfloat16.h
+qt6/include/QtCore/qforeach.h
 qt6/include/QtCore/qfunctions_vxworks.h
 qt6/include/QtCore/qfuture.h
 qt6/include/QtCore/qfuture_impl.h
@@ -797,6 +806,7 @@ qt6/include/QtCore/qiterable.h
 qt6/include/QtCore/qiterator.h
 qt6/include/QtCore/qjnienvironment.h
 qt6/include/QtCore/qjniobject.h
+qt6/include/QtCore/qjnitypes.h
 qt6/include/QtCore/qjsonarray.h
 qt6/include/QtCore/qjsondocument.h
 qt6/include/QtCore/qjsonobject.h
@@ -877,6 +887,8 @@ qt6/include/QtCore/qstring.h
 qt6/include/QtCore/qstringalgorithms.h
 qt6/include/QtCore/qstringbuilder.h
 qt6/include/QtCore/qstringconverter.h
+qt6/include/QtCore/qstringconverter_base.h
+qt6/include/QtCore/qstringfwd.h
 qt6/include/QtCore/qstringlist.h
 qt6/include/QtCore/qstringlistmodel.h
 qt6/include/QtCore/qstringliteral.h
@@ -888,6 +900,7 @@ qt6/include/QtCore/qsystemdetection.h
 qt6/include/QtCore/qsystemsemaphore.h
 qt6/include/QtCore/qt_windows.h
 qt6/include/QtCore/qtaggedpointer.h
+qt6/include/QtCore/qtconfigmacros.h
 qt6/include/QtCore/qtcore-config.h
 qt6/include/QtCore/qtcoreexports.h
 qt6/include/QtCore/qtcoreversion.h
@@ -905,6 +918,7 @@ qt6/include/QtCore/qtimezone.h
 qt6/include/QtCore/qtmetamacros.h
 qt6/include/QtCore/qtranslator.h
 qt6/include/QtCore/qtransposeproxymodel.h
+qt6/include/QtCore/qtsan_impl.h
 qt6/include/QtCore/qtypeinfo.h
 qt6/include/QtCore/qurl.h
 qt6/include/QtCore/qurlquery.h
@@ -912,6 +926,9 @@ qt6/include/QtCore/qutf8stringview.h
 qt6/include/QtCore/quuid.h
 qt6/include/QtCore/qvariant.h
 qt6/include/QtCore/qvariantanimation.h
+qt6/include/QtCore/qvarianthash.h
+qt6/include/QtCore/qvariantlist.h
+qt6/include/QtCore/qvariantmap.h
 qt6/include/QtCore/qvarlengtharray.h
 qt6/include/QtCore/qvector.h
 qt6/include/QtCore/qversionnumber.h
@@ -919,6 +936,7 @@ qt6/include/QtCore/qversiontagging.h
 qt6/include/QtCore/qwaitcondition.h
 qt6/include/QtCore/qwineventnotifier.h
 qt6/include/QtCore/qxmlstream.h
+qt6/include/QtCore/qxpfunctional.h
 ${PLIST.dbus}qt6/include/QtDBus/${PKGVERSION}/QtDBus/private/dbus_minimal_p.h
 ${PLIST.dbus}qt6/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbus_symbols_p.h
 ${PLIST.dbus}qt6/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractadaptor_p.h
@@ -1047,6 +1065,8 @@ qt6/include/QtGui/${PKGVERSION}/QtGui/private/qaction_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qactiongroup_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qapplekeymapper_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qastchandler_p.h
+qt6/include/QtGui/${PKGVERSION}/QtGui/private/qbackingstoredefaultcompositor_p.h
+qt6/include/QtGui/${PKGVERSION}/QtGui/private/qbackingstorerhisupport_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qbasicvulkanplatforminstance_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qbezier_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qblendfunctions_p.h
@@ -1175,6 +1195,7 @@ qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrbtree_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrgba64_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhi_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhi_p_p.h
+qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhibackingstore_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhid3d11_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhid3d11_p_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhigles2_p.h
@@ -1183,8 +1204,6 @@ qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhimetal_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhimetal_p_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhinull_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhinull_p_p.h
-qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhiprofiler_p.h
-qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhiprofiler_p_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhivulkan_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhivulkan_p_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qrhivulkanext_p.h
@@ -1235,6 +1254,8 @@ qt6/include/QtGui/${PKGVERSION}/QtGui/private/qtx11extras_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qundostack_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qunixeventdispatcher_qpa_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qvectorpath_p.h
+qt6/include/QtGui/${PKGVERSION}/QtGui/private/qvulkandefaultinstance_p.h
+qt6/include/QtGui/${PKGVERSION}/QtGui/private/qvulkaninstance_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qvulkanwindow_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qwasmlocalfileaccess_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qwindow_p.h
@@ -1251,7 +1272,6 @@ qt6/include/QtGui/${PKGVERSION}/QtGui/private/qwindowsuiawrapper_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qxbmhandler_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qxdgnotificationproxy_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qxkbcommon_p.h
-qt6/include/QtGui/${PKGVERSION}/QtGui/private/qxlibeglintegration_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qxpmhandler_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qzipreader_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/qzipwriter_p.h
@@ -1265,6 +1285,7 @@ qt6/include/QtGui/${PKGVERSION}/QtGui/private/uiapatternids_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/uiapropertyids_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/uiaserverinterfaces_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/private/uiatypes_p.h
+qt6/include/QtGui/${PKGVERSION}/QtGui/private/vs_test_p.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformaccessibility.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformbackingstore.h
 qt6/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformclipboard.h
@@ -1531,6 +1552,7 @@ qt6/include/QtGui/QtGuiVersion
 qt6/include/QtGui/qabstractfileiconprovider.h
 qt6/include/QtGui/qabstracttextdocumentlayout.h
 qt6/include/QtGui/qaccessible.h
+qt6/include/QtGui/qaccessible_base.h
 qt6/include/QtGui/qaccessiblebridge.h
 qt6/include/QtGui/qaccessibleobject.h
 qt6/include/QtGui/qaccessibleplugin.h
@@ -1742,6 +1764,7 @@ qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslconfiguration_p.h
 qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qssldiffiehellmanparameters_p.h
 qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslkey_p.h
 qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslpresharedkeyauthenticator_p.h
+qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslserver_p.h
 qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_p.h
 qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtcpserver_p.h
 qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtcpsocket_p.h
@@ -1750,7 +1773,6 @@ qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtlsbackend_p.h
 qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtnetwork-config_p.h
 qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtnetworkexports_p.h
 qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtnetworkglobal_p.h
-qt6/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qurltlds_p.h
 qt6/include/QtNetwork/QAbstractNetworkCache
 qt6/include/QtNetwork/QAbstractSocket
 qt6/include/QtNetwork/QAuthenticator
@@ -1799,6 +1821,7 @@ qt6/include/QtNetwork/QSslEllipticCurve
 qt6/include/QtNetwork/QSslError
 qt6/include/QtNetwork/QSslKey
 qt6/include/QtNetwork/QSslPreSharedKeyAuthenticator
+qt6/include/QtNetwork/QSslServer
 qt6/include/QtNetwork/QSslSocket
 qt6/include/QtNetwork/QTcpServer
 qt6/include/QtNetwork/QTcpSocket
@@ -1843,6 +1866,7 @@ qt6/include/QtNetwork/qsslellipticcurve.h
 qt6/include/QtNetwork/qsslerror.h
 qt6/include/QtNetwork/qsslkey.h
 qt6/include/QtNetwork/qsslpresharedkeyauthenticator.h
+qt6/include/QtNetwork/qsslserver.h
 qt6/include/QtNetwork/qsslsocket.h
 qt6/include/QtNetwork/qtcpserver.h
 qt6/include/QtNetwork/qtcpsocket.h
@@ -1871,7 +1895,6 @@ qt6/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qopengltextureuploader_p.h
 qt6/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qopenglversionfunctions_p.h
 qt6/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qopenglvertexarrayobject_p.h
 qt6/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qvkconvenience_p.h
-qt6/include/QtOpenGL/${PKGVERSION}/QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h
 qt6/include/QtOpenGL/QOpenGLBuffer
 qt6/include/QtOpenGL/QOpenGLDebugLogger
 qt6/include/QtOpenGL/QOpenGLDebugMessage
@@ -2629,7 +2652,6 @@ qt6/lib/cmake/Qt6/3rdparty/kwin/FindXKB.cmake
 qt6/lib/cmake/Qt6/3rdparty/kwin/Findgbm.cmake
 qt6/lib/cmake/Qt6/3rdparty/kwin/qt_attribution.json
 qt6/lib/cmake/Qt6/FindATSPI2.cmake
-qt6/lib/cmake/Qt6/FindCups.cmake
 qt6/lib/cmake/Qt6/FindDB2.cmake
 qt6/lib/cmake/Qt6/FindDirectFB.cmake
 qt6/lib/cmake/Qt6/FindGLESv2.cmake
@@ -2746,6 +2768,7 @@ qt6/lib/cmake/Qt6/QtPrecompiledHeadersHelpers.cmake
 qt6/lib/cmake/Qt6/QtPriHelpers.cmake
 qt6/lib/cmake/Qt6/QtPrlHelpers.cmake
 qt6/lib/cmake/Qt6/QtProcessConfigureArgs.cmake
+qt6/lib/cmake/Qt6/QtPublicAppleHelpers.cmake
 qt6/lib/cmake/Qt6/QtPublicCMakeHelpers.cmake
 qt6/lib/cmake/Qt6/QtPublicCMakeVersionHelpers.cmake
 qt6/lib/cmake/Qt6/QtPublicDependencyHelpers.cmake
@@ -2753,6 +2776,8 @@ qt6/lib/cmake/Qt6/QtPublicFinalizerHelpers.cmake
 qt6/lib/cmake/Qt6/QtPublicFindPackageHelpers.cmake
 qt6/lib/cmake/Qt6/QtPublicPluginHelpers.cmake
 qt6/lib/cmake/Qt6/QtPublicTargetHelpers.cmake
+qt6/lib/cmake/Qt6/QtPublicTestHelpers.cmake
+qt6/lib/cmake/Qt6/QtPublicToolHelpers.cmake
 qt6/lib/cmake/Qt6/QtPublicWalkLibsHelpers.cmake
 qt6/lib/cmake/Qt6/QtPublicWasmToolchainHelpers.cmake
 qt6/lib/cmake/Qt6/QtQmakeHelpers.cmake
@@ -2888,6 +2913,7 @@ qt6/lib/cmake/Qt6Gui/Qt6GuiConfig.cmake
 qt6/lib/cmake/Qt6Gui/Qt6GuiConfigVersion.cmake
 qt6/lib/cmake/Qt6Gui/Qt6GuiConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6Gui/Qt6GuiDependencies.cmake
+qt6/lib/cmake/Qt6Gui/Qt6GuiPlugins.cmake
 qt6/lib/cmake/Qt6Gui/Qt6GuiTargets-release.cmake
 qt6/lib/cmake/Qt6Gui/Qt6GuiTargets.cmake
 qt6/lib/cmake/Qt6Gui/Qt6GuiVersionlessTargets.cmake
@@ -3041,6 +3067,7 @@ qt6/lib/cmake/Qt6Network/Qt6NetworkConfig.cmake
 qt6/lib/cmake/Qt6Network/Qt6NetworkConfigVersion.cmake
 qt6/lib/cmake/Qt6Network/Qt6NetworkConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6Network/Qt6NetworkDependencies.cmake
+qt6/lib/cmake/Qt6Network/Qt6NetworkPlugins.cmake
 qt6/lib/cmake/Qt6Network/Qt6NetworkTargets-release.cmake
 qt6/lib/cmake/Qt6Network/Qt6NetworkTargets.cmake
 qt6/lib/cmake/Qt6Network/Qt6NetworkVersionlessTargets.cmake
@@ -3083,6 +3110,7 @@ qt6/lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfig.cmake
 qt6/lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfigVersion.cmake
 qt6/lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6PrintSupport/Qt6PrintSupportDependencies.cmake
+${PLIST.cups}qt6/lib/cmake/Qt6PrintSupport/Qt6PrintSupportPlugins.cmake
 qt6/lib/cmake/Qt6PrintSupport/Qt6PrintSupportTargets-release.cmake
 qt6/lib/cmake/Qt6PrintSupport/Qt6PrintSupportTargets.cmake
 qt6/lib/cmake/Qt6PrintSupport/Qt6PrintSupportVersionlessTargets.cmake
@@ -3103,6 +3131,7 @@ qt6/lib/cmake/Qt6Sql/Qt6SqlConfig.cmake
 qt6/lib/cmake/Qt6Sql/Qt6SqlConfigVersion.cmake
 qt6/lib/cmake/Qt6Sql/Qt6SqlConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6Sql/Qt6SqlDependencies.cmake
+qt6/lib/cmake/Qt6Sql/Qt6SqlPlugins.cmake
 qt6/lib/cmake/Qt6Sql/Qt6SqlTargets-release.cmake
 qt6/lib/cmake/Qt6Sql/Qt6SqlTargets.cmake
 qt6/lib/cmake/Qt6Sql/Qt6SqlVersionlessTargets.cmake
@@ -3555,6 +3584,7 @@ qt6/mkspecs/features/unix/bsymbolic_functions.prf
 qt6/mkspecs/features/unix/ccache.prf
 qt6/mkspecs/features/unix/hide_symbols.prf
 qt6/mkspecs/features/unix/largefile.prf
+qt6/mkspecs/features/unix/no_direct_extern_access.prf
 qt6/mkspecs/features/unix/opengl.prf
 qt6/mkspecs/features/unix/separate_debug_info.prf
 qt6/mkspecs/features/unix/thread.prf
diff --git a/qt6-qtbase/buildlink3.mk b/qt6-qtbase/buildlink3.mk
index d5ba54815d..b2e6461df4 100644
--- a/qt6-qtbase/buildlink3.mk
+++ b/qt6-qtbase/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtbase
 .if !defined(QT6_QTBASE_BUILDLINK3_MK)
 QT6_QTBASE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtbase+=	qt6-qtbase>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtbase+=	qt6-qtbase>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtbase?=	../../wip/qt6-qtbase
 
 BUILDLINK_INCDIRS.qt6-qtbase+=	qt6/include
@@ -26,6 +26,9 @@ pkgbase := qt6-qtbase
 
 .if ${PKG_BUILD_OPTIONS.qt6-qtbase:Mdbus}
 .include "../../sysutils/dbus/buildlink3.mk"
+.  if !empty(PLIST_VARS:Mdbus)
+PLIST.dbus=	yes
+.  endif
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index f9078e8601..67e4426e92 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (qtbase-everywhere-src-6.3.2.tar.xz) = f9de810b7804d87da74fb73d06a1554024c6b236af42488918fd85a2533515c0
-SHA512 (qtbase-everywhere-src-6.3.2.tar.xz) = e164ed6511cf6d5aa39f91cfb624c89b4dd3fc7d3c6c14b60d0c211e5b40ba1ad379ecca653db33dfa944ecfbd9c7044a8d7a968c660e8a76c4897c869584822
-Size (qtbase-everywhere-src-6.3.2.tar.xz) = 47507396 bytes
+BLAKE2s (qtbase-everywhere-src-6.4.0.tar.xz) = f21b823fd591a92f5e62ccb997ec8ba44df012e27b723f5c849bdd470a39c86b
+SHA512 (qtbase-everywhere-src-6.4.0.tar.xz) = 7c9430da115529fa5697d134bf53d185259de23529d6db17398d91d48a0b7a95acd1fbe55189a2d2b3a2ecdafb27065ea99f29f7022110c95a45d6c04ebf46a3
+Size (qtbase-everywhere-src-6.4.0.tar.xz) = 47957680 bytes
 SHA1 (patch-cmake_QtBaseGlobalTargets.cmake) = 015e6bbd049445832d6494209badc1c1a140b9a0
 SHA1 (patch-cmake_QtBuildInternals_QtBuildInternalsConfig.cmake) = f58e8e445c73444d7f0c015dd8fda64a5a662ef7
 SHA1 (patch-cmake_QtFeature.cmake) = a8e83d33467205ce39fb6df70d6dd5fcd4172d89
@@ -16,7 +16,6 @@ SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf8071
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
 SHA1 (patch-src_corelib_qt__cmdline.cmake) = 25fe89821ba1e1323edae87ca1ee0bd5ccf0e407
 SHA1 (patch-src_corelib_thread_qmutex__p.h) = 47047f5af4383b622c59c3969145e44c6ac4bf18
-SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = b9d2d18413b5670a3c9b5ceb90561c3258ffd64b
 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
 SHA1 (patch-src_network_configure.cmake) = 754461c21574b99232efc95af3a80765b2edbecc
 SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
diff --git a/qt6-qtbase/patches/patch-src_corelib_thread_qthread__unix.cpp b/qt6-qtbase/patches/patch-src_corelib_thread_qthread__unix.cpp
deleted file mode 100644
index b2c7d7979b..0000000000
--- a/qt6-qtbase/patches/patch-src_corelib_thread_qthread__unix.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Make sure current_thread_data_key has been obtained from pthread_key_create
-  before before it, set_thread_data ensures this. Fixes crash when closing threaded
-  Qt6 apps on NetBSD.
-
-  Sent to and applied upstream:
-  https://codereview.qt-project.org/c/qt/qtbase/+/421914
-
---- src/corelib/thread/qthread_unix.cpp.orig	2022-07-13 13:11:12.532990932 +0000
-+++ src/corelib/thread/qthread_unix.cpp
-@@ -171,8 +171,7 @@ static void set_thread_data(QThreadData 
- 
- static void clear_thread_data()
- {
--    currentThreadData = nullptr;
--    pthread_setspecific(current_thread_data_key, nullptr);
-+    set_thread_data(nullptr);
- }
- 
- template <typename T>
diff --git a/qt6-qtcharts/buildlink3.mk b/qt6-qtcharts/buildlink3.mk
index d58b78947f..925f6229f2 100644
--- a/qt6-qtcharts/buildlink3.mk
+++ b/qt6-qtcharts/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtcharts
 .if !defined(QT6_QTCHARTS_BUILDLINK3_MK)
 QT6_QTCHARTS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtcharts+=	qt6-qtcharts>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtcharts+=	qt6-qtcharts>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtcharts?=	../../wip/qt6-qtcharts
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtcharts/distinfo b/qt6-qtcharts/distinfo
index d1711f3aee..2681f7ea0a 100644
--- a/qt6-qtcharts/distinfo
+++ b/qt6-qtcharts/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtcharts-everywhere-src-6.3.2.tar.xz) = f186fc78c4d18ca28673962f7663a37e57852a8c9dc7b0b03c1c80243551e46e
-SHA512 (qtcharts-everywhere-src-6.3.2.tar.xz) = 7e04a4cbce66ddb1055d8e399bbb06b6a7ab5b8a0f80de315f20c4c0f2971911128ec386752818c7a07cd6dfe326e62e4c2e6a0e92e2bc97498e49babed2af50
-Size (qtcharts-everywhere-src-6.3.2.tar.xz) = 4390888 bytes
+BLAKE2s (qtcharts-everywhere-src-6.4.0.tar.xz) = 53b3bd83374447162787138056adb0351d4541f6df349d4cd89706fc5e86fb2d
+SHA512 (qtcharts-everywhere-src-6.4.0.tar.xz) = 63f231d553fad0f5801c4abeeae0864dba3160c703e49be2ef49e7484d979621b27544408c59c903e8ac89bdf5aae6472f9e8b1d49f50951db257b52c5e60947
+Size (qtcharts-everywhere-src-6.4.0.tar.xz) = 4387060 bytes
diff --git a/qt6-qtdatavis3d/buildlink3.mk b/qt6-qtdatavis3d/buildlink3.mk
index d178c8a6af..65b6a5ea5c 100644
--- a/qt6-qtdatavis3d/buildlink3.mk
+++ b/qt6-qtdatavis3d/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtdatavis3d
 .if !defined(QT6_QTDATAVIS3D_BUILDLINK3_MK)
 QT6_QTDATAVIS3D_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtdatavis3d+=	qt6-qtdatavis3d>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtdatavis3d+=	qt6-qtdatavis3d>=6.4,0
 BUILDLINK_PKGSRCDIR.qt6-qtdatavis3d?=	../../wip/qt6-qtdatavis3d
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtdatavis3d/distinfo b/qt6-qtdatavis3d/distinfo
index 5ca6a988d6..2eae99c64b 100644
--- a/qt6-qtdatavis3d/distinfo
+++ b/qt6-qtdatavis3d/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtdatavis3d-everywhere-src-6.3.2.tar.xz) = 2cc86b39115c7c57981f63578efe91bb727130f02193b33ed86b39ff0eed1234
-SHA512 (qtdatavis3d-everywhere-src-6.3.2.tar.xz) = 58a68c27f08cceb735309c018398b8ea6b6805e2ad78604fd445ea44749809f7f41209257d59ea211446328ceb216470b6c4159ea7434d19f4b635da80606ffa
-Size (qtdatavis3d-everywhere-src-6.3.2.tar.xz) = 5218636 bytes
+BLAKE2s (qtdatavis3d-everywhere-src-6.4.0.tar.xz) = 3b04ce68587b72dc0e11b058a44a4f2d2533035d5bab9dbc50cb5778b25ff7c4
+SHA512 (qtdatavis3d-everywhere-src-6.4.0.tar.xz) = 10b2fdef39a57c873a4741804277b621e04123eaff93617438c4590b4308408457cbee9fe76f2f9b619ffc2d776def853dbce9bdf2c7d3b51fd6500dd519c7cd
+Size (qtdatavis3d-everywhere-src-6.4.0.tar.xz) = 5216176 bytes
diff --git a/qt6-qtdeclarative/PLIST b/qt6-qtdeclarative/PLIST
index 267f1b0c45..67c2ea95f1 100644
--- a/qt6-qtdeclarative/PLIST
+++ b/qt6-qtdeclarative/PLIST
@@ -200,6 +200,7 @@ qt6/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertycachevector_p.h
 qt6/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertydata_p.h
 qt6/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertyindex_p.h
 qt6/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertyresolver_p.h
+qt6/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertytopropertybinding_p.h
 qt6/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertyvalidator_p.h
 qt6/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertyvalueinterceptor_p.h
 qt6/include/QtQml/${PKGVERSION}/QtQml/private/qqmlproxymetaobject_p.h
@@ -421,12 +422,15 @@ qt6/include/QtQml/qtqmlversion.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qcoloroutput_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qdeferredpointer_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljsannotation_p.h
+qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljsbasicblocks_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljscodegenerator_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljscompilepass_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljscompiler_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljsfunctioninitializer_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljsimporter_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljsimportvisitor_p.h
+qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljslinter_p.h
+qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljslintercodegen_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljsliteralbindingcheck_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljsloadergenerator_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljslogger_p.h
@@ -443,13 +447,17 @@ qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljstypepropagat
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljstypereader_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljstyperesolver_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljsutils_p.h
+qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmlsa_p.h
 qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qresourcerelocater_p.h
+qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qtqmlcompilerexports_p.h
 qt6/include/QtQmlCompiler/QtQmlCompiler
 qt6/include/QtQmlCompiler/QtQmlCompilerDepends
 qt6/include/QtQmlCompiler/QtQmlCompilerVersion
+qt6/include/QtQmlCompiler/qtqmlcompilerexports.h
 qt6/include/QtQmlCompiler/qtqmlcompilerversion.h
 qt6/include/QtQmlCore/${PKGVERSION}/QtQmlCore/private/qqmlcoreglobal_p.h
 qt6/include/QtQmlCore/${PKGVERSION}/QtQmlCore/private/qqmlstandardpaths_p.h
+qt6/include/QtQmlCore/${PKGVERSION}/QtQmlCore/private/qqmlsysteminformation_p.h
 qt6/include/QtQmlCore/${PKGVERSION}/QtQmlCore/private/qtqmlcoreexports_p.h
 qt6/include/QtQmlCore/QtQmlCore
 qt6/include/QtQmlCore/QtQmlCoreDepends
@@ -506,6 +514,7 @@ qt6/include/QtQmlDom/${PKGVERSION}/QtQmlDom/private/qqmldomreformatter_p.h
 qt6/include/QtQmlDom/${PKGVERSION}/QtQmlDom/private/qqmldomstringdumper_p.h
 qt6/include/QtQmlDom/${PKGVERSION}/QtQmlDom/private/qqmldomtop_p.h
 qt6/include/QtQmlDom/${PKGVERSION}/QtQmlDom/private/qqmldomtypesreader_p.h
+qt6/include/QtQmlDom/${PKGVERSION}/QtQmlDom/private/qtqmlcompilerexports_p.h
 qt6/include/QtQmlDom/QtQmlDom
 qt6/include/QtQmlDom/QtQmlDomDepends
 qt6/include/QtQmlDom/QtQmlDomVersion
@@ -516,14 +525,6 @@ qt6/include/QtQmlIntegration/QtQmlIntegrationDepends
 qt6/include/QtQmlIntegration/QtQmlIntegrationVersion
 qt6/include/QtQmlIntegration/qqmlintegration.h
 qt6/include/QtQmlIntegration/qtqmlintegrationversion.h
-qt6/include/QtQmlLint/${PKGVERSION}/QtQmlLint/private/codegen_p.h
-qt6/include/QtQmlLint/${PKGVERSION}/QtQmlLint/private/codegenwarninginterface_p.h
-qt6/include/QtQmlLint/${PKGVERSION}/QtQmlLint/private/findwarnings_p.h
-qt6/include/QtQmlLint/${PKGVERSION}/QtQmlLint/private/qqmllinter_p.h
-qt6/include/QtQmlLint/QtQmlLint
-qt6/include/QtQmlLint/QtQmlLintDepends
-qt6/include/QtQmlLint/QtQmlLintVersion
-qt6/include/QtQmlLint/qtqmllintversion.h
 qt6/include/QtQmlLocalStorage/${PKGVERSION}/QtQmlLocalStorage/private/qqmllocalstorage_p.h
 qt6/include/QtQmlLocalStorage/${PKGVERSION}/QtQmlLocalStorage/private/qqmllocalstorageglobal_p.h
 qt6/include/QtQmlLocalStorage/${PKGVERSION}/QtQmlLocalStorage/private/qtqmllocalstorageexports_p.h
@@ -580,6 +581,7 @@ qt6/include/QtQmlXmlListModel/qtqmlxmllistmodelexports.h
 qt6/include/QtQmlXmlListModel/qtqmlxmllistmodelversion.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qaccessiblequickitem_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qaccessiblequickview_p.h
+qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qminimalflatset_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qqmldesignermetaobject_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickabstractpaletteprovider_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickaccessibleattached_p.h
@@ -632,6 +634,7 @@ qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfocusscope_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfontloader_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfontmetrics_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickforeignutils_p.h
+qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickframeanimation_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickgraphicsconfiguration_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickgraphicsdevice_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickgraphicsinfo_p.h
@@ -645,6 +648,7 @@ qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimagebase_p_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimageprovider_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimplicitsizeitem_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimplicitsizeitem_p_p.h
+qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickinputmethod_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickitem_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickitemanimation_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickitemanimation_p_p.h
@@ -726,6 +730,7 @@ qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextedit_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextedit_p_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextinput_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextinput_p_p.h
+qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextinterface_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextmetrics_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextnode_p.h
 qt6/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextnodeengine_p.h
@@ -901,15 +906,16 @@ qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickfusion
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickfusionknob_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickfusionstyle_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickfusiontheme_p.h
-qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickimageselector_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickimaginestyle_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickimaginetheme_p.h
+qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickioscursorflashtimer_p.h
+qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickiosstyle_p.h
+qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickiostheme_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickmaterialbusyindicator_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickmaterialprogressbar_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickmaterialripple_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickmaterialstyle_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickmaterialtheme_p.h
-qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickninepatchimage_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickstyle_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickstyleplugin_p.h
 qt6/include/QtQuickControls2/${PKGVERSION}/QtQuickControls2/private/qquickuniversalbusyindicator_p.h
@@ -937,8 +943,10 @@ qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qqui
 qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qquickiconimage_p_p.h
 qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qquickiconlabel_p.h
 qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qquickiconlabel_p_p.h
+qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qquickimageselector_p.h
 qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qquickitemgroup_p.h
 qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qquickmnemoniclabel_p.h
+qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qquickninepatchimage_p.h
 qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qquickpaddedrectangle_p.h
 qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qquickplaceholdertext_p.h
 qt6/include/QtQuickControls2Impl/${PKGVERSION}/QtQuickControls2Impl/private/qquickplatformtheme_p.h
@@ -959,6 +967,7 @@ qt6/include/QtQuickControlsTestUtils/QtQuickControlsTestUtilsDepends
 qt6/include/QtQuickControlsTestUtils/QtQuickControlsTestUtilsVersion
 qt6/include/QtQuickControlsTestUtils/qtquickcontrolstestutilsversion.h
 qt6/include/QtQuickDialogs2/${PKGVERSION}/QtQuickDialogs2/private/qquickabstractdialog_p.h
+qt6/include/QtQuickDialogs2/${PKGVERSION}/QtQuickDialogs2/private/qquickcolordialog_p.h
 qt6/include/QtQuickDialogs2/${PKGVERSION}/QtQuickDialogs2/private/qquickfiledialog_p.h
 qt6/include/QtQuickDialogs2/${PKGVERSION}/QtQuickDialogs2/private/qquickfolderdialog_p.h
 qt6/include/QtQuickDialogs2/${PKGVERSION}/QtQuickDialogs2/private/qquickfontdialog_p.h
@@ -971,6 +980,12 @@ qt6/include/QtQuickDialogs2/QtQuickDialogs2Depends
 qt6/include/QtQuickDialogs2/QtQuickDialogs2Version
 qt6/include/QtQuickDialogs2/qtquickdialogs2exports.h
 qt6/include/QtQuickDialogs2/qtquickdialogs2version.h
+qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickabstractcolorpicker_p.h
+qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickabstractcolorpicker_p_p.h
+qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickcolordialogimpl_p.h
+qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickcolordialogimpl_p_p.h
+qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickcolordialogutils_p.h
+qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickcolorinputs_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickdialogimplfactory_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickfiledialogdelegate_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickfiledialogimpl_p.h
@@ -983,10 +998,12 @@ qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/priv
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickfontdialogimpl_p_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickmessagedialogimpl_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickmessagedialogimpl_p_p.h
+qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickplatformcolordialog_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickplatformfiledialog_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickplatformfolderdialog_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickplatformfontdialog_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquickplatformmessagedialog_p.h
+qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qquicksaturationlightnesspicker_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qtquickdialogs2quickimplexports_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qtquickdialogs2quickimplforeign_p.h
 qt6/include/QtQuickDialogs2QuickImpl/${PKGVERSION}/QtQuickDialogs2QuickImpl/private/qtquickdialogs2quickimplglobal_p.h
@@ -1568,19 +1585,29 @@ qt6/lib/cmake/Qt6Qml/Qt6QmlDependencies.cmake
 qt6/lib/cmake/Qt6Qml/Qt6QmlDeploySupport.cmake
 qt6/lib/cmake/Qt6Qml/Qt6QmlFindQmlscInternal.cmake
 qt6/lib/cmake/Qt6Qml/Qt6QmlMacros.cmake
+qt6/lib/cmake/Qt6Qml/Qt6QmlModuleDirMappingTemplate.qrc.in
 qt6/lib/cmake/Qt6Qml/Qt6QmlPluginTemplate.cpp.in
+qt6/lib/cmake/Qt6Qml/Qt6QmlPlugins.cmake
 qt6/lib/cmake/Qt6Qml/Qt6QmlTargets-release.cmake
 qt6/lib/cmake/Qt6Qml/Qt6QmlTargets.cmake
 qt6/lib/cmake/Qt6Qml/Qt6QmlVersionlessTargets.cmake
+qt6/lib/cmake/Qt6Qml/Qt6QmltcFileMappingTemplate.qrc.in
 qt6/lib/cmake/Qt6Qml/Qt6qmldirTemplate.cmake.in
 qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateAdditionalTargetInfo.cmake
 qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfig.cmake
 qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfigVersion.cmake
 qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateDependencies.cmake
+qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivatePlugins.cmake
 qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateTargets-release.cmake
 qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateTargets.cmake
 qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateVersionlessTargets.cmake
+qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginConfig.cmake
+qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginConfigVersion.cmake
+qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginTargets-release.cmake
+qt6/lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginTargets.cmake
 qt6/lib/cmake/Qt6QmlCore/Qt6QmlCoreAdditionalTargetInfo.cmake
 qt6/lib/cmake/Qt6QmlCore/Qt6QmlCoreConfig.cmake
 qt6/lib/cmake/Qt6QmlCore/Qt6QmlCoreConfigVersion.cmake
@@ -1615,14 +1642,6 @@ qt6/lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationConfigVersion.cmake
 qt6/lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationTargets.cmake
 qt6/lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationVersionlessTargets.cmake
-qt6/lib/cmake/Qt6QmlLintPrivate/Qt6QmlLintPrivateAdditionalTargetInfo.cmake
-qt6/lib/cmake/Qt6QmlLintPrivate/Qt6QmlLintPrivateConfig.cmake
-qt6/lib/cmake/Qt6QmlLintPrivate/Qt6QmlLintPrivateConfigVersion.cmake
-qt6/lib/cmake/Qt6QmlLintPrivate/Qt6QmlLintPrivateConfigVersionImpl.cmake
-qt6/lib/cmake/Qt6QmlLintPrivate/Qt6QmlLintPrivateDependencies.cmake
-qt6/lib/cmake/Qt6QmlLintPrivate/Qt6QmlLintPrivateTargets-release.cmake
-qt6/lib/cmake/Qt6QmlLintPrivate/Qt6QmlLintPrivateTargets.cmake
-qt6/lib/cmake/Qt6QmlLintPrivate/Qt6QmlLintPrivateVersionlessTargets.cmake
 qt6/lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageAdditionalTargetInfo.cmake
 qt6/lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageConfig.cmake
 qt6/lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageConfigVersion.cmake
@@ -1805,8 +1824,10 @@ qt6/lib/libQt6Qml.prl
 qt6/lib/libQt6Qml.so
 qt6/lib/libQt6Qml.so.6
 qt6/lib/libQt6Qml.so.${PKGVERSION}
-qt6/lib/libQt6QmlCompiler.a
 qt6/lib/libQt6QmlCompiler.prl
+qt6/lib/libQt6QmlCompiler.so
+qt6/lib/libQt6QmlCompiler.so.6
+qt6/lib/libQt6QmlCompiler.so.${PKGVERSION}
 qt6/lib/libQt6QmlCore.prl
 qt6/lib/libQt6QmlCore.so
 qt6/lib/libQt6QmlCore.so.6
@@ -1815,8 +1836,6 @@ qt6/lib/libQt6QmlDebug.a
 qt6/lib/libQt6QmlDebug.prl
 qt6/lib/libQt6QmlDom.a
 qt6/lib/libQt6QmlDom.prl
-qt6/lib/libQt6QmlLint.a
-qt6/lib/libQt6QmlLint.prl
 qt6/lib/libQt6QmlLocalStorage.prl
 qt6/lib/libQt6QmlLocalStorage.so
 qt6/lib/libQt6QmlLocalStorage.so.6
@@ -1897,7 +1916,6 @@ qt6/lib/metatypes/qt6qmlcompilerprivate_release_metatypes.json
 qt6/lib/metatypes/qt6qmlcore_release_metatypes.json
 qt6/lib/metatypes/qt6qmldebugprivate_release_metatypes.json
 qt6/lib/metatypes/qt6qmldomprivate_release_metatypes.json
-qt6/lib/metatypes/qt6qmllintprivate_release_metatypes.json
 qt6/lib/metatypes/qt6qmllocalstorage_release_metatypes.json
 qt6/lib/metatypes/qt6qmlmodels_release_metatypes.json
 qt6/lib/metatypes/qt6qmlworkerscript_release_metatypes.json
@@ -1916,7 +1934,6 @@ qt6/lib/metatypes/qt6quicktemplates2_release_metatypes.json
 qt6/lib/metatypes/qt6quicktest_release_metatypes.json
 qt6/lib/metatypes/qt6quicktestutilsprivate_release_metatypes.json
 qt6/lib/metatypes/qt6quickwidgets_release_metatypes.json
-qt6/lib/objects-Release/QmlCompilerPrivate_resources_1/.rcc/qrc_builtins.cpp.o
 qt6/lib/pkgconfig/Qt6LabsAnimation.pc
 qt6/lib/pkgconfig/Qt6LabsFolderListModel.pc
 qt6/lib/pkgconfig/Qt6LabsQmlModels.pc
@@ -1968,7 +1985,6 @@ qt6/mkspecs/modules/qt_lib_qmldebug_private.pri
 qt6/mkspecs/modules/qt_lib_qmldom_private.pri
 qt6/mkspecs/modules/qt_lib_qmlintegration.pri
 qt6/mkspecs/modules/qt_lib_qmlintegration_private.pri
-qt6/mkspecs/modules/qt_lib_qmllint_private.pri
 qt6/mkspecs/modules/qt_lib_qmllocalstorage.pri
 qt6/mkspecs/modules/qt_lib_qmllocalstorage_private.pri
 qt6/mkspecs/modules/qt_lib_qmlmodels.pri
@@ -2014,7 +2030,6 @@ qt6/modules/QmlCore.json
 qt6/modules/QmlDebugPrivate.json
 qt6/modules/QmlDomPrivate.json
 qt6/modules/QmlIntegration.json
-qt6/modules/QmlLintPrivate.json
 qt6/modules/QmlLocalStorage.json
 qt6/modules/QmlModels.json
 qt6/modules/QmlWorkerScript.json
@@ -2033,6 +2048,7 @@ qt6/modules/QuickTemplates2.json
 qt6/modules/QuickTest.json
 qt6/modules/QuickTestUtilsPrivate.json
 qt6/modules/QuickWidgets.json
+qt6/plugins/qmllint/libquicklintplugin.so
 qt6/plugins/qmltooling/libqmldbg_debugger.so
 qt6/plugins/qmltooling/libqmldbg_inspector.so
 qt6/plugins/qmltooling/libqmldbg_local.so
@@ -2198,6 +2214,7 @@ qt6/qml/QtQuick/Controls/Fusion/ToolBar.qml
 qt6/qml/QtQuick/Controls/Fusion/ToolButton.qml
 qt6/qml/QtQuick/Controls/Fusion/ToolSeparator.qml
 qt6/qml/QtQuick/Controls/Fusion/ToolTip.qml
+qt6/qml/QtQuick/Controls/Fusion/TreeViewDelegate.qml
 qt6/qml/QtQuick/Controls/Fusion/Tumbler.qml
 qt6/qml/QtQuick/Controls/Fusion/VerticalHeaderView.qml
 qt6/qml/QtQuick/Controls/Fusion/impl/ButtonPanel.qml
@@ -2264,8 +2281,8 @@ qt6/qml/QtQuick/Controls/Imagine/Tumbler.qml
 qt6/qml/QtQuick/Controls/Imagine/VerticalHeaderView.qml
 qt6/qml/QtQuick/Controls/Imagine/impl/OpacityMask.qml
 qt6/qml/QtQuick/Controls/Imagine/impl/libqtquickcontrols2imaginestyleimplplugin.so
-qt6/qml/QtQuick/Controls/Imagine/impl/plugins.qmltypes
 qt6/qml/QtQuick/Controls/Imagine/impl/qmldir
+qt6/qml/QtQuick/Controls/Imagine/impl/qtquickcontrols2imaginestyleimplplugin.qmltypes
 qt6/qml/QtQuick/Controls/Imagine/libqtquickcontrols2imaginestyleplugin.so
 qt6/qml/QtQuick/Controls/Imagine/plugins.qmltypes
 qt6/qml/QtQuick/Controls/Imagine/qmldir
@@ -2319,6 +2336,7 @@ qt6/qml/QtQuick/Controls/Material/ToolBar.qml
 qt6/qml/QtQuick/Controls/Material/ToolButton.qml
 qt6/qml/QtQuick/Controls/Material/ToolSeparator.qml
 qt6/qml/QtQuick/Controls/Material/ToolTip.qml
+qt6/qml/QtQuick/Controls/Material/TreeViewDelegate.qml
 qt6/qml/QtQuick/Controls/Material/Tumbler.qml
 qt6/qml/QtQuick/Controls/Material/VerticalHeaderView.qml
 qt6/qml/QtQuick/Controls/Material/impl/BoxShadow.qml
@@ -2542,6 +2560,7 @@ qt6/qml/QtQuick/Dialogs/plugins.qmltypes
 qt6/qml/QtQuick/Dialogs/qmldir
 qt6/qml/QtQuick/Dialogs/quickimpl/libqtquickdialogs2quickimplplugin.so
 qt6/qml/QtQuick/Dialogs/quickimpl/plugins.qmltypes
+qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Fusion/ColorDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Fusion/FileDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Fusion/FileDialogDelegate.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Fusion/FolderBreadcrumbBar.qml
@@ -2549,6 +2568,7 @@ qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Fusion/FolderDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Fusion/FolderDialogDelegate.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Fusion/FontDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Fusion/MessageDialog.qml
+qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Imagine/ColorDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Imagine/FileDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Imagine/FileDialogDelegate.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Imagine/FolderBreadcrumbBar.qml
@@ -2556,6 +2576,7 @@ qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Imagine/FolderDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Imagine/FolderDialogDelegate.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Imagine/FontDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Imagine/MessageDialog.qml
+qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Material/ColorDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Material/FileDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Material/FileDialogDelegate.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Material/FolderBreadcrumbBar.qml
@@ -2563,6 +2584,7 @@ qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Material/FolderDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Material/FolderDialogDelegate.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Material/FontDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Material/MessageDialog.qml
+qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Universal/ColorDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Universal/FileDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Universal/FileDialogDelegate.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Universal/FolderBreadcrumbBar.qml
@@ -2570,6 +2592,8 @@ qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Universal/FolderDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Universal/FolderDialogDelegate.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Universal/FontDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/+Universal/MessageDialog.qml
+qt6/qml/QtQuick/Dialogs/quickimpl/qml/ColorDialog.qml
+qt6/qml/QtQuick/Dialogs/quickimpl/qml/ColorInputs.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/FileDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/FileDialogDelegate.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/FileDialogDelegateLabel.qml
@@ -2579,7 +2603,10 @@ qt6/qml/QtQuick/Dialogs/quickimpl/qml/FolderDialogDelegate.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/FolderDialogDelegateLabel.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/FontDialog.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/FontDialogContent.qml
+qt6/qml/QtQuick/Dialogs/quickimpl/qml/HueGradient.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qml/MessageDialog.qml
+qt6/qml/QtQuick/Dialogs/quickimpl/qml/PickerHandle.qml
+qt6/qml/QtQuick/Dialogs/quickimpl/qml/SaturationLightnessPicker.qml
 qt6/qml/QtQuick/Dialogs/quickimpl/qmldir
 qt6/qml/QtQuick/Layouts/libqquicklayoutsplugin.so
 qt6/qml/QtQuick/Layouts/plugins.qmltypes
diff --git a/qt6-qtdeclarative/buildlink3.mk b/qt6-qtdeclarative/buildlink3.mk
index a0019e8079..a63dac829b 100644
--- a/qt6-qtdeclarative/buildlink3.mk
+++ b/qt6-qtdeclarative/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtdeclarative
 .if !defined(QT6_QTDECLARATIVE_BUILDLINK3_MK)
 QT6_QTDECLARATIVE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtdeclarative+=	qt6-qtdeclarative>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtdeclarative+=	qt6-qtdeclarative>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtdeclarative?=		../../wip/qt6-qtdeclarative
 
 BUILDLINK_INCDIRS.qt6-qtdeclarative+=	qt6/include
diff --git a/qt6-qtdeclarative/distinfo b/qt6-qtdeclarative/distinfo
index 3f04822ca7..bf473ea4d8 100644
--- a/qt6-qtdeclarative/distinfo
+++ b/qt6-qtdeclarative/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (qtdeclarative-everywhere-src-6.3.2.tar.xz) = 816cd688ce5a3ff02598da96a866bcfb453aa764ac156886bc608e93c438d5a4
-SHA512 (qtdeclarative-everywhere-src-6.3.2.tar.xz) = 4929bd1e5ff16475847ddd75322353afc35c7a06688d32e6186649b38a08d88f435a134fdcfbb4f9fe588f9cd317eb8c0fb6aa0f08416b900064156f3af926af
-Size (qtdeclarative-everywhere-src-6.3.2.tar.xz) = 30157476 bytes
+BLAKE2s (qtdeclarative-everywhere-src-6.4.0.tar.xz) = 4a1b08369c43bc3a1a5b8e5825aaa0719b582aec933dfa007d5622c9dc6e2430
+SHA512 (qtdeclarative-everywhere-src-6.4.0.tar.xz) = 6d43c09a14e2ca236fc50166ed477e37084e89a67a04d914f30f31662a18a4e6d0433cb9b2f0654ba9ffcbcd7abcb5dadcb7b12f0ef5928fc11b10925ee6f41e
+Size (qtdeclarative-everywhere-src-6.4.0.tar.xz) = 30538764 bytes
 SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 697cd2dc622aebabf640e1625494c981dcf6df19
 SHA1 (patch-src_3rdparty_masm_wtf_Compiler.h) = 8d7e318e0148eea0f262ec13463bc15bd03478dc
 SHA1 (patch-src_qml_common_qv4alloca__p.h) = 15a300585e4f5acf956badf0d94e388934883041
diff --git a/qt6-qtimageformats/buildlink3.mk b/qt6-qtimageformats/buildlink3.mk
index d00c4ce820..164d516c69 100644
--- a/qt6-qtimageformats/buildlink3.mk
+++ b/qt6-qtimageformats/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtimageformats
 .if !defined(QT6_QTIMAGEFORMATS_BUILDLINK3_MK)
 QT6_QTIMAGEFORMATS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtimageformats+=	qt6-qtimageformats>=6.0.1
+BUILDLINK_API_DEPENDS.qt6-qtimageformats+=	qt6-qtimageformats>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtimageformats?=	../../wip/qt6-qtimageformats
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtimageformats/distinfo b/qt6-qtimageformats/distinfo
index 078bb483dd..483c86dd27 100644
--- a/qt6-qtimageformats/distinfo
+++ b/qt6-qtimageformats/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtimageformats-everywhere-src-6.3.2.tar.xz) = ed1ad92f2581169522f19f10b3dcefb193005e4797fb3a5479d888a4ce088b90
-SHA512 (qtimageformats-everywhere-src-6.3.2.tar.xz) = 5964c1f0e5fc4032495641268881f2288f90f361cb5a7e4953e05005ea907033ef634192ef26e1b0343e09c1a0306f83bef88ad4a5dba4665387001290dccc77
-Size (qtimageformats-everywhere-src-6.3.2.tar.xz) = 1859996 bytes
+BLAKE2s (qtimageformats-everywhere-src-6.4.0.tar.xz) = 158e5dc47db770d3eb35e0acc5a607e3fa3ada4711e6412088152620faa31fda
+SHA512 (qtimageformats-everywhere-src-6.4.0.tar.xz) = 3a7302cfbe9187ffb753c7171c62bbf43223c9c876bb0df20de8b593d51ef775bffeff124d269ed8d4ce7e1fb3d55790acd75bce0b5d5bfa223e5e83dfb41f01
+Size (qtimageformats-everywhere-src-6.4.0.tar.xz) = 1861400 bytes
diff --git a/qt6-qtlanguageserver/buildlink3.mk b/qt6-qtlanguageserver/buildlink3.mk
index f29e99cb2e..aaf5bdda77 100644
--- a/qt6-qtlanguageserver/buildlink3.mk
+++ b/qt6-qtlanguageserver/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtlanguageserver
 .if !defined(QT6_QTLANGUAGESERVER_BUILDLINK3_MK)
 QT6_QTLANGUAGESERVER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtlanguageserver+=	qt6-qtlanguageserver>=6.3.0
+BUILDLINK_API_DEPENDS.qt6-qtlanguageserver+=	qt6-qtlanguageserver>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtlanguageserver?=	../../wip/qt6-qtlanguageserver
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtlanguageserver/distinfo b/qt6-qtlanguageserver/distinfo
index 07878f308d..41fd462d1b 100644
--- a/qt6-qtlanguageserver/distinfo
+++ b/qt6-qtlanguageserver/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtlanguageserver-everywhere-src-6.3.2.tar.xz) = 8a56d9f6d5a2829eed65618216c5b52b820377fe901808453987382f244b72b0
-SHA512 (qtlanguageserver-everywhere-src-6.3.2.tar.xz) = 69c944e27ddd8b4e779f1f12fb9691a62219db4699f83380818bc149b5b1b2a92582eafa5573eee1ca01a6856a7ad79153a7a56e0eb0aa6b2113d2548b2f153e
-Size (qtlanguageserver-everywhere-src-6.3.2.tar.xz) = 147844 bytes
+BLAKE2s (qtlanguageserver-everywhere-src-6.4.0.tar.xz) = 6135e0bf5f415d8c33056f5554c80157e1f0d5e9237c1a97b8b40ed866dc2a8a
+SHA512 (qtlanguageserver-everywhere-src-6.4.0.tar.xz) = a9fe6ee83bed2e7b2cd4da12e286fb5d6c2b9e3ecb807d220426956532eebbf2df3bf3a1775e8d9b5eea9ed4dcbeec3494e495f24a40be80066e698799304403
+Size (qtlanguageserver-everywhere-src-6.4.0.tar.xz) = 153328 bytes
diff --git a/qt6-qtlottie/distinfo b/qt6-qtlottie/distinfo
index 5e5c1ac8d9..ca37a53491 100644
--- a/qt6-qtlottie/distinfo
+++ b/qt6-qtlottie/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtlottie-everywhere-src-6.3.2.tar.xz) = a6b1187e3e68fc32ce1ff1938c54c8c03518641c3ca8e22911485970e437ac95
-SHA512 (qtlottie-everywhere-src-6.3.2.tar.xz) = 973ecf403cb1944e24176f4b021b17e0eb7d06a188b92d71e3ae41cd59a668f57e7fd135607b428a9822af0daa7f18bf84b4f8436d0e1c4587797d3735ae2088
-Size (qtlottie-everywhere-src-6.3.2.tar.xz) = 92372 bytes
+BLAKE2s (qtlottie-everywhere-src-6.4.0.tar.xz) = e88c2913bdc7b003d6006aa9e094cffd82705c56bdd4efe4430dfd169e0e2e1a
+SHA512 (qtlottie-everywhere-src-6.4.0.tar.xz) = 3fb3d35b289fc47f5eecf9052f419142f3e91504b7bc92786bf0f56f84273db81f9fbd8477937d2e04c7cdf3e46764f9fa7ac09240ceae6a641617906631e0fc
+Size (qtlottie-everywhere-src-6.4.0.tar.xz) = 91788 bytes
diff --git a/qt6-qtmultimedia/Makefile b/qt6-qtmultimedia/Makefile
index a5ad1876dd..68324c12d4 100644
--- a/qt6-qtmultimedia/Makefile
+++ b/qt6-qtmultimedia/Makefile
@@ -14,8 +14,11 @@ CONFIGURE_ARGS+=	-no-alsa
 
 PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Multimedia.pc
 PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6MultimediaWidgets.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6SpatialAudio.pc
 
+.include "../../multimedia/ffmpeg5/buildlink3.mk"
 .include "../../wip/qt6-qtbase/buildlink3.mk"
 .include "../../wip/qt6-qtdeclarative/buildlink3.mk"
+.include "../../wip/qt6-qtquick3d/buildlink3.mk"
 .include "../../wip/qt6-qtshadertools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qtmultimedia/PLIST b/qt6-qtmultimedia/PLIST
index 858f413418..c14c607beb 100644
--- a/qt6-qtmultimedia/PLIST
+++ b/qt6-qtmultimedia/PLIST
@@ -1,89 +1,16 @@
 @comment $NetBSD$
 lib/pkgconfig/Qt6Multimedia.pc
 lib/pkgconfig/Qt6MultimediaWidgets.pc
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/androidcamera_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/androidmediametadataretriever_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/androidmediaplayer_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/androidmediarecorder_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/androidmultimediautils_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/androidsurfacetexture_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/androidsurfaceview_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfaudiodecoder_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfaudiopreviewdelegate_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfcamera_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfcameradebug_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfcamerarenderer_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfcameraservice_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfcamerasession_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfcamerautility_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfdisplaylink_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfimagecapture_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfmediaassetwriter_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfmediaencoder_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfmediaplayer_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfmetadata_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfvideobuffer_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfvideorenderercontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/avfvideosink_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcameraaudioencodersettingscontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcameracontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcameraexposurecontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcamerafocuscontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcameraimagecapturecontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcameraimageprocessingcontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcameramediarecordercontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcameraorientationhandler_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcameraservice_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcamerasession_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/bbcameravideoencodersettingscontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/evrcustompresenter_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/evrd3dpresentengine_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/evrhelpers_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/evrvideowindowcontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mfactivate_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mfaudiodecodercontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mfdecodersourcereader_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mfevrvideowindowcontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mfmetadata_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mfplayercontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mfplayersession_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mfstream_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mftvideo_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mfvideorenderercontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mmrenderermediaplayercontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mmrenderermetadata_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mmrendererplayervideorenderercontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mmrendererutil_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mmrenderervideowindowcontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mmreventmediaplayercontrol_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/mmreventthread_p.h
+lib/pkgconfig/Qt6SpatialAudio.pc
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qabstractvideobuffer_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qalsaaudiodevice_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qalsaaudiosink_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qalsaaudiosource_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qalsaintegration_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qalsamediadevices_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidaudiodecoder_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidaudiodevice_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidaudioinput_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidaudiooutput_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidaudiosink_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidaudiosource_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidcamera_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidcamerasession_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidcapturesession_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidformatsinfo_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidglobal_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidimagecapture_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidintegration_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidmediacapturesession_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidmediadevices_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidmediaencoder_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidmediaplayer_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidmetadata_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidmultimediautils_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidvideooutput_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qandroidvideosink_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiodevice_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudioengine_pulse_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiohelpers_p.h
@@ -95,43 +22,12 @@ qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qcoreaudioutils_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdarwinaudiodevice_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdarwinaudiosink_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdarwinaudiosource_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdarwinformatsinfo_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdarwinintegration_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdarwinmediadevices_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgst_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstappsrc_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstpipeline_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudiodecoder_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudiodevice_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudioinput_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudiooutput_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudiosink_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudiosource_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamerbufferprobe_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamercamera_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamerformatinfo_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamerimagecapture_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamerintegration_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermediacapture_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermediadevices_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermediaencoder_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermediaplayer_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermessage_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermetadata_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideooutput_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideooverlay_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideosink_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstsubtitlesink_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstutils_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstvideobuffer_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstvideorenderersink_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qiso639_2_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaplayer_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediarecorder_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediastoragelocation_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmemoryvideobuffer_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmultimediautils_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qnxaudioutils_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qopenslesengine_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformaudiodecoder_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformaudioinput_p.h
@@ -143,10 +39,11 @@ qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformmediadevice
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformmediaformatinfo_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformmediaintegration_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformmediaplayer_p.h
+qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformmediaplugin_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformmediarecorder_p.h
+qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformvideodevices_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplatformvideosink_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiodevice_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiointegration_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiomediadevices_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiosink_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulseaudiosource_p.h
@@ -154,12 +51,13 @@ qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qpulsehelpers_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qqnxaudiodevice_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qqnxaudiosink_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qqnxaudiosource_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qqnxdevicemanager_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qqnxintegration_p.h
+qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qqnxaudioutils_p.h
+qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qqnxmediadevices_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsamplecache_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qtmultimedia-config_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qtmultimediaglobal_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideoframeconversionhelper_p.h
+qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideoframeconverter_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideooutputorientationhandler_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideotexturehelper_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideowindow_p.h
@@ -167,27 +65,15 @@ qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwasmaudiodevice_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwasmaudiosink_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwasmaudiosource_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwasmmediadevices_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwasmmediaintegration_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsaudiodevice_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsaudiosink_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsaudiosource_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsaudioutils_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowscamera_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsformatinfo_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsimagecapture_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsintegration_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsiupointer_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsmediacapture_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsmediadevicereader_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsmediadevices_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsmediadevicesession_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsmediaencoder_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsmfdefs_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsmultimediautils_p.h
 qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qwindowsresampler_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/samplegrabber_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/sourceresolver_p.h
-qt6/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/windowgrabber_p.h
 qt6/include/QtMultimedia/QAudio
 qt6/include/QtMultimedia/QAudioBuffer
 qt6/include/QtMultimedia/QAudioDecoder
@@ -274,21 +160,79 @@ qt6/include/QtMultimediaWidgets/qtmultimediawidgetsexports.h
 qt6/include/QtMultimediaWidgets/qtmultimediawidgetsglobal.h
 qt6/include/QtMultimediaWidgets/qtmultimediawidgetsversion.h
 qt6/include/QtMultimediaWidgets/qvideowidget.h
+qt6/include/QtQuick3DSpatialAudio/${PKGVERSION}/QtQuick3DSpatialAudio/private/qquick3dambientsound_p.h
+qt6/include/QtQuick3DSpatialAudio/${PKGVERSION}/QtQuick3DSpatialAudio/private/qquick3daudioengine_p.h
+qt6/include/QtQuick3DSpatialAudio/${PKGVERSION}/QtQuick3DSpatialAudio/private/qquick3daudiolistener_p.h
+qt6/include/QtQuick3DSpatialAudio/${PKGVERSION}/QtQuick3DSpatialAudio/private/qquick3daudioroom_p.h
+qt6/include/QtQuick3DSpatialAudio/${PKGVERSION}/QtQuick3DSpatialAudio/private/qquick3dspatialsound_p.h
+qt6/include/QtQuick3DSpatialAudio/${PKGVERSION}/QtQuick3DSpatialAudio/private/qtquick3daudioglobal_p.h
+qt6/include/QtQuick3DSpatialAudio/${PKGVERSION}/QtQuick3DSpatialAudio/private/qtquick3daudiotypes_p.h
+qt6/include/QtQuick3DSpatialAudio/QtQuick3DSpatialAudio
+qt6/include/QtQuick3DSpatialAudio/QtQuick3DSpatialAudioDepends
+qt6/include/QtQuick3DSpatialAudio/QtQuick3DSpatialAudioVersion
+qt6/include/QtQuick3DSpatialAudio/qtquick3dspatialaudioexports.h
+qt6/include/QtQuick3DSpatialAudio/qtquick3dspatialaudioversion.h
+qt6/include/QtSpatialAudio/${PKGVERSION}/QtSpatialAudio/private/qambisonicdecoder_p.h
+qt6/include/QtSpatialAudio/${PKGVERSION}/QtSpatialAudio/private/qambisonicdecoderdata_p.h
+qt6/include/QtSpatialAudio/${PKGVERSION}/QtSpatialAudio/private/qaudioengine_p.h
+qt6/include/QtSpatialAudio/${PKGVERSION}/QtSpatialAudio/private/qaudioroom_p.h
+qt6/include/QtSpatialAudio/${PKGVERSION}/QtSpatialAudio/private/qspatialsound_p.h
+qt6/include/QtSpatialAudio/${PKGVERSION}/QtSpatialAudio/private/qtspatialaudioglobal_p.h
+qt6/include/QtSpatialAudio/QAmbientSound
+qt6/include/QtSpatialAudio/QAudioEngine
+qt6/include/QtSpatialAudio/QAudioListener
+qt6/include/QtSpatialAudio/QAudioRoom
+qt6/include/QtSpatialAudio/QSpatialSound
+qt6/include/QtSpatialAudio/QtSpatialAudio
+qt6/include/QtSpatialAudio/QtSpatialAudioDepends
+qt6/include/QtSpatialAudio/QtSpatialAudioVersion
+qt6/include/QtSpatialAudio/qambientsound.h
+qt6/include/QtSpatialAudio/qaudioengine.h
+qt6/include/QtSpatialAudio/qaudiolistener.h
+qt6/include/QtSpatialAudio/qaudioroom.h
+qt6/include/QtSpatialAudio/qspatialsound.h
+qt6/include/QtSpatialAudio/qtspatialaudioexports.h
+qt6/include/QtSpatialAudio/qtspatialaudioglobal.h
+qt6/include/QtSpatialAudio/qtspatialaudioversion.h
 qt6/lib/cmake/Qt6/FindAVFoundation.cmake
+qt6/lib/cmake/Qt6/FindFFmpeg.cmake
 qt6/lib/cmake/Qt6/FindGObject.cmake
 qt6/lib/cmake/Qt6/FindGStreamer.cmake
 qt6/lib/cmake/Qt6/FindMMRenderer.cmake
+qt6/lib/cmake/Qt6/FindMMRendererCore.cmake
+qt6/lib/cmake/Qt6/FindVAAPI.cmake
 qt6/lib/cmake/Qt6/FindWMF.cmake
+qt6/lib/cmake/Qt6/FindWrapBundledResonanceAudioConfigExtra.cmake
 qt6/lib/cmake/Qt6/FindWrapPulseAudio.cmake
 qt6/lib/cmake/Qt6BuildInternals/StandaloneTests/QtMultimediaTestsConfig.cmake
+qt6/lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioConfig.cmake
+qt6/lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioConfigVersion.cmake
+qt6/lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioTargets-release.cmake
+qt6/lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioTargets.cmake
+qt6/lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioVersionlessTargets.cmake
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaAdditionalTargetInfo.cmake
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaConfig.cmake
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaConfigVersion.cmake
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaDependencies.cmake
+qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaPlugins.cmake
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaTargets-release.cmake
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaTargets.cmake
 qt6/lib/cmake/Qt6Multimedia/Qt6MultimediaVersionlessTargets.cmake
+qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginConfig.cmake
+qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginConfigVersion.cmake
+qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginTargets-release.cmake
+qt6/lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginTargets.cmake
+${PLIST.gstreamer}qt6/lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginAdditionalTargetInfo.cmake
+${PLIST.gstreamer}qt6/lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginConfig.cmake
+${PLIST.gstreamer}qt6/lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginConfigVersion.cmake
+${PLIST.gstreamer}qt6/lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginConfigVersionImpl.cmake
+${PLIST.gstreamer}qt6/lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginTargets-release.cmake
+${PLIST.gstreamer}qt6/lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginTargets.cmake
 qt6/lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateAdditionalTargetInfo.cmake
 qt6/lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateConfig.cmake
 qt6/lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateConfigVersion.cmake
@@ -305,12 +249,35 @@ qt6/lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsDependencies.cmake
 qt6/lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets-release.cmake
 qt6/lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets.cmake
 qt6/lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessTargets.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfig.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfigVersion.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioTargets-release.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioTargets.cmake
 qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaAdditionalTargetInfo.cmake
 qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaConfig.cmake
 qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaConfigVersion.cmake
 qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaTargets-release.cmake
 qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaTargets.cmake
+qt6/lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateConfig.cmake
+qt6/lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateConfigVersion.cmake
+qt6/lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateDependencies.cmake
+qt6/lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateTargets-release.cmake
+qt6/lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateTargets.cmake
+qt6/lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateVersionlessTargets.cmake
+qt6/lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioConfig.cmake
+qt6/lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioConfigVersion.cmake
+qt6/lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioDependencies.cmake
+qt6/lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioTargets-release.cmake
+qt6/lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioTargets.cmake
+qt6/lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake
+qt6/lib/libQt6BundledResonanceAudio.a
 qt6/lib/libQt6Multimedia.prl
 qt6/lib/libQt6Multimedia.so
 qt6/lib/libQt6Multimedia.so.6
@@ -323,20 +290,41 @@ qt6/lib/libQt6MultimediaWidgets.prl
 qt6/lib/libQt6MultimediaWidgets.so
 qt6/lib/libQt6MultimediaWidgets.so.6
 qt6/lib/libQt6MultimediaWidgets.so.${PKGVERSION}
+qt6/lib/libQt6Quick3DSpatialAudio.prl
+qt6/lib/libQt6Quick3DSpatialAudio.so
+qt6/lib/libQt6Quick3DSpatialAudio.so.6
+qt6/lib/libQt6Quick3DSpatialAudio.so.${PKGVERSION}
+qt6/lib/libQt6SpatialAudio.prl
+qt6/lib/libQt6SpatialAudio.so
+qt6/lib/libQt6SpatialAudio.so.6
+qt6/lib/libQt6SpatialAudio.so.${PKGVERSION}
 qt6/lib/metatypes/qt6multimedia_release_metatypes.json
 qt6/lib/metatypes/qt6multimediaquickprivate_release_metatypes.json
 qt6/lib/metatypes/qt6multimediawidgets_release_metatypes.json
+qt6/lib/metatypes/qt6quick3dspatialaudioprivate_release_metatypes.json
+qt6/lib/metatypes/qt6spatialaudio_release_metatypes.json
 qt6/lib/pkgconfig/Qt6Multimedia.pc
 qt6/lib/pkgconfig/Qt6MultimediaWidgets.pc
+qt6/lib/pkgconfig/Qt6SpatialAudio.pc
 qt6/mkspecs/modules/qt_lib_multimedia.pri
 qt6/mkspecs/modules/qt_lib_multimedia_private.pri
 qt6/mkspecs/modules/qt_lib_multimediaquick_private.pri
 qt6/mkspecs/modules/qt_lib_multimediawidgets.pri
 qt6/mkspecs/modules/qt_lib_multimediawidgets_private.pri
+qt6/mkspecs/modules/qt_lib_quick3dspatialaudio_private.pri
+qt6/mkspecs/modules/qt_lib_spatialaudio.pri
+qt6/mkspecs/modules/qt_lib_spatialaudio_private.pri
 qt6/modules/Multimedia.json
 qt6/modules/MultimediaQuickPrivate.json
 qt6/modules/MultimediaWidgets.json
+qt6/modules/Quick3DSpatialAudioPrivate.json
+qt6/modules/SpatialAudio.json
+qt6/plugins/multimedia/libffmpegmediaplugin.so
+${PLIST.gstreamer}qt6/plugins/multimedia/libgstreamermediaplugin.so
 qt6/qml/QtMultimedia/Video.qml
 qt6/qml/QtMultimedia/libquickmultimediaplugin.so
 qt6/qml/QtMultimedia/plugins.qmltypes
 qt6/qml/QtMultimedia/qmldir
+qt6/qml/QtQuick3D/SpatialAudio/libquick3dspatialaudioplugin.so
+qt6/qml/QtQuick3D/SpatialAudio/plugins.qmltypes
+qt6/qml/QtQuick3D/SpatialAudio/qmldir
diff --git a/qt6-qtmultimedia/buildlink3.mk b/qt6-qtmultimedia/buildlink3.mk
index ad9b5c23dd..879c1a9368 100644
--- a/qt6-qtmultimedia/buildlink3.mk
+++ b/qt6-qtmultimedia/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtmultimedia
 .if !defined(QT6_QTMULTIMEDIA_BUILDLINK3_MK)
 QT6_QTMULTIMEDIA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtmultimedia+=	qt6-qtmultimedia>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtmultimedia+=	qt6-qtmultimedia>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtmultimedia?=		../../wip/qt6-qtmultimedia
 
 pkgbase := qt6-qtmultimedia
diff --git a/qt6-qtmultimedia/distinfo b/qt6-qtmultimedia/distinfo
index 8f5ec417dc..096c79ac5a 100644
--- a/qt6-qtmultimedia/distinfo
+++ b/qt6-qtmultimedia/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtmultimedia-everywhere-src-6.3.2.tar.xz) = db15b719044e5531a17e86a0fa01d236554b0b8bc02471a557591a42a80bfe4b
-SHA512 (qtmultimedia-everywhere-src-6.3.2.tar.xz) = d6b31aad99a71096cac0655da99245553efdeabb67f6625893d23a31ce7c8b7e15219558933174a6577913ef903092b3230f211dd36b29ecfac782d7f358df27
-Size (qtmultimedia-everywhere-src-6.3.2.tar.xz) = 4746380 bytes
+BLAKE2s (qtmultimedia-everywhere-src-6.4.0.tar.xz) = 7ce48f2ffcf5b263763e2f9d44fab3340f9f77245f9059ac3f53dc054e97c02a
+SHA512 (qtmultimedia-everywhere-src-6.4.0.tar.xz) = fd5f0d73374290ecf70d30395b2ddbb05439979a29b5e6b37a1ac40338ffe602ea62b7bb8f3c053b2da35fa9c4101bd6e0a12ee9479c04bb2d63c527c77cb685
+Size (qtmultimedia-everywhere-src-6.4.0.tar.xz) = 5936088 bytes
diff --git a/qt6-qtmultimedia/options.mk b/qt6-qtmultimedia/options.mk
index aeb9d826fa..7a56e4989b 100644
--- a/qt6-qtmultimedia/options.mk
+++ b/qt6-qtmultimedia/options.mk
@@ -1,11 +1,13 @@
 # $NetBSD: options.mk,v 1.8 2021/07/16 13:33:02 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.qt6-qtmultimedia
-PKG_OPTIONS_OPTIONAL_GROUPS=	platform
-PKG_OPTIONS_GROUP.platform=	gstreamer pulseaudio
+PKG_SUPPORTED_OPTIONS=		gstreamer pulseaudio
+PKG_SUGGESTED_OPTIONS=		pulseaudio
 
 .include "../../mk/bsd.fast.prefs.mk"
 
+PLIST_VARS+=			gstreamer
+
 .if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=		gstreamer
 .endif
@@ -15,19 +17,14 @@ PKG_SUGGESTED_OPTIONS+=		gstreamer
 .if !empty(PKG_OPTIONS:Mgstreamer)
 CONFIGURE_ARGS+=	-gstreamer
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+PLIST.gstreamer=	yes
 .else
 CONFIGURE_ARGS+=	-no-gstreamer
 .endif
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)
-MAKE_ENV+=	LFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib/pulseaudio
 CONFIGURE_ARGS+=	-pulseaudio
 .include "../../audio/pulseaudio/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	-no-pulseaudio
 .endif
-
-PLIST_VARS+=		audioengine
-.if ${OPSYS} == "QNX" || ${OPSYS} == "Darwin" || empty(PKG_OPTIONS:Mgstreamer)
-PLIST.audioengine=	yes
-.endif
diff --git a/qt6-qtnetworkauth/buildlink3.mk b/qt6-qtnetworkauth/buildlink3.mk
index 3a3dd5828e..ce1f7a3930 100644
--- a/qt6-qtnetworkauth/buildlink3.mk
+++ b/qt6-qtnetworkauth/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtnetworkauth
 .if !defined(QT6_QTNETWORKAUTH_BUILDLINK3_MK)
 QT6_QTNETWORKAUTH_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtnetworkauth+=	qt6-qtnetworkauth>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtnetworkauth+=	qt6-qtnetworkauth>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtnetworkauth?=		../../wip/qt6-qtnetworkauth
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtnetworkauth/distinfo b/qt6-qtnetworkauth/distinfo
index d0dee733f1..e25a97c363 100644
--- a/qt6-qtnetworkauth/distinfo
+++ b/qt6-qtnetworkauth/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtnetworkauth-everywhere-src-6.3.2.tar.xz) = 979fb0b0d4685c80de6a09882198393d479c6bd97d8af66e6ff1d1f48d7b2938
-SHA512 (qtnetworkauth-everywhere-src-6.3.2.tar.xz) = dfe52c4ce02d07181293f80ebffe9ff7060f5f63f7c9a6d38c7e13aa131ab5ef4d51e07a16303458f85b04bd6b1bfe3878614d05d1936877c1ce1f6b34da2fe0
-Size (qtnetworkauth-everywhere-src-6.3.2.tar.xz) = 145400 bytes
+BLAKE2s (qtnetworkauth-everywhere-src-6.4.0.tar.xz) = 9cda785353169faf50776f50040c29d713e43bb28ee653fead806299c60b6b35
+SHA512 (qtnetworkauth-everywhere-src-6.4.0.tar.xz) = fdefb6ec3477f8da9e78419414f850d94baddfa83b7252c402cde91dabee7cdc51eeee6e761bbadb07d37cef4525131adfd4bdeadb25e977934d4be1a85d8d57
+Size (qtnetworkauth-everywhere-src-6.4.0.tar.xz) = 144928 bytes
diff --git a/qt6-qtquick3d/PLIST b/qt6-qtquick3d/PLIST
index 5ef8ea764e..ae0a5e62a4 100644
--- a/qt6-qtquick3d/PLIST
+++ b/qt6-qtquick3d/PLIST
@@ -17,7 +17,9 @@ qt6/bin/meshdebug
 qt6/bin/shadergen
 qt6/bin/shapegen
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dabstractlight_p.h
+qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dbakedlightmap_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dcamera_p.h
+qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dcubemaptexture_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dcustomcamera_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dcustommaterial_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3ddefaultmaterial_p.h
@@ -28,6 +30,7 @@ qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dgeometry_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dinstancing_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3ditem2d_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3djoint_p.h
+qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dlightmapper_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dloader_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dmaterial_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dmodel_p.h
@@ -53,6 +56,8 @@ qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dscenerenderer_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dscenerootnode_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dshaderutils_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dskeleton_p.h
+qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dskin_p.h
+qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dspecularglossymaterial_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dspotlight_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dtexture_p.h
 qt6/include/QtQuick3D/${PKGVERSION}/QtQuick3D/private/qquick3dtexturedata_p.h
@@ -80,7 +85,6 @@ qt6/include/QtQuick3DAssetImport/${PKGVERSION}/QtQuick3DAssetImport/private/qssg
 qt6/include/QtQuick3DAssetImport/${PKGVERSION}/QtQuick3DAssetImport/private/qssgassetimporterfactory_p.h
 qt6/include/QtQuick3DAssetImport/${PKGVERSION}/QtQuick3DAssetImport/private/qssgassetimporterplugin_p.h
 qt6/include/QtQuick3DAssetImport/${PKGVERSION}/QtQuick3DAssetImport/private/qssgassetimportmanager_p.h
-qt6/include/QtQuick3DAssetImport/${PKGVERSION}/QtQuick3DAssetImport/private/qssglightmapuvgenerator_p.h
 qt6/include/QtQuick3DAssetImport/${PKGVERSION}/QtQuick3DAssetImport/private/qtquick3dassetimportexports_p.h
 qt6/include/QtQuick3DAssetImport/${PKGVERSION}/QtQuick3DAssetImport/private/qtquick3dassetimportglobal_p.h
 qt6/include/QtQuick3DAssetImport/QtQuick3DAssetImport
@@ -120,6 +124,10 @@ qt6/include/QtQuick3DGlslParser/QtQuick3DGlslParserVersion
 qt6/include/QtQuick3DGlslParser/qtquick3dglslparserexports.h
 qt6/include/QtQuick3DGlslParser/qtquick3dglslparserversion.h
 qt6/include/QtQuick3DHelpers/${PKGVERSION}/QtQuick3DHelpers/private/gridgeometry_p.h
+qt6/include/QtQuick3DHelpers/${PKGVERSION}/QtQuick3DHelpers/private/heightfieldgeometry_p.h
+qt6/include/QtQuick3DHelpers/${PKGVERSION}/QtQuick3DHelpers/private/instancerepeater_p.h
+qt6/include/QtQuick3DHelpers/${PKGVERSION}/QtQuick3DHelpers/private/lookatnode_p.h
+qt6/include/QtQuick3DHelpers/${PKGVERSION}/QtQuick3DHelpers/private/proceduralskytexturedata_p.h
 qt6/include/QtQuick3DHelpers/${PKGVERSION}/QtQuick3DHelpers/private/qtquick3dhelpersexports_p.h
 qt6/include/QtQuick3DHelpers/${PKGVERSION}/QtQuick3DHelpers/private/qtquick3dhelpersglobal_p.h
 qt6/include/QtQuick3DHelpers/${PKGVERSION}/QtQuick3DHelpers/private/randominstancing_p.h
@@ -147,11 +155,14 @@ qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3d
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticleemitburst_p.h
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticleemitter_p.h
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticlegravity_p.h
+qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticlelineparticle_p.h
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticlemodelblendparticle_p.h
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticlemodelparticle_p.h
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticlemodelshape_p.h
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticlepointrotator_p.h
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticlerandomizer_p.h
+qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticlerepeller_p.h
+qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticlescaleaffector_p.h
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticleshape_p.h
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticleshapedatautils_p.h
 qt6/include/QtQuick3DParticles/${PKGVERSION}/QtQuick3DParticles/private/qquick3dparticlespriteparticle_p.h
@@ -171,6 +182,8 @@ qt6/include/QtQuick3DParticles/QtQuick3DParticlesVersion
 qt6/include/QtQuick3DParticles/qtquick3dparticlesexports.h
 qt6/include/QtQuick3DParticles/qtquick3dparticlesglobal.h
 qt6/include/QtQuick3DParticles/qtquick3dparticlesversion.h
+qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssglayerrenderdata_p.h
+qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssglightmapper_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgperframeallocator_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderableimage_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderableobjects_p.h
@@ -184,9 +197,6 @@ qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderdefaultmaterialshadergenerator_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendereffect_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderer_p.h
-qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendererimpllayerrenderdata_p.h
-qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendererimpllayerrenderhelper_p.h
-qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendererimpllayerrenderpreparationdata_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendererutil_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendergeometry_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendergraphobject_p.h
@@ -198,13 +208,13 @@ qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderlayer_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderlight_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderloadedtexture_p.h
-qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendermaterialdirty_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendermaterialshadergenerator_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendermesh_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendermodel_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendermorphtarget_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendernode_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderparticles_p.h
+qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderpickresult_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderray_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderreflectionmap_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderreflectionprobe_p.h
@@ -216,6 +226,7 @@ qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendershadermetadata_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendershadowmap_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderskeleton_p.h
+qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrenderskin_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrendertexturedata_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrhicontext_p.h
 qt6/include/QtQuick3DRuntimeRender/${PKGVERSION}/QtQuick3DRuntimeRender/private/qssgrhicustommaterialsystem_p.h
@@ -239,6 +250,7 @@ qt6/include/QtQuick3DUtils/${PKGVERSION}/QtQuick3DUtils/private/qquick3dprofiler
 qt6/include/QtQuick3DUtils/${PKGVERSION}/QtQuick3DUtils/private/qssgbounds3_p.h
 qt6/include/QtQuick3DUtils/${PKGVERSION}/QtQuick3DUtils/private/qssgdataref_p.h
 qt6/include/QtQuick3DUtils/${PKGVERSION}/QtQuick3DUtils/private/qssginvasivelinkedlist_p.h
+qt6/include/QtQuick3DUtils/${PKGVERSION}/QtQuick3DUtils/private/qssglightmapuvgenerator_p.h
 qt6/include/QtQuick3DUtils/${PKGVERSION}/QtQuick3DUtils/private/qssgmesh_p.h
 qt6/include/QtQuick3DUtils/${PKGVERSION}/QtQuick3DUtils/private/qssgmeshbvh_p.h
 qt6/include/QtQuick3DUtils/${PKGVERSION}/QtQuick3DUtils/private/qssgmeshbvhbuilder_p.h
@@ -317,15 +329,10 @@ qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportConfig.cmake
 qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportConfigVersion.cmake
 qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportDependencies.cmake
+qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportPlugins.cmake
 qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportTargets-release.cmake
 qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportTargets.cmake
 qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportVersionlessTargets.cmake
-qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6UipAssetImporterPluginAdditionalTargetInfo.cmake
-qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6UipAssetImporterPluginConfig.cmake
-qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6UipAssetImporterPluginConfigVersion.cmake
-qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6UipAssetImporterPluginConfigVersionImpl.cmake
-qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6UipAssetImporterPluginTargets-release.cmake
-qt6/lib/cmake/Qt6Quick3DAssetImport/Qt6UipAssetImporterPluginTargets.cmake
 qt6/lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsAdditionalTargetInfo.cmake
 qt6/lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsConfig.cmake
 qt6/lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsConfigVersion.cmake
@@ -504,7 +511,6 @@ qt6/modules/Quick3DParticles.json
 qt6/modules/Quick3DRuntimeRender.json
 qt6/modules/Quick3DUtils.json
 qt6/plugins/assetimporters/libassimp.so
-qt6/plugins/assetimporters/libuip.so
 qt6/plugins/qmltooling/libqmldbg_quick3dprofiler.so
 qt6/qml/QtQuick3D/AssetUtils/designer/IdComboBox.qml
 qt6/qml/QtQuick3D/AssetUtils/designer/NodeSection.qml
@@ -593,6 +599,7 @@ qt6/qml/QtQuick3D/Effects/libqtquick3deffectplugin.so
 qt6/qml/QtQuick3D/Effects/qmldir
 qt6/qml/QtQuick3D/Helpers/AxisHelper.qml
 qt6/qml/QtQuick3D/Helpers/DebugView.qml
+qt6/qml/QtQuick3D/Helpers/OrbitCameraController.qml
 qt6/qml/QtQuick3D/Helpers/WasdController.qml
 qt6/qml/QtQuick3D/Helpers/designer/AxisHelperSection.qml
 qt6/qml/QtQuick3D/Helpers/designer/AxisHelperSpecifics.qml
@@ -601,6 +608,8 @@ qt6/qml/QtQuick3D/Helpers/designer/DebugViewSpecifics.qml
 qt6/qml/QtQuick3D/Helpers/designer/GridGeometrySection.qml
 qt6/qml/QtQuick3D/Helpers/designer/GridGeometrySpecifics.qml
 qt6/qml/QtQuick3D/Helpers/designer/IdComboBox.qml
+qt6/qml/QtQuick3D/Helpers/designer/LookAtNodeSection.qml
+qt6/qml/QtQuick3D/Helpers/designer/LookAtNodeSpecifics.qml
 qt6/qml/QtQuick3D/Helpers/designer/NodeSection.qml
 qt6/qml/QtQuick3D/Helpers/designer/WasdControllerSection.qml
 qt6/qml/QtQuick3D/Helpers/designer/WasdControllerSpecifics.qml
@@ -617,6 +626,9 @@ qt6/qml/QtQuick3D/Helpers/designer/images/dummy%2x.png@localhost
 qt6/qml/QtQuick3D/Helpers/designer/images/gridgeometry.png
 qt6/qml/QtQuick3D/Helpers/designer/images/gridgeometry16.png
 qt6/qml/QtQuick3D/Helpers/designer/images/gridgeometry%2x.png@localhost
+qt6/qml/QtQuick3D/Helpers/designer/images/lookatnode.png
+qt6/qml/QtQuick3D/Helpers/designer/images/lookatnode16.png
+qt6/qml/QtQuick3D/Helpers/designer/images/lookatnode%2x.png@localhost
 qt6/qml/QtQuick3D/Helpers/designer/images/wasdcontroller.png
 qt6/qml/QtQuick3D/Helpers/designer/images/wasdcontroller16.png
 qt6/qml/QtQuick3D/Helpers/designer/images/wasdcontroller%2x.png@localhost
@@ -664,6 +676,8 @@ qt6/qml/QtQuick3D/Particles3D/designer/EmitBurst3DSpecifics.qml
 qt6/qml/QtQuick3D/Particles3D/designer/Gravity3DSection.qml
 qt6/qml/QtQuick3D/Particles3D/designer/Gravity3DSpecifics.qml
 qt6/qml/QtQuick3D/Particles3D/designer/IdComboBox.qml
+qt6/qml/QtQuick3D/Particles3D/designer/LineParticle3DSection.qml
+qt6/qml/QtQuick3D/Particles3D/designer/LineParticle3DSpecifics.qml
 qt6/qml/QtQuick3D/Particles3D/designer/ModelBlendParticle3DSection.qml
 qt6/qml/QtQuick3D/Particles3D/designer/ModelBlendParticle3DSpecifics.qml
 qt6/qml/QtQuick3D/Particles3D/designer/ModelParticle3DSection.qml
@@ -682,6 +696,10 @@ qt6/qml/QtQuick3D/Particles3D/designer/ParticleSystem3DSection.qml
 qt6/qml/QtQuick3D/Particles3D/designer/ParticleSystem3DSpecifics.qml
 qt6/qml/QtQuick3D/Particles3D/designer/PointRotator3DSection.qml
 qt6/qml/QtQuick3D/Particles3D/designer/PointRotator3DSpecifics.qml
+qt6/qml/QtQuick3D/Particles3D/designer/Repeller3DSection.qml
+qt6/qml/QtQuick3D/Particles3D/designer/Repeller3DSpecifics.qml
+qt6/qml/QtQuick3D/Particles3D/designer/ScaleAffector3DSection.qml
+qt6/qml/QtQuick3D/Particles3D/designer/ScaleAffector3DSpecifics.qml
 qt6/qml/QtQuick3D/Particles3D/designer/SpriteParticle3DSection.qml
 qt6/qml/QtQuick3D/Particles3D/designer/SpriteParticle3DSpecifics.qml
 qt6/qml/QtQuick3D/Particles3D/designer/SpriteSequence3DSection.qml
@@ -709,6 +727,9 @@ qt6/qml/QtQuick3D/Particles3D/designer/images/emitter-24px%2x.png@localhost
 qt6/qml/QtQuick3D/Particles3D/designer/images/gravity-16px.png
 qt6/qml/QtQuick3D/Particles3D/designer/images/gravity-24px.png
 qt6/qml/QtQuick3D/Particles3D/designer/images/gravity-24px%2x.png@localhost
+qt6/qml/QtQuick3D/Particles3D/designer/images/line-particle-16px.png
+qt6/qml/QtQuick3D/Particles3D/designer/images/line-particle-24px.png
+qt6/qml/QtQuick3D/Particles3D/designer/images/line-particle-24px%2x.png@localhost
 qt6/qml/QtQuick3D/Particles3D/designer/images/model-blend-particle-16px.png
 qt6/qml/QtQuick3D/Particles3D/designer/images/model-blend-particle-24px.png
 qt6/qml/QtQuick3D/Particles3D/designer/images/model-blend-particle-24px%2x.png@localhost
@@ -727,6 +748,12 @@ qt6/qml/QtQuick3D/Particles3D/designer/images/particle-system-24px%2x.png@localhost
 qt6/qml/QtQuick3D/Particles3D/designer/images/point-rotator-16px.png
 qt6/qml/QtQuick3D/Particles3D/designer/images/point-rotator-24px.png
 qt6/qml/QtQuick3D/Particles3D/designer/images/point-rotator-24px%2x.png@localhost
+qt6/qml/QtQuick3D/Particles3D/designer/images/repeller-16px.png
+qt6/qml/QtQuick3D/Particles3D/designer/images/repeller-24px.png
+qt6/qml/QtQuick3D/Particles3D/designer/images/repeller-24px%2x.png@localhost
+qt6/qml/QtQuick3D/Particles3D/designer/images/scale-affector-16px.png
+qt6/qml/QtQuick3D/Particles3D/designer/images/scale-affector-24px.png
+qt6/qml/QtQuick3D/Particles3D/designer/images/scale-affector-24px%2x.png@localhost
 qt6/qml/QtQuick3D/Particles3D/designer/images/sprite-particle-16px.png
 qt6/qml/QtQuick3D/Particles3D/designer/images/sprite-particle-24px.png
 qt6/qml/QtQuick3D/Particles3D/designer/images/sprite-particle-24px%2x.png@localhost
@@ -763,6 +790,8 @@ qt6/qml/QtQuick3D/designer/BufferInputSection.qml
 qt6/qml/QtQuick3D/designer/BufferInputSpecifics.qml
 qt6/qml/QtQuick3D/designer/BufferSection.qml
 qt6/qml/QtQuick3D/designer/BufferSpecifics.qml
+qt6/qml/QtQuick3D/designer/CameraSection.qml
+qt6/qml/QtQuick3D/designer/CustomCameraSpecifics.qml
 qt6/qml/QtQuick3D/designer/CustomMaterialSection.qml
 qt6/qml/QtQuick3D/designer/CustomMaterialSpecifics.qml
 qt6/qml/QtQuick3D/designer/DefaultMaterialSection.qml
@@ -879,6 +908,9 @@ qt6/qml/QtQuick3D/designer/images/morphtarget%2x.png@localhost
 qt6/qml/QtQuick3D/designer/images/plane.png
 qt6/qml/QtQuick3D/designer/images/plane16.png
 qt6/qml/QtQuick3D/designer/images/plane%2x.png@localhost
+qt6/qml/QtQuick3D/designer/images/reflectionProbe.png
+qt6/qml/QtQuick3D/designer/images/reflectionProbe16.png
+qt6/qml/QtQuick3D/designer/images/reflectionProbe%2x.png@localhost
 qt6/qml/QtQuick3D/designer/images/repeater3d.png
 qt6/qml/QtQuick3D/designer/images/repeater3d16.png
 qt6/qml/QtQuick3D/designer/images/repeater3d%2x.png@localhost
diff --git a/qt6-qtquick3d/buildlink3.mk b/qt6-qtquick3d/buildlink3.mk
index 025f8a0b80..b8aeef7dab 100644
--- a/qt6-qtquick3d/buildlink3.mk
+++ b/qt6-qtquick3d/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtquick3d
 .if !defined(QT6_QTQUICK3D_BUILDLINK3_MK)
 QT6_QTQUICK3D_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtquick3d+=	qt6-qtquick3d>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtquick3d+=	qt6-qtquick3d>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtquick3d?=	../../wip/qt6-qtquick3d
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtquick3d/distinfo b/qt6-qtquick3d/distinfo
index 67bd614c2a..605ae8adef 100644
--- a/qt6-qtquick3d/distinfo
+++ b/qt6-qtquick3d/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtquick3d-everywhere-src-6.3.2.tar.xz) = bedbc6ea967e4998cf1c254470bbba769e0332570a17dc20aeaed1b8410c7867
-SHA512 (qtquick3d-everywhere-src-6.3.2.tar.xz) = ffe2ff5f64278640c1cc543737cf4fe3d814630fef24602ffd1d166e32dee5d5e929d029abb7573cb28502bd00e1b6217998dc54a3ab4606d053809ff12acf20
-Size (qtquick3d-everywhere-src-6.3.2.tar.xz) = 37291276 bytes
+BLAKE2s (qtquick3d-everywhere-src-6.4.0.tar.xz) = e9530dd0e9594e8ef32ebe626493d8cef4c9e7c172b339281a3298d0659bf2c2
+SHA512 (qtquick3d-everywhere-src-6.4.0.tar.xz) = 4fb9e4e40355a83dd19970fc6e942a3a510ce68becd7df92a19ffad7cb4eb6f0bd9b826bde9e0040776018802b756e20978092a6ea4a4d8cc38e7862529610d3
+Size (qtquick3d-everywhere-src-6.4.0.tar.xz) = 41490276 bytes
diff --git a/qt6-qtquicktimeline/buildlink3.mk b/qt6-qtquicktimeline/buildlink3.mk
index 6375c4286b..ed8a4a7c02 100644
--- a/qt6-qtquicktimeline/buildlink3.mk
+++ b/qt6-qtquicktimeline/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtquicktimeline
 .if !defined(QT6_QTQUICKTIMELINE_BUILDLINK3_MK)
 QT6_QTQUICKTIMELINE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtquicktimeline+=	qt6-qtquicktimeline>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtquicktimeline+=	qt6-qtquicktimeline>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtquicktimeline?=	../../wip/qt6-qtquicktimeline
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtquicktimeline/distinfo b/qt6-qtquicktimeline/distinfo
index a9957909dd..72fe0d2b33 100644
--- a/qt6-qtquicktimeline/distinfo
+++ b/qt6-qtquicktimeline/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtquicktimeline-everywhere-src-6.3.2.tar.xz) = 60abf3e360332afbd33088dd7f7bdbc3605650ea9aeb26760c3e963d5a9c6a5c
-SHA512 (qtquicktimeline-everywhere-src-6.3.2.tar.xz) = fb1807c80bf0af34514aa8db76f167fec75e0e9604c266dba6bf1a560a61ee1395d440fee25457a2a3913708e6fca6b708ccf6a62002b03a0880e5256fba2bed
-Size (qtquicktimeline-everywhere-src-6.3.2.tar.xz) = 113448 bytes
+BLAKE2s (qtquicktimeline-everywhere-src-6.4.0.tar.xz) = 5d38d62a7590f671d8fe3757f3c523af4fa265292cdb1363701d8b7a934c8d16
+SHA512 (qtquicktimeline-everywhere-src-6.4.0.tar.xz) = 3818056b6f1b16ec443e895ce07582717331b768c036d073735c52b7ce385d8b53a93a9748eaa915885916e9267de7c4e731a5b01dfd5d643b0a594ed58ca577
+Size (qtquicktimeline-everywhere-src-6.4.0.tar.xz) = 112976 bytes
diff --git a/qt6-qtremoteobjects/buildlink3.mk b/qt6-qtremoteobjects/buildlink3.mk
index 65984ef519..bb82b0f2e5 100644
--- a/qt6-qtremoteobjects/buildlink3.mk
+++ b/qt6-qtremoteobjects/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtremoteobjects
 .if !defined(QT6_QTREMOTEOBJECTS_BUILDLINK3_MK)
 QT6_QTREMOTEOBJECTS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtremoteobjects+=	qt6-qtremoteobjects>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtremoteobjects+=	qt6-qtremoteobjects>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtremoteobjects?=	../../wip/qt6-qtremoteobjects
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtremoteobjects/distinfo b/qt6-qtremoteobjects/distinfo
index 26a3818a00..ae2e38258c 100644
--- a/qt6-qtremoteobjects/distinfo
+++ b/qt6-qtremoteobjects/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtremoteobjects-everywhere-src-6.3.2.tar.xz) = 4c51749b77bf1f9a926d5fea366c3a60b04d7202ceb1cb4dfbc09d782ed97160
-SHA512 (qtremoteobjects-everywhere-src-6.3.2.tar.xz) = 59b32ca733de3d10aa98f5d0304ce30acb6911434ef24e43de357e66310707180c596cf5a2af3c746c69ff9f4de98cccb46a94d1e5f0ed65e990e11addcdcac5
-Size (qtremoteobjects-everywhere-src-6.3.2.tar.xz) = 367404 bytes
+BLAKE2s (qtremoteobjects-everywhere-src-6.4.0.tar.xz) = a293b426ceb81c4b135c56a93d2ebbc240754dfd4c3cbbb9287783b69b8276fc
+SHA512 (qtremoteobjects-everywhere-src-6.4.0.tar.xz) = 17a76b78ce22277f46d28631dc205080bff4ca3cc93161de2f6a372f19cbd3351766be9c8754c7c51ec64771ef090792ffda0e73f47007a54c6fd8fcaab4a50f
+Size (qtremoteobjects-everywhere-src-6.4.0.tar.xz) = 365776 bytes
diff --git a/qt6-qtscxml/PLIST b/qt6-qtscxml/PLIST
index fc21498cef..d03edb9296 100644
--- a/qt6-qtscxml/PLIST
+++ b/qt6-qtscxml/PLIST
@@ -134,6 +134,7 @@ qt6/lib/cmake/Qt6Scxml/Qt6ScxmlConfigVersion.cmake
 qt6/lib/cmake/Qt6Scxml/Qt6ScxmlConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6Scxml/Qt6ScxmlDependencies.cmake
 qt6/lib/cmake/Qt6Scxml/Qt6ScxmlMacros.cmake
+qt6/lib/cmake/Qt6Scxml/Qt6ScxmlPlugins.cmake
 qt6/lib/cmake/Qt6Scxml/Qt6ScxmlTargets-release.cmake
 qt6/lib/cmake/Qt6Scxml/Qt6ScxmlTargets.cmake
 qt6/lib/cmake/Qt6Scxml/Qt6ScxmlVersionlessTargets.cmake
diff --git a/qt6-qtscxml/buildlink3.mk b/qt6-qtscxml/buildlink3.mk
index a8d94f07c7..6ac9599316 100644
--- a/qt6-qtscxml/buildlink3.mk
+++ b/qt6-qtscxml/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtscxml
 .if !defined(QT6_QTSCXML_BUILDLINK3_MK)
 QT6_QTSCXML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtscxml+=	qt6-qtscxml>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtscxml+=	qt6-qtscxml>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtscxml?=	../../wip/qt6-qtscxml
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtscxml/distinfo b/qt6-qtscxml/distinfo
index d31cb31cd1..a9cf547ae7 100644
--- a/qt6-qtscxml/distinfo
+++ b/qt6-qtscxml/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtscxml-everywhere-src-6.3.2.tar.xz) = 88b9f9a2cb357cadeb1940fc41d107d1f0db1b28c1e3c77d09bff0bde0de13a0
-SHA512 (qtscxml-everywhere-src-6.3.2.tar.xz) = 64f8cf91ac14364ed52ff032071b21f5f905693e6e66451751981bbd50e209246c6e3ce29c26e1dbb6559146e7ba867896f0a92f8936c4a124882bee42cd7f45
-Size (qtscxml-everywhere-src-6.3.2.tar.xz) = 1786480 bytes
+BLAKE2s (qtscxml-everywhere-src-6.4.0.tar.xz) = a5e39c4ac26424b09bb3b57cbbefb53f965d495258063e6bd32731a12d3d1c35
+SHA512 (qtscxml-everywhere-src-6.4.0.tar.xz) = 0b8ca6beb459469eab949b6465f74c042da987111dd32a21dfd9df68034e375dc6e33f95f95435e66e8c894246ba72e89bc851a6ab030555ea758b4c43c4c2ad
+Size (qtscxml-everywhere-src-6.4.0.tar.xz) = 1783696 bytes
diff --git a/qt6-qtshadertools/buildlink3.mk b/qt6-qtshadertools/buildlink3.mk
index f3cf02e7f0..7d7e082005 100644
--- a/qt6-qtshadertools/buildlink3.mk
+++ b/qt6-qtshadertools/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtshadertools
 .if !defined(QT6_QTSHADERTOOLS_BUILDLINK3_MK)
 QT6_QTSHADERTOOLS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtshadertools+=	qt6-qtshadertools>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtshadertools+=	qt6-qtshadertools>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtshadertools?=		../../wip/qt6-qtshadertools
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtshadertools/distinfo b/qt6-qtshadertools/distinfo
index 775524897b..32cedadfed 100644
--- a/qt6-qtshadertools/distinfo
+++ b/qt6-qtshadertools/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtshadertools-everywhere-src-6.3.2.tar.xz) = c863e84ad26082e96616dcfaf9b666a430849cce5f7dfa733c83501a7cc65e2f
-SHA512 (qtshadertools-everywhere-src-6.3.2.tar.xz) = 8394b5467a391fb2b87d22a4b4a2b5b8c0b5d6eb9ea4273aa115fd9b3cab6d955473ed0dc66858390df3d9b6655977baa47b52762cef5c6e95e44330f9040b8a
-Size (qtshadertools-everywhere-src-6.3.2.tar.xz) = 998380 bytes
+BLAKE2s (qtshadertools-everywhere-src-6.4.0.tar.xz) = 3f5a644edb7c3a4662541fb2e9bd7c1c55fc1f0d5a31fe3bf911ef56b1a418e4
+SHA512 (qtshadertools-everywhere-src-6.4.0.tar.xz) = 80f00b623e546786a2019c979fe8cc54f982665bf3f2d122db1b4d437c847f749a68ed7e316100a853d59ddf04dd10147cad55252a40cd9ff3511db963f3212b
+Size (qtshadertools-everywhere-src-6.4.0.tar.xz) = 1001332 bytes
diff --git a/qt6-qtsvg/buildlink3.mk b/qt6-qtsvg/buildlink3.mk
index 3043e4fb24..a37bf6a681 100644
--- a/qt6-qtsvg/buildlink3.mk
+++ b/qt6-qtsvg/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtsvg
 .if !defined(QT6_QTSVG_BUILDLINK3_MK)
 QT6_QTSVG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtsvg+=	qt6-qtsvg>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtsvg+=	qt6-qtsvg>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtsvg?=		../../wip/qt6-qtsvg
 
 BUILDLINK_INCDIRS.qt6-qtsvg+=	qt6/include
diff --git a/qt6-qtsvg/distinfo b/qt6-qtsvg/distinfo
index e33a60b036..f6de53ce11 100644
--- a/qt6-qtsvg/distinfo
+++ b/qt6-qtsvg/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtsvg-everywhere-src-6.3.2.tar.xz) = 63bc2873830f0c994d8b14ad1ae3188aa5311c5868a6979b12420a4c84c79315
-SHA512 (qtsvg-everywhere-src-6.3.2.tar.xz) = 2238f1eb3d325b2e17b7e64de5c7f55d1f6129fab7b123ff4c3290307b586d1e894d07a71faaa7f4cb30c1d28e2cc11b11705e03fa5e83c6baebe056a6b3c751
-Size (qtsvg-everywhere-src-6.3.2.tar.xz) = 1726940 bytes
+BLAKE2s (qtsvg-everywhere-src-6.4.0.tar.xz) = 9ac0b6f51fd40bab1b3f54765092bde72a6282320452874e5351537352a986ae
+SHA512 (qtsvg-everywhere-src-6.4.0.tar.xz) = f3a6b3bda1c0a3395528f99b5f7b9647a19aeeda0f97dc96bfb551b9c134a50166d1d58d7d63a411a84bcb482580c6907b2c231d570794a482f42126cec9dd89
+Size (qtsvg-everywhere-src-6.4.0.tar.xz) = 1726036 bytes
diff --git a/qt6-qttools/Makefile b/qt6-qttools/Makefile
index dd11745db3..a982359ed8 100644
--- a/qt6-qttools/Makefile
+++ b/qt6-qttools/Makefile
@@ -12,6 +12,8 @@ PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Designer.pc
 PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Help.pc
 PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6UiTools.pc
 
+PLIST_VARS=		dbus
+
 .include "../../lang/clang/buildlink3.mk"
 .include "../../wip/litehtml/buildlink3.mk"
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qttools/PLIST b/qt6-qttools/PLIST
index 53759c97a8..0c01504157 100644
--- a/qt6-qttools/PLIST
+++ b/qt6-qttools/PLIST
@@ -11,8 +11,8 @@ qt6/bin/linguist
 qt6/bin/lrelease
 qt6/bin/lupdate
 qt6/bin/pixeltool
-qt6/bin/qdbus
-qt6/bin/qdbusviewer
+${PLIST.dbus}qt6/bin/qdbus
+${PLIST.dbus}qt6/bin/qdbusviewer
 qt6/bin/qdistancefieldgenerator
 qt6/bin/qdoc
 qt6/bin/qtdiag
@@ -269,6 +269,7 @@ qt6/lib/cmake/Qt6Designer/Qt6DesignerConfig.cmake
 qt6/lib/cmake/Qt6Designer/Qt6DesignerConfigVersion.cmake
 qt6/lib/cmake/Qt6Designer/Qt6DesignerConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6Designer/Qt6DesignerDependencies.cmake
+qt6/lib/cmake/Qt6Designer/Qt6DesignerPlugins.cmake
 qt6/lib/cmake/Qt6Designer/Qt6DesignerTargets-release.cmake
 qt6/lib/cmake/Qt6Designer/Qt6DesignerTargets.cmake
 qt6/lib/cmake/Qt6Designer/Qt6DesignerVersionlessTargets.cmake
diff --git a/qt6-qttools/buildlink3.mk b/qt6-qttools/buildlink3.mk
index 4a15e38318..b9a4c8afdc 100644
--- a/qt6-qttools/buildlink3.mk
+++ b/qt6-qttools/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qttools
 .if !defined(QT6_QTTOOLS_BUILDLINK3_MK)
 QT6_QTTOOLS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qttools+=	qt6-qttools>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qttools+=	qt6-qttools>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qttools?=	../../wip/qt6-qttools
 
 
diff --git a/qt6-qttools/distinfo b/qt6-qttools/distinfo
index 865ec38cb5..f7fd00c7cc 100644
--- a/qt6-qttools/distinfo
+++ b/qt6-qttools/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-BLAKE2s (qttools-everywhere-src-6.3.2.tar.xz) = 9316a8e78300127ead77359ee88983079b6cdfd6c23937b1c2f65fa359bee14b
-SHA512 (qttools-everywhere-src-6.3.2.tar.xz) = ca8b11dac82027979ff9b17b8beb50ea316cba6d8f422a291caa63a4f7c345942bf852733fd7243a27bcf46b1ca6a5af30e283377a8c6b73193004e3aa3837f1
-Size (qttools-everywhere-src-6.3.2.tar.xz) = 8629400 bytes
-SHA1 (patch-src_assistant_qlitehtml_src_container__qpainter.cpp) = b2f9fb7e30af8bd8e42e1ba65289d56590595493
-SHA1 (patch-src_assistant_qlitehtml_src_container__qpainter__p.h) = a478ef2748d2baf7cfb9e3a064a334d079a5c042
+BLAKE2s (qttools-everywhere-src-6.4.0.tar.xz) = a3c1100b131ea98c0bfe99292c5666d502c9a0c9c6c48152a4f554f23016b519
+SHA512 (qttools-everywhere-src-6.4.0.tar.xz) = ff4ed95491d26227b3bfea665fe810572f537a295dda0cffa26b18525961026db0471e7ef04667e3e4b8ae6b92dbedccb0fa77d733274c34d489d448b961ab44
+Size (qttools-everywhere-src-6.4.0.tar.xz) = 8738432 bytes
 SHA1 (patch-src_linguist_lupdate_CMakeLists.txt) = d70ea348c3ba7f64bcc245de9445becefecf3a9c
diff --git a/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter.cpp b/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter.cpp
deleted file mode 100644
index 6a44154abc..0000000000
--- a/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-* fix build with litehtml 0.6
-
---- src/assistant/qlitehtml/src/container_qpainter.cpp.orig	2022-07-09 11:08:02.699425232 +0000
-+++ src/assistant/qlitehtml/src/container_qpainter.cpp
-@@ -558,7 +558,7 @@ void DocumentContainerPrivate::draw_text
-     painter->drawText(toQRect(pos), 0, QString::fromUtf8(text));
- }
- 
--int DocumentContainerPrivate::pt_to_px(int pt)
-+int DocumentContainerPrivate::pt_to_px(int pt) const
- {
-     // magic factor of 11/12 to account for differences to webengine/webkit
-     return m_paintDevice->physicalDpiY() * pt * 11 / m_paintDevice->logicalDpiY() / 12;
diff --git a/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter__p.h b/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter__p.h
deleted file mode 100644
index 56cc9e4e9e..0000000000
--- a/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter__p.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-* fix build with litehtml 0.6
-
---- src/assistant/qlitehtml/src/container_qpainter_p.h.orig	2022-07-09 11:07:09.195443730 +0000
-+++ src/assistant/qlitehtml/src/container_qpainter_p.h
-@@ -96,7 +96,7 @@ public: // document_container API
-                    litehtml::uint_ptr hFont,
-                    litehtml::web_color color,
-                    const litehtml::position &pos) override;
--    int pt_to_px(int pt) override;
-+    int pt_to_px(int pt) const override;
-     int get_default_font_size() const override;
-     const litehtml::tchar_t *get_default_font_name() const override;
-     void draw_list_marker(litehtml::uint_ptr hdc, const litehtml::list_marker &marker) override;
diff --git a/qt6-qtwayland/Makefile b/qt6-qtwayland/Makefile
index 38c0fa91b3..d5fc821776 100644
--- a/qt6-qtwayland/Makefile
+++ b/qt6-qtwayland/Makefile
@@ -14,5 +14,4 @@ PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6WaylandCompositor.pc
 .include "../../devel/wayland/buildlink3.mk"
 .include "../../wip/qt6-qtbase/buildlink3.mk"
 .include "../../wip/qt6-qtdeclarative/buildlink3.mk"
-.include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qtwayland/PLIST b/qt6-qtwayland/PLIST
index 3c999bf3ad..d2961c2a83 100644
--- a/qt6-qtwayland/PLIST
+++ b/qt6-qtwayland/PLIST
@@ -11,6 +11,7 @@ qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwayland-qt-wi
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwayland-server-buffer-extension.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwayland-surface-extension.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwayland-tablet-unstable-v2.h
+qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwayland-text-input-unstable-v1.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwayland-text-input-unstable-v2.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwayland-text-input-unstable-v4-wip.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwayland-touch-extension.h
@@ -62,6 +63,7 @@ qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwaylandsubsur
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwaylandsurface_p.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwaylandtabletv2_p.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwaylandtextinputinterface_p.h
+qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwaylandtextinputv1_p.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwaylandtextinputv2_p.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwaylandtextinputv4_p.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwaylandtouch_p.h
@@ -77,6 +79,7 @@ qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/wayland-qt-win
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/wayland-surface-extension-client-protocol.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/wayland-tablet-unstable-v2-client-protocol.h
+qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/wayland-text-input-unstable-v1-client-protocol.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/wayland-text-input-unstable-v4-wip-client-protocol.h
 qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/wayland-touch-extension-client-protocol.h
@@ -440,6 +443,7 @@ qt6/lib/cmake/Qt6WaylandClient/Qt6WaylandClientConfigVersion.cmake
 qt6/lib/cmake/Qt6WaylandClient/Qt6WaylandClientConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6WaylandClient/Qt6WaylandClientDependencies.cmake
 qt6/lib/cmake/Qt6WaylandClient/Qt6WaylandClientMacros.cmake
+qt6/lib/cmake/Qt6WaylandClient/Qt6WaylandClientPlugins.cmake
 qt6/lib/cmake/Qt6WaylandClient/Qt6WaylandClientTargets-release.cmake
 qt6/lib/cmake/Qt6WaylandClient/Qt6WaylandClientTargets.cmake
 qt6/lib/cmake/Qt6WaylandClient/Qt6WaylandClientVersionlessTargets.cmake
@@ -467,6 +471,7 @@ qt6/lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorConfigVersion.cmake
 qt6/lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorDependencies.cmake
 qt6/lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorMacros.cmake
+qt6/lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorPlugins.cmake
 qt6/lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorTargets-release.cmake
 qt6/lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorTargets.cmake
 qt6/lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorVersionlessTargets.cmake
diff --git a/qt6-qtwayland/buildlink3.mk b/qt6-qtwayland/buildlink3.mk
index b1d5484906..25bc2cc060 100644
--- a/qt6-qtwayland/buildlink3.mk
+++ b/qt6-qtwayland/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtwayland
 .if !defined(QT6_QTWAYLAND_BUILDLINK3_MK)
 QT6_QTWAYLAND_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtwayland+=	qt6-qtwayland>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtwayland+=	qt6-qtwayland>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtwayland?=	../../wip/qt6-qtwayland
 
 BUILDLINK_LIBDIRS.qt6-qtwayland+=	qt6/plugins/platforms
diff --git a/qt6-qtwayland/distinfo b/qt6-qtwayland/distinfo
index e6b9859b60..fc3685a3c9 100644
--- a/qt6-qtwayland/distinfo
+++ b/qt6-qtwayland/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (qtwayland-everywhere-src-6.3.2.tar.xz) = cb98b9df33c5927beaec941d25067469d939d1c65341bddb8b75694b43d92038
-SHA512 (qtwayland-everywhere-src-6.3.2.tar.xz) = 475ba168bacb2d35a5962b27542f43420e3baf42d2026699b272174076ee6a26f8c3663ba8e44508f2011c5b7a2e4b3086390264cdf621b393c79fe89265bd03
-Size (qtwayland-everywhere-src-6.3.2.tar.xz) = 836192 bytes
+BLAKE2s (qtwayland-everywhere-src-6.4.0.tar.xz) = 80080da0e6c0b3253de26dca524f2fd1754c73090d99f29704d5c9ca03b5d9f0
+SHA512 (qtwayland-everywhere-src-6.4.0.tar.xz) = 745fcc84c936c3f2fa7382291b5013679f9e57d6c680f1d352b0a132ba7cbaaea1495211f8fc4f1af85a81c711794987e4e05284d3ac06c94e92e9b601dae924
+Size (qtwayland-everywhere-src-6.4.0.tar.xz) = 836088 bytes
 SHA1 (patch-CMakeLists.txt) = 15eda7d0287098f7efc2acd70b05b524de1aebc6
diff --git a/qt6-qtwebchannel/buildlink3.mk b/qt6-qtwebchannel/buildlink3.mk
index ad5adbe186..4c16dd111f 100644
--- a/qt6-qtwebchannel/buildlink3.mk
+++ b/qt6-qtwebchannel/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtwebchannel
 .if !defined(QT6_QTWEBCHANNEL_BUILDLINK3_MK)
 QT6_QTWEBCHANNEL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtwebchannel+=	qt6-qtwebchannel>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtwebchannel+=	qt6-qtwebchannel>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtwebchannel?=		../../wip/qt6-qtwebchannel
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtwebchannel/distinfo b/qt6-qtwebchannel/distinfo
index 830d15624a..be0baf6cac 100644
--- a/qt6-qtwebchannel/distinfo
+++ b/qt6-qtwebchannel/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtwebchannel-everywhere-src-6.3.2.tar.xz) = 60aa92850cdb5f1c2553cb41ac3ce500d9a1da6419d1a5b7f95e97a8e9938268
-SHA512 (qtwebchannel-everywhere-src-6.3.2.tar.xz) = 83de9a61d25bcf8346ff46417173ecffe15cff9802db524def1afbce4367f3d414b10e8042d45db36555945544dfe1c1d081e4ec33756250afca7ad58975c9d9
-Size (qtwebchannel-everywhere-src-6.3.2.tar.xz) = 213916 bytes
+BLAKE2s (qtwebchannel-everywhere-src-6.4.0.tar.xz) = 588bb5eaf23277016d8a42a67c062e5562ac8c034fd4fcfce97df1d2ed9e904a
+SHA512 (qtwebchannel-everywhere-src-6.4.0.tar.xz) = 5e668869646e9a4a115680004180948777c9cc2b4e6cc3afb4be74e298ec1e7338f61643ac1f46649d39f65e3f50de05d2b635d77bf211105e91dd0d5324fff6
+Size (qtwebchannel-everywhere-src-6.4.0.tar.xz) = 213096 bytes
diff --git a/qt6-qtwebsockets/PLIST b/qt6-qtwebsockets/PLIST
index 2ea4438d3b..f35882916b 100644
--- a/qt6-qtwebsockets/PLIST
+++ b/qt6-qtwebsockets/PLIST
@@ -1,11 +1,11 @@
 @comment $NetBSD$
 lib/pkgconfig/Qt6WebSockets.pc
 qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qdefaultmaskgenerator_p.h
-qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qsslserver_p.h
 qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsocket_p.h
 qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
 qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsocketdataprocessor_p.h
 qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsocketframe_p.h
+qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsockethandshakeoptions_p.h
 qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsockethandshakerequest_p.h
 qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsockethandshakeresponse_p.h
 qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsocketprotocol_p.h
@@ -13,6 +13,7 @@ qt6/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsocketserver_p.h
 qt6/include/QtWebSockets/QMaskGenerator
 qt6/include/QtWebSockets/QWebSocket
 qt6/include/QtWebSockets/QWebSocketCorsAuthenticator
+qt6/include/QtWebSockets/QWebSocketHandshakeOptions
 qt6/include/QtWebSockets/QWebSocketProtocol
 qt6/include/QtWebSockets/QWebSocketServer
 qt6/include/QtWebSockets/QtWebSockets
@@ -23,6 +24,7 @@ qt6/include/QtWebSockets/qtwebsocketsexports.h
 qt6/include/QtWebSockets/qtwebsocketsversion.h
 qt6/include/QtWebSockets/qwebsocket.h
 qt6/include/QtWebSockets/qwebsocketcorsauthenticator.h
+qt6/include/QtWebSockets/qwebsockethandshakeoptions.h
 qt6/include/QtWebSockets/qwebsocketprotocol.h
 qt6/include/QtWebSockets/qwebsockets_global.h
 qt6/include/QtWebSockets/qwebsocketserver.h
diff --git a/qt6-qtwebsockets/buildlink3.mk b/qt6-qtwebsockets/buildlink3.mk
index 7a673d86e8..b035ca5a9f 100644
--- a/qt6-qtwebsockets/buildlink3.mk
+++ b/qt6-qtwebsockets/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qt6-qtwebsockets
 .if !defined(QT6_QTWEBSOCKETS_BUILDLINK3_MK)
 QT6_QTWEBSOCKETS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt6-qtwebsockets+=	qt6-qtwebsockets>=6.3.1
+BUILDLINK_API_DEPENDS.qt6-qtwebsockets+=	qt6-qtwebsockets>=6.4.0
 BUILDLINK_PKGSRCDIR.qt6-qtwebsockets?=		../../wip/qt6-qtwebsockets
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtwebsockets/distinfo b/qt6-qtwebsockets/distinfo
index fd8f9a33ff..f1df7ff9fb 100644
--- a/qt6-qtwebsockets/distinfo
+++ b/qt6-qtwebsockets/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (qtwebsockets-everywhere-src-6.3.2.tar.xz) = a4a01ceba4ff756f404dc7b8fc90c7a0e2751fa38aafdbb50a451092e3efdd3e
-SHA512 (qtwebsockets-everywhere-src-6.3.2.tar.xz) = b57621b00d0919c57ced9eabd553a624585b16f9b061366af53abdd00c5ca6b203ed01323728d8de61b2dee7c905a20be3c31baf73780afe1cce4d5f0308483d
-Size (qtwebsockets-everywhere-src-6.3.2.tar.xz) = 264360 bytes
+BLAKE2s (qtwebsockets-everywhere-src-6.4.0.tar.xz) = 08de1b65f3276b1c65e2692de87b4eaf103407efe33d841033db594f65404abf
+SHA512 (qtwebsockets-everywhere-src-6.4.0.tar.xz) = dc2e86332a7c493afa66c3844443c3a5dbe830786f1127a0eac66594bb254ba1294389c24221d1984044caddc4afa1e4f9832382b403c7c9a8bf5c9dd21d53d0
+Size (qtwebsockets-everywhere-src-6.4.0.tar.xz) = 266400 bytes
diff --git a/qt6/Makefile.common b/qt6/Makefile.common
index 911b7f12b4..30c19c2d52 100644
--- a/qt6/Makefile.common
+++ b/qt6/Makefile.common
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.24 2020/09/14 20:08:26 adam Exp $
 # used by wip/qt6-qtbase/Makefile.common
 
-QTVERSION=	6.3.2
+QTVERSION=	6.4.0
 
 .include "../../mk/bsd.prefs.mk"
 



Home | Main Index | Thread Index | Old Index