pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Update Qt6 to version 6.3.1
Module Name: pkgsrc-wip
Committed By: Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By: nros
Date: Sat Jul 9 12:23:21 2022 +0200
Changeset: dff989c833faea2205247ce779b85f076c756c4b
Modified Files:
qt6-odbc/distinfo
qt6-psql/distinfo
qt6-qt3d/Makefile
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
qt6-qtbase/Makefile.common
qt6-qtbase/PLIST
qt6-qtbase/buildlink3.mk
qt6-qtbase/distinfo
qt6-qtbase/options.mk
qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake
qt6-qtcharts/Makefile
qt6-qtcharts/PLIST
qt6-qtcharts/buildlink3.mk
qt6-qtcharts/distinfo
qt6-qtdatavis3d/Makefile
qt6-qtdatavis3d/PLIST
qt6-qtdatavis3d/buildlink3.mk
qt6-qtdatavis3d/distinfo
qt6-qtdeclarative/Makefile
qt6-qtdeclarative/PLIST
qt6-qtdeclarative/buildlink3.mk
qt6-qtdeclarative/distinfo
qt6-qtimageformats/distinfo
qt6-qtlanguageserver/distinfo
qt6-qtlottie/distinfo
qt6-qtmultimedia/Makefile
qt6-qtmultimedia/PLIST
qt6-qtmultimedia/buildlink3.mk
qt6-qtmultimedia/distinfo
qt6-qtnetworkauth/Makefile
qt6-qtnetworkauth/PLIST
qt6-qtnetworkauth/buildlink3.mk
qt6-qtnetworkauth/distinfo
qt6-qtquick3d/Makefile
qt6-qtquick3d/PLIST
qt6-qtquick3d/buildlink3.mk
qt6-qtquick3d/distinfo
qt6-qtquicktimeline/Makefile
qt6-qtquicktimeline/PLIST
qt6-qtquicktimeline/buildlink3.mk
qt6-qtquicktimeline/distinfo
qt6-qtremoteobjects/Makefile
qt6-qtremoteobjects/PLIST
qt6-qtremoteobjects/buildlink3.mk
qt6-qtremoteobjects/distinfo
qt6-qtscxml/Makefile
qt6-qtscxml/PLIST
qt6-qtscxml/buildlink3.mk
qt6-qtscxml/distinfo
qt6-qtshadertools/Makefile
qt6-qtshadertools/PLIST
qt6-qtshadertools/buildlink3.mk
qt6-qtshadertools/distinfo
qt6-qtsvg/Makefile
qt6-qtsvg/PLIST
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/Makefile
qt6-qtwebchannel/PLIST
qt6-qtwebchannel/buildlink3.mk
qt6-qtwebchannel/distinfo
qt6-qtwebsockets/Makefile
qt6-qtwebsockets/PLIST
qt6-qtwebsockets/buildlink3.mk
qt6-qtwebsockets/distinfo
qt6/Makefile.common
Added Files:
qt6-qtbase/patches/patch-cmake_QtBuildInternals_QtBuildInternalsConfig.cmake
Log Message:
Update Qt6 to version 6.3.1
Update Qt6 to version 6.3.1.
To keep it up to date.
pkgsrc fixes:
Add patch so that an empty
qt6/lib/cmake/Qt6 directory
is not created.
New features:
6.3.1 comes with pkg-config files
just like qt5.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dff989c833faea2205247ce779b85f076c756c4b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
qt6-odbc/distinfo | 6 +--
qt6-psql/distinfo | 6 +--
qt6-qt3d/Makefile | 13 ++++++
qt6-qt3d/PLIST | 31 ++++++++++++++
qt6-qt3d/buildlink3.mk | 2 +-
qt6-qt3d/distinfo | 6 +--
qt6-qt5compat/Makefile | 2 +
qt6-qt5compat/PLIST | 2 +
qt6-qt5compat/buildlink3.mk | 2 +-
qt6-qt5compat/distinfo | 6 +--
qt6-qtbase/Makefile | 14 ++++++
qt6-qtbase/Makefile.common | 18 +++++++-
qt6-qtbase/PLIST | 43 +++++++++++++++++++
qt6-qtbase/buildlink3.mk | 2 +-
qt6-qtbase/distinfo | 9 ++--
qt6-qtbase/options.mk | 1 +
.../patches/patch-cmake_QtBaseGlobalTargets.cmake | 8 ++--
...e_QtBuildInternals_QtBuildInternalsConfig.cmake | 40 +++++++++++++++++
qt6-qtcharts/Makefile | 3 ++
qt6-qtcharts/PLIST | 4 ++
qt6-qtcharts/buildlink3.mk | 2 +-
qt6-qtcharts/distinfo | 6 +--
qt6-qtdatavis3d/Makefile | 3 ++
qt6-qtdatavis3d/PLIST | 4 ++
qt6-qtdatavis3d/buildlink3.mk | 2 +-
qt6-qtdatavis3d/distinfo | 6 +--
qt6-qtdeclarative/Makefile | 26 +++++++++--
qt6-qtdeclarative/PLIST | 50 ++++++++++++++++++++++
qt6-qtdeclarative/buildlink3.mk | 2 +-
qt6-qtdeclarative/distinfo | 6 +--
qt6-qtimageformats/distinfo | 6 +--
qt6-qtlanguageserver/distinfo | 6 +--
qt6-qtlottie/distinfo | 6 +--
qt6-qtmultimedia/Makefile | 2 +
qt6-qtmultimedia/PLIST | 4 ++
qt6-qtmultimedia/buildlink3.mk | 2 +-
qt6-qtmultimedia/distinfo | 6 +--
qt6-qtnetworkauth/Makefile | 2 +
qt6-qtnetworkauth/PLIST | 2 +
qt6-qtnetworkauth/buildlink3.mk | 2 +-
qt6-qtnetworkauth/distinfo | 6 +--
qt6-qtquick3d/Makefile | 11 +++++
qt6-qtquick3d/PLIST | 25 ++++++++---
qt6-qtquick3d/buildlink3.mk | 2 +-
qt6-qtquick3d/distinfo | 6 +--
qt6-qtquicktimeline/Makefile | 2 +
qt6-qtquicktimeline/PLIST | 2 +
qt6-qtquicktimeline/buildlink3.mk | 2 +-
qt6-qtquicktimeline/distinfo | 6 +--
qt6-qtremoteobjects/Makefile | 3 ++
qt6-qtremoteobjects/PLIST | 6 +++
qt6-qtremoteobjects/buildlink3.mk | 2 +-
qt6-qtremoteobjects/distinfo | 6 +--
qt6-qtscxml/Makefile | 8 ++--
qt6-qtscxml/PLIST | 8 ++++
qt6-qtscxml/buildlink3.mk | 2 +-
qt6-qtscxml/distinfo | 6 +--
qt6-qtshadertools/Makefile | 2 +
qt6-qtshadertools/PLIST | 2 +
qt6-qtshadertools/buildlink3.mk | 2 +-
qt6-qtshadertools/distinfo | 6 +--
qt6-qtsvg/Makefile | 3 ++
qt6-qtsvg/PLIST | 4 ++
qt6-qtsvg/buildlink3.mk | 2 +-
qt6-qtsvg/distinfo | 6 +--
qt6-qttools/Makefile | 4 ++
qt6-qttools/PLIST | 10 +++++
qt6-qttools/buildlink3.mk | 2 +-
qt6-qttools/distinfo | 6 +--
qt6-qtwayland/Makefile | 3 ++
qt6-qtwayland/PLIST | 5 +++
qt6-qtwayland/buildlink3.mk | 2 +-
qt6-qtwayland/distinfo | 6 +--
qt6-qtwebchannel/Makefile | 2 +
qt6-qtwebchannel/PLIST | 2 +
qt6-qtwebchannel/buildlink3.mk | 2 +-
qt6-qtwebchannel/distinfo | 6 +--
qt6-qtwebsockets/Makefile | 2 +
qt6-qtwebsockets/PLIST | 2 +
qt6-qtwebsockets/buildlink3.mk | 2 +-
qt6-qtwebsockets/distinfo | 6 +--
qt6/Makefile.common | 3 +-
82 files changed, 450 insertions(+), 108 deletions(-)
diffs:
diff --git a/qt6-odbc/distinfo b/qt6-odbc/distinfo
index 92315d36fc..5988e4c115 100644
--- a/qt6-odbc/distinfo
+++ b/qt6-odbc/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtbase-everywhere-src-6.3.0.tar.xz) = 885be9dc2793d8d7d91f8d2b92dc54cc686edab17a6a1c4ee16ea5fb2e871e06
-SHA512 (qtbase-everywhere-src-6.3.0.tar.xz) = aec9f7cee0c195178a282ab3efa6b3dd09dbe3317ec25c8f748c6cc0ea1ffe37dc62d3b062129d2458179620059e8bb694aacd1e331cbf49838075fa3381ee81
-Size (qtbase-everywhere-src-6.3.0.tar.xz) = 47004304 bytes
+BLAKE2s (qtbase-everywhere-src-6.3.1.tar.xz) = 01486b876bd6ed1e9fd2c0063772d3122980d8d628311a1d1033f19efb9e8407
+SHA512 (qtbase-everywhere-src-6.3.1.tar.xz) = 5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5
+Size (qtbase-everywhere-src-6.3.1.tar.xz) = 47118260 bytes
diff --git a/qt6-psql/distinfo b/qt6-psql/distinfo
index 92315d36fc..5988e4c115 100644
--- a/qt6-psql/distinfo
+++ b/qt6-psql/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtbase-everywhere-src-6.3.0.tar.xz) = 885be9dc2793d8d7d91f8d2b92dc54cc686edab17a6a1c4ee16ea5fb2e871e06
-SHA512 (qtbase-everywhere-src-6.3.0.tar.xz) = aec9f7cee0c195178a282ab3efa6b3dd09dbe3317ec25c8f748c6cc0ea1ffe37dc62d3b062129d2458179620059e8bb694aacd1e331cbf49838075fa3381ee81
-Size (qtbase-everywhere-src-6.3.0.tar.xz) = 47004304 bytes
+BLAKE2s (qtbase-everywhere-src-6.3.1.tar.xz) = 01486b876bd6ed1e9fd2c0063772d3122980d8d628311a1d1033f19efb9e8407
+SHA512 (qtbase-everywhere-src-6.3.1.tar.xz) = 5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5
+Size (qtbase-everywhere-src-6.3.1.tar.xz) = 47118260 bytes
diff --git a/qt6-qt3d/Makefile b/qt6-qt3d/Makefile
index 2a1824207f..1030bf1a05 100644
--- a/qt6-qt3d/Makefile
+++ b/qt6-qt3d/Makefile
@@ -11,6 +11,19 @@ CONFIGURE_ARGS+= -no-fbxsdk
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DAnimation.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DCore.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DExtras.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DInput.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DLogic.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuick.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickAnimation.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickExtras.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickInput.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickRender.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickScene2D.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DRender.pc
+
.include "../../multimedia/assimp/buildlink3.mk"
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
diff --git a/qt6-qt3d/PLIST b/qt6-qt3d/PLIST
index 35d5603644..42358d19d8 100644
--- a/qt6-qt3d/PLIST
+++ b/qt6-qt3d/PLIST
@@ -1,4 +1,16 @@
@comment $NetBSD$
+lib/pkgconfig/Qt63DAnimation.pc
+lib/pkgconfig/Qt63DCore.pc
+lib/pkgconfig/Qt63DExtras.pc
+lib/pkgconfig/Qt63DInput.pc
+lib/pkgconfig/Qt63DLogic.pc
+lib/pkgconfig/Qt63DQuick.pc
+lib/pkgconfig/Qt63DQuickAnimation.pc
+lib/pkgconfig/Qt63DQuickExtras.pc
+lib/pkgconfig/Qt63DQuickInput.pc
+lib/pkgconfig/Qt63DQuickRender.pc
+lib/pkgconfig/Qt63DQuickScene2D.pc
+lib/pkgconfig/Qt63DRender.pc
qt6/include/Qt3DAnimation/${PKGVERSION}/Qt3DAnimation/private/abstractevaluateclipanimatorjob_p.h
qt6/include/Qt3DAnimation/${PKGVERSION}/Qt3DAnimation/private/additiveclipblend_p.h
qt6/include/Qt3DAnimation/${PKGVERSION}/Qt3DAnimation/private/animationclip_p.h
@@ -1227,6 +1239,12 @@ qt6/lib/cmake/Qt63DRender/Qt6OpenGLRendererPluginConfigVersion.cmake
qt6/lib/cmake/Qt63DRender/Qt6OpenGLRendererPluginConfigVersionImpl.cmake
qt6/lib/cmake/Qt63DRender/Qt6OpenGLRendererPluginTargets-release.cmake
qt6/lib/cmake/Qt63DRender/Qt6OpenGLRendererPluginTargets.cmake
+qt6/lib/cmake/Qt63DRender/Qt6RhiRendererPluginAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt63DRender/Qt6RhiRendererPluginConfig.cmake
+qt6/lib/cmake/Qt63DRender/Qt6RhiRendererPluginConfigVersion.cmake
+qt6/lib/cmake/Qt63DRender/Qt6RhiRendererPluginConfigVersionImpl.cmake
+qt6/lib/cmake/Qt63DRender/Qt6RhiRendererPluginTargets-release.cmake
+qt6/lib/cmake/Qt63DRender/Qt6RhiRendererPluginTargets.cmake
qt6/lib/cmake/Qt63DRender/Qt6Scene2DPluginAdditionalTargetInfo.cmake
qt6/lib/cmake/Qt63DRender/Qt6Scene2DPluginConfig.cmake
qt6/lib/cmake/Qt63DRender/Qt6Scene2DPluginConfigVersion.cmake
@@ -1342,6 +1360,18 @@ qt6/lib/metatypes/qt63dquickinput_release_metatypes.json
qt6/lib/metatypes/qt63dquickrender_release_metatypes.json
qt6/lib/metatypes/qt63dquickscene2d_release_metatypes.json
qt6/lib/metatypes/qt63drender_release_metatypes.json
+qt6/lib/pkgconfig/Qt63DAnimation.pc
+qt6/lib/pkgconfig/Qt63DCore.pc
+qt6/lib/pkgconfig/Qt63DExtras.pc
+qt6/lib/pkgconfig/Qt63DInput.pc
+qt6/lib/pkgconfig/Qt63DLogic.pc
+qt6/lib/pkgconfig/Qt63DQuick.pc
+qt6/lib/pkgconfig/Qt63DQuickAnimation.pc
+qt6/lib/pkgconfig/Qt63DQuickExtras.pc
+qt6/lib/pkgconfig/Qt63DQuickInput.pc
+qt6/lib/pkgconfig/Qt63DQuickRender.pc
+qt6/lib/pkgconfig/Qt63DQuickScene2D.pc
+qt6/lib/pkgconfig/Qt63DRender.pc
qt6/mkspecs/modules/qt_lib_3danimation.pri
qt6/mkspecs/modules/qt_lib_3danimation_private.pri
qt6/mkspecs/modules/qt_lib_3dcore.pri
@@ -1381,6 +1411,7 @@ qt6/modules/3DRender.json
qt6/plugins/geometryloaders/libdefaultgeometryloader.so
qt6/plugins/geometryloaders/libgltfgeometryloader.so
qt6/plugins/renderers/libopenglrenderer.so
+qt6/plugins/renderers/librhirenderer.so
qt6/plugins/renderplugins/libscene2d.so
qt6/plugins/sceneparsers/libassimpsceneimport.so
qt6/plugins/sceneparsers/libgltfsceneexport.so
diff --git a/qt6-qt3d/buildlink3.mk b/qt6-qt3d/buildlink3.mk
index dbdee7c009..0747c8c58b 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.0.1
+BUILDLINK_API_DEPENDS.qt6-qt3d+= qt6-qt3d>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qt3d?= ../../wip/qt6-qt3d
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qt3d/distinfo b/qt6-qt3d/distinfo
index d18a040678..382d14b31b 100644
--- a/qt6-qt3d/distinfo
+++ b/qt6-qt3d/distinfo
@@ -1,8 +1,8 @@
$NetBSD$
-BLAKE2s (qt3d-everywhere-src-6.3.0.tar.xz) = 0a52b8ec9eb89139acc3a98d1262794e1081a90a22e8536811d26951b1891423
-SHA512 (qt3d-everywhere-src-6.3.0.tar.xz) = 14fcd607fc6d93f8c97142f6bbb62ec4b7ff108c3233cdb919de1382a21b29aa901a82c5b6d1a0244b3a863e713ba42f65efc21b2eb807cbe0e007b5be17fea9
-Size (qt3d-everywhere-src-6.3.0.tar.xz) = 104012672 bytes
+BLAKE2s (qt3d-everywhere-src-6.3.1.tar.xz) = fe14af6ae7679aaeb057563a1d5e434cd1c216e6deb9c0fd15977ea06fb0a829
+SHA512 (qt3d-everywhere-src-6.3.1.tar.xz) = 7627eec3c52c745a4af4f8b416b64b4a1887ad0bf4e01794e328e0dc30604ad53bb04e58a075b144a3c85c868c63ca0c4d99809b149b796ca717c31318881372
+Size (qt3d-everywhere-src-6.3.1.tar.xz) = 104053756 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 359f5069c2..b693e7794a 100644
--- a/qt6-qt5compat/Makefile
+++ b/qt6-qt5compat/Makefile
@@ -9,6 +9,8 @@ LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Core5Compat.pc
+
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qt5compat/PLIST b/qt6-qt5compat/PLIST
index 233be9fc9d..b0ac3c1c01 100644
--- a/qt6-qt5compat/PLIST
+++ b/qt6-qt5compat/PLIST
@@ -1,4 +1,5 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6Core5Compat.pc
qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/cp949codetbl_p.h
qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qbig5codec_p.h
qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qbinaryjson_p.h
@@ -87,6 +88,7 @@ qt6/lib/libQt6Core5Compat.so
qt6/lib/libQt6Core5Compat.so.6
qt6/lib/libQt6Core5Compat.so.${PKGVERSION}
qt6/lib/metatypes/qt6core5compat_release_metatypes.json
+qt6/lib/pkgconfig/Qt6Core5Compat.pc
qt6/mkspecs/modules/qt_lib_core5compat.pri
qt6/mkspecs/modules/qt_lib_core5compat_private.pri
qt6/modules/Core5Compat.json
diff --git a/qt6-qt5compat/buildlink3.mk b/qt6-qt5compat/buildlink3.mk
index 41d29fb88d..9a5850c97a 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.0.1
+BUILDLINK_API_DEPENDS.qt6-qt5compat+= qt6-qt5compat>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qt5compat?= ../../wip/qt6-qt5compat
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qt5compat/distinfo b/qt6-qt5compat/distinfo
index cf069dbb08..49dbf90a39 100644
--- a/qt6-qt5compat/distinfo
+++ b/qt6-qt5compat/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qt5compat-everywhere-src-6.3.0.tar.xz) = 25048725821600887c1b4b04121b5692c89eb9a38f86603334357177ef7d7eb7
-SHA512 (qt5compat-everywhere-src-6.3.0.tar.xz) = c6476bc2e0f5aed728c00ffd19c72c1bfe8f63893f86599584a89c60c213e262b170727771c5e1c3226856939282e727af220a12620933a2886b0816a0bb78e6
-Size (qt5compat-everywhere-src-6.3.0.tar.xz) = 8198576 bytes
+BLAKE2s (qt5compat-everywhere-src-6.3.1.tar.xz) = 1df7954453cfad824d30c1de2b6a650532f80f44dcf7e7ce0705b8a98f30c69c
+SHA512 (qt5compat-everywhere-src-6.3.1.tar.xz) = 66196a8d29a2789179904638fcd9ec162d5715e7dc28618b3ef78d07682a05578b6c2e7023144c628b94321a9c1332d39826c13adb1e5db5121406c530c9c35c
+Size (qt5compat-everywhere-src-6.3.1.tar.xz) = 8195804 bytes
diff --git a/qt6-qtbase/Makefile b/qt6-qtbase/Makefile
index 83f437c2c7..431c688e5b 100644
--- a/qt6-qtbase/Makefile
+++ b/qt6-qtbase/Makefile
@@ -124,6 +124,7 @@ LDFLAGS.FreeBSD+= -lutil
REPLACE_PERL+= libexec/syncqt.pl
REPLACE_PERL+= mkspecs/features/data/unix/findclasslist.pl
REPLACE_BASH+= util/android/android_emulator_launcher.sh
+REPLACE_PYTHON+= util/testrunner/qt-testrunner.py
PTHREAD_OPTS+= require
UNLIMIT_RESOURCES= datasize
@@ -211,6 +212,18 @@ post-install:
TOOL_DEPENDS+= xmlstarlet-[0-9]*:../../textproc/xmlstarlet
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Concurrent.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Core.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Gui.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Network.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6OpenGL.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6OpenGLWidgets.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6PrintSupport.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Sql.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Test.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Widgets.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Xml.pc
+
.include "../../archivers/brotli/buildlink3.mk"
.include "../../archivers/zstd/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
@@ -223,6 +236,7 @@ TOOL_DEPENDS+= xmlstarlet-[0-9]*:../../textproc/xmlstarlet
.include "../../fonts/harfbuzz/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
+.include "../../lang/python/application.mk"
.include "../../math/double-conversion/buildlink3.mk"
.include "../../security/libb2/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/qt6-qtbase/Makefile.common b/qt6-qtbase/Makefile.common
index 07cf7c4146..8dea9ab0e1 100644
--- a/qt6-qtbase/Makefile.common
+++ b/qt6-qtbase/Makefile.common
@@ -33,7 +33,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl:build pkg-config
# https://doc.qt.io/qt-5/supported-platforms.html
-GCC_REQD+= 5
+GCC_REQD+= 9
# Avoid failures to due 'register' usage in X11 headers.
CXXFLAGS+= -Wno-register
@@ -86,3 +86,19 @@ fix-darwin-install-name:
install_name_tool -id $${libdir}/$${libname} $${lib}; \
done
.endif
+
+PKGCONFIG_OVERRIDE_STAGE= post-build
+.PHONY: pkgconfig-link
+post-install: pkgconfig-link
+pkgconfig-link:
+ ${RUN} if ${TEST} -d ${DESTDIR}${QTPREFIX}/lib/pkgconfig; then \
+ ${ECHO} -- Linking pkg-config files to pkgconfig dir in prefix; \
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig; \
+ ${FIND} ${DESTDIR}${QTPREFIX}/lib/pkgconfig -name "*.pc" -print | \
+ while read pcpath; do \
+ pcfile=`basename $${pcpath}`; \
+ cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
+ ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/$${pcfile} $${pcfile}; \
+ done \
+ fi
+
diff --git a/qt6-qtbase/PLIST b/qt6-qtbase/PLIST
index 1f1d42dbec..6d2985d6ce 100644
--- a/qt6-qtbase/PLIST
+++ b/qt6-qtbase/PLIST
@@ -1,4 +1,17 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6Concurrent.pc
+lib/pkgconfig/Qt6Core.pc
+${PLIST.dbus}lib/pkgconfig/Qt6DBus.pc
+lib/pkgconfig/Qt6Gui.pc
+lib/pkgconfig/Qt6Network.pc
+lib/pkgconfig/Qt6OpenGL.pc
+lib/pkgconfig/Qt6OpenGLWidgets.pc
+lib/pkgconfig/Qt6Platform.pc
+lib/pkgconfig/Qt6PrintSupport.pc
+lib/pkgconfig/Qt6Sql.pc
+lib/pkgconfig/Qt6Test.pc
+lib/pkgconfig/Qt6Widgets.pc
+lib/pkgconfig/Qt6Xml.pc
qt6/bin/androiddeployqt
qt6/bin/androidtestrunner
${PLIST.dbus}qt6/bin/qdbuscpp2xml
@@ -59,6 +72,7 @@ qt6/doc/global/externalsites/qtcreator.qdoc
qt6/doc/global/externalsites/qtdesignstudio.qdoc
qt6/doc/global/externalsites/rfc.qdoc
qt6/doc/global/fileextensions.qdocconf
+qt6/doc/global/htmltabs.qdocconf
qt6/doc/global/html-config.qdocconf
qt6/doc/global/html-footer-online.qdocconf
qt6/doc/global/html-footer.qdocconf
@@ -122,6 +136,7 @@ qt6/doc/global/template/style/cookie-confirm.css
qt6/doc/global/template/style/cookiebar-x.png
qt6/doc/global/template/style/doc_search.png
qt6/doc/global/template/style/gsc.css
+qt6/doc/global/template/style/htmltabs.css
qt6/doc/global/template/style/icomoon.eot
qt6/doc/global/template/style/icomoon.svg
qt6/doc/global/template/style/icomoon.ttf
@@ -504,6 +519,7 @@ qt6/include/QtCore/QMutableMapIterator
qt6/include/QtCore/QMutableMultiHashIterator
qt6/include/QtCore/QMutableMultiMapIterator
qt6/include/QtCore/QMutableSetIterator
+qt6/include/QtCore/QMutableVectorIterator
qt6/include/QtCore/QMutex
qt6/include/QtCore/QMutexLocker
qt6/include/QtCore/QNoDebug
@@ -649,6 +665,7 @@ qt6/include/QtCore/QVariantMap
qt6/include/QtCore/QVariantPointer
qt6/include/QtCore/QVariantRef
qt6/include/QtCore/QVector
+qt6/include/QtCore/QVectorIterator
qt6/include/QtCore/QVersionNumber
qt6/include/QtCore/QWaitCondition
qt6/include/QtCore/QWeakPointer
@@ -2636,6 +2653,7 @@ qt6/lib/cmake/Qt6/FindWrapBundledHarfbuzzConfigExtra.cmake
qt6/lib/cmake/Qt6/FindWrapBundledLibjpegConfigExtra.cmake
qt6/lib/cmake/Qt6/FindWrapBundledLibpngConfigExtra.cmake
qt6/lib/cmake/Qt6/FindWrapBundledPcre2ConfigExtra.cmake
+qt6/lib/cmake/Qt6/FindWrapBundledZLIBConfigExtra.cmake
qt6/lib/cmake/Qt6/FindWrapDBus1.cmake
qt6/lib/cmake/Qt6/FindWrapDoubleConversion.cmake
qt6/lib/cmake/Qt6/FindWrapFreetype.cmake
@@ -2653,6 +2671,7 @@ qt6/lib/cmake/Qt6/FindWrapSystemJpeg.cmake
qt6/lib/cmake/Qt6/FindWrapSystemMd4c.cmake
qt6/lib/cmake/Qt6/FindWrapSystemPCRE2.cmake
qt6/lib/cmake/Qt6/FindWrapSystemPNG.cmake
+qt6/lib/cmake/Qt6/FindWrapSystemZLIB.cmake
qt6/lib/cmake/Qt6/FindWrapVulkan.cmake
qt6/lib/cmake/Qt6/FindWrapVulkanHeaders.cmake
qt6/lib/cmake/Qt6/FindWrapZLIB.cmake
@@ -2661,6 +2680,7 @@ qt6/lib/cmake/Qt6/FindXKB_COMMON_X11.cmake
qt6/lib/cmake/Qt6/FindXRender.cmake
qt6/lib/cmake/Qt6/Finddouble-conversion.cmake
qt6/lib/cmake/Qt6/ModuleDescription.json.in
+qt6/lib/cmake/Qt6/PkgConfigLibrary.pc.in
qt6/lib/cmake/Qt6/Qt3rdPartyLibraryConfig.cmake.in
qt6/lib/cmake/Qt6/Qt3rdPartyLibraryHelpers.cmake
qt6/lib/cmake/Qt6/Qt6Config.cmake
@@ -2693,6 +2713,7 @@ qt6/lib/cmake/Qt6/QtFindPackageHelpers.cmake
qt6/lib/cmake/Qt6/QtFindWrapConfigExtra.cmake.in
qt6/lib/cmake/Qt6/QtFindWrapHelper.cmake
qt6/lib/cmake/Qt6/QtFinishPrlFile.cmake
+qt6/lib/cmake/Qt6/QtFinishPkgConfigFile.cmake
qt6/lib/cmake/Qt6/QtFlagHandlingHelpers.cmake
qt6/lib/cmake/Qt6/QtFrameworkHelpers.cmake
qt6/lib/cmake/Qt6/QtGenerateExtPri.cmake
@@ -2710,6 +2731,7 @@ qt6/lib/cmake/Qt6/QtModuleToolsConfig.cmake.in
qt6/lib/cmake/Qt6/QtModuleToolsDependencies.cmake.in
qt6/lib/cmake/Qt6/QtModuleToolsVersionlessTargets.cmake.in
qt6/lib/cmake/Qt6/QtNoLinkTargetHelpers.cmake
+qt6/lib/cmake/Qt6/QtPkgConfigHelpers.cmake
qt6/lib/cmake/Qt6/QtPlatformAndroid.cmake
qt6/lib/cmake/Qt6/QtPlatformSupport.cmake
qt6/lib/cmake/Qt6/QtPlatformTargetHelpers.cmake
@@ -2751,13 +2773,20 @@ qt6/lib/cmake/Qt6/QtToolchainHelpers.cmake
qt6/lib/cmake/Qt6/QtWasmHelpers.cmake
qt6/lib/cmake/Qt6/QtWrapperScriptHelpers.cmake
qt6/lib/cmake/Qt6/QtWriteArgsFile.cmake
+qt6/lib/cmake/Qt6/config.tests/binary_for_strip/CMakeLists.txt
+qt6/lib/cmake/Qt6/config.tests/binary_for_strip/lib1.cpp
qt6/lib/cmake/Qt6/config.tests/static_link_order/CMakeLists.txt
qt6/lib/cmake/Qt6/config.tests/static_link_order/main.cpp
qt6/lib/cmake/Qt6/config.tests/static_link_order/objlib.cpp
qt6/lib/cmake/Qt6/config.tests/static_link_order/staticlib1.cpp
qt6/lib/cmake/Qt6/config.tests/static_link_order/staticlib2.cpp
+qt6/lib/cmake/Qt6/libexec/qt-internal-ninja.bat.in
+qt6/lib/cmake/Qt6/libexec/qt-internal-ninja.in
+qt6/lib/cmake/Qt6/libexec/qt-internal-strip.bat.in
+qt6/lib/cmake/Qt6/libexec/qt-internal-strip.in
qt6/lib/cmake/Qt6/modulecppexports.h.in
qt6/lib/cmake/Qt6/modulecppexports_p.h.in
+qt6/lib/cmake/Qt6/platforms/FindIntegrityPlatformGraphics.cmake
qt6/lib/cmake/Qt6/platforms/Platform/Integrity.cmake
qt6/lib/cmake/Qt6/qt.toolchain.cmake
qt6/lib/cmake/Qt6BuildInternals/Qt6BuildInternalsConfig.cmake
@@ -3209,12 +3238,26 @@ qt6/lib/metatypes/qt6test_release_metatypes.json
qt6/lib/metatypes/qt6widgets_release_metatypes.json
qt6/lib/metatypes/qt6xcbqpaprivate_release_metatypes.json
qt6/lib/metatypes/qt6xml_release_metatypes.json
+qt6/lib/pkgconfig/Qt6Concurrent.pc
+qt6/lib/pkgconfig/Qt6Core.pc
+${PLIST.dbus}qt6/lib/pkgconfig/Qt6DBus.pc
+qt6/lib/pkgconfig/Qt6Gui.pc
+qt6/lib/pkgconfig/Qt6Network.pc
+qt6/lib/pkgconfig/Qt6OpenGL.pc
+qt6/lib/pkgconfig/Qt6OpenGLWidgets.pc
+qt6/lib/pkgconfig/Qt6Platform.pc
+qt6/lib/pkgconfig/Qt6PrintSupport.pc
+qt6/lib/pkgconfig/Qt6Sql.pc
+qt6/lib/pkgconfig/Qt6Test.pc
+qt6/lib/pkgconfig/Qt6Widgets.pc
+qt6/lib/pkgconfig/Qt6Xml.pc
qt6/libexec/android_emulator_launcher.sh
qt6/libexec/cmake_automoc_parser
qt6/libexec/ensure_pro_file.cmake
qt6/libexec/moc
qt6/libexec/qlalr
qt6/libexec/qt-internal-configure-tests
+qt6/libexec/qt-testrunner.py
qt6/libexec/qvkgen
qt6/libexec/rcc
qt6/libexec/syncqt.pl
diff --git a/qt6-qtbase/buildlink3.mk b/qt6-qtbase/buildlink3.mk
index ba8df82688..d5ba54815d 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.0.0
+BUILDLINK_API_DEPENDS.qt6-qtbase+= qt6-qtbase>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtbase?= ../../wip/qt6-qtbase
BUILDLINK_INCDIRS.qt6-qtbase+= qt6/include
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 1327a0218d..87997d3eae 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -1,10 +1,11 @@
$NetBSD$
-BLAKE2s (qtbase-everywhere-src-6.3.0.tar.xz) = 885be9dc2793d8d7d91f8d2b92dc54cc686edab17a6a1c4ee16ea5fb2e871e06
-SHA512 (qtbase-everywhere-src-6.3.0.tar.xz) = aec9f7cee0c195178a282ab3efa6b3dd09dbe3317ec25c8f748c6cc0ea1ffe37dc62d3b062129d2458179620059e8bb694aacd1e331cbf49838075fa3381ee81
-Size (qtbase-everywhere-src-6.3.0.tar.xz) = 47004304 bytes
+BLAKE2s (qtbase-everywhere-src-6.3.1.tar.xz) = 01486b876bd6ed1e9fd2c0063772d3122980d8d628311a1d1033f19efb9e8407
+SHA512 (qtbase-everywhere-src-6.3.1.tar.xz) = 5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5
+Size (qtbase-everywhere-src-6.3.1.tar.xz) = 47118260 bytes
SHA1 (patch-cmake_FindGSSAPI.cmake) = af72f4a2f11652f61275a95b6e7e22566e549eaa
-SHA1 (patch-cmake_QtBaseGlobalTargets.cmake) = cb9122c93a3b2e50bb8a3c9702b27a4a79d0ba62
+SHA1 (patch-cmake_QtBaseGlobalTargets.cmake) = 015e6bbd049445832d6494209badc1c1a140b9a0
+SHA1 (patch-cmake_QtBuildInternals_QtBuildInternalsConfig.cmake) = f58e8e445c73444d7f0c015dd8fda64a5a662ef7
SHA1 (patch-cmake_QtFeature.cmake) = a8e83d33467205ce39fb6df70d6dd5fcd4172d89
SHA1 (patch-cmake_QtProcessConfigureArgs.cmake) = 98fc5a3fd184accddbc39ef5fac04eb6f56f3a8a
SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
diff --git a/qt6-qtbase/options.mk b/qt6-qtbase/options.mk
index 42663393ff..422e5e7ed4 100644
--- a/qt6-qtbase/options.mk
+++ b/qt6-qtbase/options.mk
@@ -22,6 +22,7 @@ USE_DBUS-ARCH-DEPS_H= yes
.include "../../sysutils/dbus/buildlink3.mk"
CONFIGURE_ARGS+= -dbus-linked
PLIST.dbus= yes
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6DBus.pc
.else
CONFIGURE_ARGS+= -no-dbus
.endif
diff --git a/qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake b/qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake
index 7a712b45b9..14db00d3b3 100644
--- a/qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake
+++ b/qt6-qtbase/patches/patch-cmake_QtBaseGlobalTargets.cmake
@@ -2,14 +2,14 @@ $NetBSD$
* only install non-generated files, this is needed since use in source build
---- cmake/QtBaseGlobalTargets.cmake.orig 2021-10-10 21:32:13.849657000 +0000
+--- cmake/QtBaseGlobalTargets.cmake.orig 2022-05-25 08:58:52.000000000 +0000
+++ cmake/QtBaseGlobalTargets.cmake
-@@ -267,6 +267,8 @@ qt_copy_or_install(FILES
- qt_copy_or_install(DIRECTORY
+@@ -294,6 +294,8 @@ qt_copy_or_install(DIRECTORY
"config.tests/static_link_order"
+ "config.tests/binary_for_strip"
DESTINATION "${__GlobalConfig_install_dir}/config.tests"
+ FILES_MATCHING PATTERN "*.cpp"
+ PATTERN "CMakeLists.txt"
)
- # Install public CMake files.
+ # Install qt-internal-strip and qt-internal-ninja files.
diff --git a/qt6-qtbase/patches/patch-cmake_QtBuildInternals_QtBuildInternalsConfig.cmake b/qt6-qtbase/patches/patch-cmake_QtBuildInternals_QtBuildInternalsConfig.cmake
new file mode 100644
index 0000000000..1f242681a8
--- /dev/null
+++ b/qt6-qtbase/patches/patch-cmake_QtBuildInternals_QtBuildInternalsConfig.cmake
@@ -0,0 +1,40 @@
+$NetBSD$
+
+* Only run qt_copy_or_install if there are any Find*.cmake files to install,
+ the reason to do this is that some qt6 packages has a cmake dir but no Find*.cmake
+ files in it and in these cases an empty qt6/lib/cmake/Qt6 directory is created and
+ we don't want that.
+
+--- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake.orig 2022-05-25 08:58:52.000000000 +0000
++++ cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+@@ -477,16 +477,22 @@ macro(qt_build_repo_end)
+
+ if(NOT PROJECT_NAME STREQUAL "QtBase")
+ if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+- qt_copy_or_install(DIRECTORY cmake/
+- DESTINATION "${__qt_repo_install_dir}"
+- FILES_MATCHING PATTERN "Find*.cmake"
+- )
+- if(QT_SUPERBUILD AND QT_WILL_INSTALL)
+- file(COPY cmake/
+- DESTINATION "${__qt_repo_build_dir}"
+- FILES_MATCHING PATTERN "Find*.cmake"
++ file(GLOB_RECURSE find_files cmake/Find*.cmake)
++ list(LENGTH find_files have_find_files)
++ if(have_find_files)
++ qt_copy_or_install(DIRECTORY cmake/
++ DESTINATION "${__qt_repo_install_dir}"
++ FILES_MATCHING PATTERN "Find*.cmake"
+ )
++ if(QT_SUPERBUILD AND QT_WILL_INSTALL)
++ file(COPY cmake/
++ DESTINATION "${__qt_repo_build_dir}"
++ FILES_MATCHING PATTERN "Find*.cmake"
++ )
++ endif()
+ endif()
++ unset(have_find_files)
++ unset(find_files)
+ endif()
+ endif()
+
diff --git a/qt6-qtcharts/Makefile b/qt6-qtcharts/Makefile
index 7e1243ea2e..15cf89121a 100644
--- a/qt6-qtcharts/Makefile
+++ b/qt6-qtcharts/Makefile
@@ -7,6 +7,9 @@ CATEGORIES= x11
LICENSE= gnu-gpl-v3
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Charts.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6ChartsQml.pc
+
.include "../../wip/qt6-qtbase/Makefile.common"
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtcharts/PLIST b/qt6-qtcharts/PLIST
index 34759d5235..b74dbc3dc7 100644
--- a/qt6-qtcharts/PLIST
+++ b/qt6-qtcharts/PLIST
@@ -1,4 +1,6 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6Charts.pc
+lib/pkgconfig/Qt6ChartsQml.pc
qt6/include/QtCharts/${PKGVERSION}/QtCharts/private/abstractbarchartitem_p.h
qt6/include/QtCharts/${PKGVERSION}/QtCharts/private/abstractchartlayout_p.h
qt6/include/QtCharts/${PKGVERSION}/QtCharts/private/abstractdomain_p.h
@@ -321,6 +323,8 @@ qt6/lib/libQt6ChartsQml.so.6
qt6/lib/libQt6ChartsQml.so.${PKGVERSION}
qt6/lib/metatypes/qt6charts_release_metatypes.json
qt6/lib/metatypes/qt6chartsqml_release_metatypes.json
+qt6/lib/pkgconfig/Qt6Charts.pc
+qt6/lib/pkgconfig/Qt6ChartsQml.pc
qt6/mkspecs/modules/qt_lib_charts.pri
qt6/mkspecs/modules/qt_lib_charts_private.pri
qt6/mkspecs/modules/qt_lib_chartsqml.pri
diff --git a/qt6-qtcharts/buildlink3.mk b/qt6-qtcharts/buildlink3.mk
index e3225072f5..d58b78947f 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.2.0
+BUILDLINK_API_DEPENDS.qt6-qtcharts+= qt6-qtcharts>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtcharts?= ../../wip/qt6-qtcharts
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtcharts/distinfo b/qt6-qtcharts/distinfo
index 287320ab96..cb25d811c9 100644
--- a/qt6-qtcharts/distinfo
+++ b/qt6-qtcharts/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtcharts-everywhere-src-6.3.0.tar.xz) = 6b01fbdb02729d6318f50b13e969fe5911c6033b5a8b6983330361316b0ecf1e
-SHA512 (qtcharts-everywhere-src-6.3.0.tar.xz) = 8374720f525b6c36a032a8f5a16e36474b99b6b0b25f00b30232690928a194841133567e9acdfd853980e9c006b5cfdc21092a8f635bdbbf4dafa8f07847cea6
-Size (qtcharts-everywhere-src-6.3.0.tar.xz) = 4390900 bytes
+BLAKE2s (qtcharts-everywhere-src-6.3.1.tar.xz) = f86393a50d21d99ac8052d23289f41f67f98b425a5c8ca35d100b98a31d3e96f
+SHA512 (qtcharts-everywhere-src-6.3.1.tar.xz) = c3aa002d9b9d41e55e440127ad84f1413869432ab361c373911a9ef29c25d72fb411f71e950a017f5e97c1d8bef92611fc9558d2619bd73b1e6df2e8963572b0
+Size (qtcharts-everywhere-src-6.3.1.tar.xz) = 4390932 bytes
diff --git a/qt6-qtdatavis3d/Makefile b/qt6-qtdatavis3d/Makefile
index 117fefbf5f..18208311d1 100644
--- a/qt6-qtdatavis3d/Makefile
+++ b/qt6-qtdatavis3d/Makefile
@@ -9,6 +9,9 @@ LICENSE= gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6DataVisualization.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6DataVisualizationQml.pc
+
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qtdatavis3d/PLIST b/qt6-qtdatavis3d/PLIST
index 21501a80f5..9bfac24271 100644
--- a/qt6-qtdatavis3d/PLIST
+++ b/qt6-qtdatavis3d/PLIST
@@ -1,4 +1,6 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6DataVisualization.pc
+lib/pkgconfig/Qt6DataVisualizationQml.pc
qt6/include/QtDataVisualization/${PKGVERSION}/QtDataVisualization/private/abstract3dcontroller_p.h
qt6/include/QtDataVisualization/${PKGVERSION}/QtDataVisualization/private/abstract3drenderer_p.h
qt6/include/QtDataVisualization/${PKGVERSION}/QtDataVisualization/private/abstractitemmodelhandler_p.h
@@ -205,6 +207,8 @@ qt6/lib/libQt6DataVisualizationQml.so.6
qt6/lib/libQt6DataVisualizationQml.so.${PKGVERSION}
qt6/lib/metatypes/qt6datavisualization_release_metatypes.json
qt6/lib/metatypes/qt6datavisualizationqml_release_metatypes.json
+qt6/lib/pkgconfig/Qt6DataVisualization.pc
+qt6/lib/pkgconfig/Qt6DataVisualizationQml.pc
qt6/mkspecs/modules/qt_lib_datavisualization.pri
qt6/mkspecs/modules/qt_lib_datavisualization_private.pri
qt6/mkspecs/modules/qt_lib_datavisualizationqml.pri
diff --git a/qt6-qtdatavis3d/buildlink3.mk b/qt6-qtdatavis3d/buildlink3.mk
index 6b03a69efe..d178c8a6af 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.2.0
+BUILDLINK_API_DEPENDS.qt6-qtdatavis3d+= qt6-qtdatavis3d>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtdatavis3d?= ../../wip/qt6-qtdatavis3d
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtdatavis3d/distinfo b/qt6-qtdatavis3d/distinfo
index d7001a8380..8ea72a1714 100644
--- a/qt6-qtdatavis3d/distinfo
+++ b/qt6-qtdatavis3d/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtdatavis3d-everywhere-src-6.3.0.tar.xz) = 771025946c3aad2ed6399f910e752176df46e0163c0088f2e880c21c377eb201
-SHA512 (qtdatavis3d-everywhere-src-6.3.0.tar.xz) = 24d70426b085439fbbe84031e4decf094c47538e08a0a6f41b3e74e588a29a9dcc22b123e90afc379e640a37323e8f28de5ce7260d8abcea6238cac25a87fc9f
-Size (qtdatavis3d-everywhere-src-6.3.0.tar.xz) = 5217576 bytes
+BLAKE2s (qtdatavis3d-everywhere-src-6.3.1.tar.xz) = bf02d89483abe02abfc4115161d959193de3934be8192ee019032b5a1bd4a58f
+SHA512 (qtdatavis3d-everywhere-src-6.3.1.tar.xz) = 2d345e42dcb726b8bfa1ca12b0b7feb7f8df6f74f434a8ace58e1d28c3ce9ab4b0877b6918eb9354878ff4a429b56bb5c6cd95a80feeaa38dd67796f5d5171c7
+Size (qtdatavis3d-everywhere-src-6.3.1.tar.xz) = 5217776 bytes
diff --git a/qt6-qtdeclarative/Makefile b/qt6-qtdeclarative/Makefile
index 1a1e970dbe..4e0bbe2d91 100644
--- a/qt6-qtdeclarative/Makefile
+++ b/qt6-qtdeclarative/Makefile
@@ -9,10 +9,28 @@ LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
-#Fixme: for some reason this package creates an empty
-#${DESTDIR}${QTPREFIX}/lib/cmake/Qt6 directory
-post-install:
- ${RMDIR} ${DESTDIR}${QTPREFIX}/lib/cmake/Qt6
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6LabsAnimation.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6LabsFolderListModel.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6LabsQmlModels.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6LabsSettings.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6LabsSharedImage.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6LabsWavefrontMesh.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Qml.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QmlCore.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QmlLocalStorage.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QmlModels.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QmlWorkerScript.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QmlXmlListModel.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QuickControls2.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QuickControls2Impl.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QuickDialogs2.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QuickDialogs2QuickImpl.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QuickDialogs2Utils.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QuickLayouts.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QuickTemplates2.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QuickTest.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QuickWidgets.pc
.include "../../lang/python/tool.mk"
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtdeclarative/PLIST b/qt6-qtdeclarative/PLIST
index 8ab9da4e23..267f1b0c45 100644
--- a/qt6-qtdeclarative/PLIST
+++ b/qt6-qtdeclarative/PLIST
@@ -1,4 +1,27 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6LabsAnimation.pc
+lib/pkgconfig/Qt6LabsFolderListModel.pc
+lib/pkgconfig/Qt6LabsQmlModels.pc
+lib/pkgconfig/Qt6LabsSettings.pc
+lib/pkgconfig/Qt6LabsSharedImage.pc
+lib/pkgconfig/Qt6LabsWavefrontMesh.pc
+lib/pkgconfig/Qt6Qml.pc
+lib/pkgconfig/Qt6QmlCore.pc
+lib/pkgconfig/Qt6QmlIntegration.pc
+lib/pkgconfig/Qt6QmlLocalStorage.pc
+lib/pkgconfig/Qt6QmlModels.pc
+lib/pkgconfig/Qt6QmlWorkerScript.pc
+lib/pkgconfig/Qt6QmlXmlListModel.pc
+lib/pkgconfig/Qt6Quick.pc
+lib/pkgconfig/Qt6QuickControls2.pc
+lib/pkgconfig/Qt6QuickControls2Impl.pc
+lib/pkgconfig/Qt6QuickDialogs2.pc
+lib/pkgconfig/Qt6QuickDialogs2QuickImpl.pc
+lib/pkgconfig/Qt6QuickDialogs2Utils.pc
+lib/pkgconfig/Qt6QuickLayouts.pc
+lib/pkgconfig/Qt6QuickTemplates2.pc
+lib/pkgconfig/Qt6QuickTest.pc
+lib/pkgconfig/Qt6QuickWidgets.pc
qt6/bin/qml
qt6/bin/qmldom
qt6/bin/qmleasing
@@ -404,6 +427,7 @@ 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/qqmljsliteralbindingcheck_p.h
qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljsloadergenerator_p.h
qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljslogger_p.h
qt6/include/QtQmlCompiler/${PKGVERSION}/QtQmlCompiler/private/qqmljsmetatypes_p.h
@@ -1893,6 +1917,29 @@ 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
+qt6/lib/pkgconfig/Qt6LabsSettings.pc
+qt6/lib/pkgconfig/Qt6LabsSharedImage.pc
+qt6/lib/pkgconfig/Qt6LabsWavefrontMesh.pc
+qt6/lib/pkgconfig/Qt6Qml.pc
+qt6/lib/pkgconfig/Qt6QmlCore.pc
+qt6/lib/pkgconfig/Qt6QmlIntegration.pc
+qt6/lib/pkgconfig/Qt6QmlLocalStorage.pc
+qt6/lib/pkgconfig/Qt6QmlModels.pc
+qt6/lib/pkgconfig/Qt6QmlWorkerScript.pc
+qt6/lib/pkgconfig/Qt6QmlXmlListModel.pc
+qt6/lib/pkgconfig/Qt6Quick.pc
+qt6/lib/pkgconfig/Qt6QuickControls2.pc
+qt6/lib/pkgconfig/Qt6QuickControls2Impl.pc
+qt6/lib/pkgconfig/Qt6QuickDialogs2.pc
+qt6/lib/pkgconfig/Qt6QuickDialogs2QuickImpl.pc
+qt6/lib/pkgconfig/Qt6QuickDialogs2Utils.pc
+qt6/lib/pkgconfig/Qt6QuickLayouts.pc
+qt6/lib/pkgconfig/Qt6QuickTemplates2.pc
+qt6/lib/pkgconfig/Qt6QuickTest.pc
+qt6/lib/pkgconfig/Qt6QuickWidgets.pc
qt6/libexec/qmlcachegen
qt6/libexec/qmlimportscanner
qt6/libexec/qmltyperegistrar
@@ -2405,6 +2452,9 @@ qt6/qml/QtQuick/Controls/designer/images/checkbox-icon%2x.png@localhost
qt6/qml/QtQuick/Controls/designer/images/combobox-icon.png
qt6/qml/QtQuick/Controls/designer/images/combobox-icon16.png
qt6/qml/QtQuick/Controls/designer/images/combobox-icon%2x.png@localhost
+qt6/qml/QtQuick/Controls/designer/images/control-icon.png
+qt6/qml/QtQuick/Controls/designer/images/control-icon16.png
+qt6/qml/QtQuick/Controls/designer/images/control-icon%2x.png@localhost
qt6/qml/QtQuick/Controls/designer/images/delaybutton-icon.png
qt6/qml/QtQuick/Controls/designer/images/delaybutton-icon16.png
qt6/qml/QtQuick/Controls/designer/images/delaybutton-icon%2x.png@localhost
diff --git a/qt6-qtdeclarative/buildlink3.mk b/qt6-qtdeclarative/buildlink3.mk
index cb489b2a43..a0019e8079 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.0.1
+BUILDLINK_API_DEPENDS.qt6-qtdeclarative+= qt6-qtdeclarative>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtdeclarative?= ../../wip/qt6-qtdeclarative
BUILDLINK_INCDIRS.qt6-qtdeclarative+= qt6/include
diff --git a/qt6-qtdeclarative/distinfo b/qt6-qtdeclarative/distinfo
index 799484d1ab..72cd749542 100644
--- a/qt6-qtdeclarative/distinfo
+++ b/qt6-qtdeclarative/distinfo
@@ -1,8 +1,8 @@
$NetBSD$
-BLAKE2s (qtdeclarative-everywhere-src-6.3.0.tar.xz) = bb721fc7dc3caa1102677a23449bf9cfd3a4e0f834de32ed4b55726edbada9ff
-SHA512 (qtdeclarative-everywhere-src-6.3.0.tar.xz) = 91518a8a528f4698d47d2789a9e4150fbd7661cc13d1040521905013e590ff432b3d4db1e1e08f3a3d2d212709ea2ad82cad5730f8ce9f6503776f1435e2980c
-Size (qtdeclarative-everywhere-src-6.3.0.tar.xz) = 30067416 bytes
+BLAKE2s (qtdeclarative-everywhere-src-6.3.1.tar.xz) = b3a8c204f1be55a65fa01c69b510427a230ea003c3ed7e92c0acaf9a08fef487
+SHA512 (qtdeclarative-everywhere-src-6.3.1.tar.xz) = 547b29dcf26f734b32283677b9e02a43a75f3ab4849e578592031fa37babc09e5b1795e719119ba6b9400ef59b16fd387fb97aa3603454775be4a27e19ff065c
+Size (qtdeclarative-everywhere-src-6.3.1.tar.xz) = 30098680 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/distinfo b/qt6-qtimageformats/distinfo
index 324eaebceb..6424df1b39 100644
--- a/qt6-qtimageformats/distinfo
+++ b/qt6-qtimageformats/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtimageformats-everywhere-src-6.3.0.tar.xz) = adc7cb54068b157832a1ea7d01744fc518c04a39ee7e84ad4cf7edf9a0b00327
-SHA512 (qtimageformats-everywhere-src-6.3.0.tar.xz) = e411b637a1a3580034807bd3819b4763593743b6b89b3c9828f69c6f9e5d97110be9ec96ae4d0ed91493013a3cdbdbb804fb7191f767958fa792b09b14e9ad3d
-Size (qtimageformats-everywhere-src-6.3.0.tar.xz) = 1847320 bytes
+BLAKE2s (qtimageformats-everywhere-src-6.3.1.tar.xz) = 2da4fc9852ef449c507f70f3e4bfa2577558b59e742586c6c5afb4c994e42c36
+SHA512 (qtimageformats-everywhere-src-6.3.1.tar.xz) = 9be2c4dab869c7709775514ee2dbc9d84c8e76b98e8e8a01fcf96355b3309f1830bff57cd9455bc4a33c5f8f0cb948619806dff6f303233c35e5efbdf3cc92f7
+Size (qtimageformats-everywhere-src-6.3.1.tar.xz) = 1860072 bytes
diff --git a/qt6-qtlanguageserver/distinfo b/qt6-qtlanguageserver/distinfo
index 0fc37c256d..b571c99feb 100644
--- a/qt6-qtlanguageserver/distinfo
+++ b/qt6-qtlanguageserver/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtlanguageserver-everywhere-src-6.3.0.tar.xz) = 4774589644c33e74ba22583f61edcbca06cec460c4f596691a80fa76e6e618be
-SHA512 (qtlanguageserver-everywhere-src-6.3.0.tar.xz) = 1f45b5356d01e767edd48cc343915acd8815dda649b4c2b3bd872e33fd9f1954890a116dc1c275d416cb140edae63a407f938316ce2108cd60a240c4f3c3acc8
-Size (qtlanguageserver-everywhere-src-6.3.0.tar.xz) = 147840 bytes
+BLAKE2s (qtlanguageserver-everywhere-src-6.3.1.tar.xz) = 04d45ba92ad51e6b5fb2a5ab41c58d8b52bd75fa4e650948869cfb785596baa9
+SHA512 (qtlanguageserver-everywhere-src-6.3.1.tar.xz) = c9f3914f649f99d907eb3f7c4d67bd088ebec53f501df0523d5f2ca058129895f45bdb4cd8435a8039879d25ba1da34d8f812392e066bb7642387546d4838c90
+Size (qtlanguageserver-everywhere-src-6.3.1.tar.xz) = 147848 bytes
diff --git a/qt6-qtlottie/distinfo b/qt6-qtlottie/distinfo
index 0d1ec8b256..5b1f8d5cd5 100644
--- a/qt6-qtlottie/distinfo
+++ b/qt6-qtlottie/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtlottie-everywhere-src-6.3.0.tar.xz) = b659f4652fe5c57e8a5f506804c8b776b48529661329b392613379ddc955ad19
-SHA512 (qtlottie-everywhere-src-6.3.0.tar.xz) = 57ad10d26684bc408c0a37b161b24c9b4f043dbd4bc0fefb8699ca7e397f7723a6f88e21ea686bc278ce74645b5bc1da3f087a20ee9ba38705156dba499caddc
-Size (qtlottie-everywhere-src-6.3.0.tar.xz) = 92036 bytes
+BLAKE2s (qtlottie-everywhere-src-6.3.1.tar.xz) = f6db59f746f3718df9d70e2b8c95bfb54909bc7748d6633dc636bfc596ab305d
+SHA512 (qtlottie-everywhere-src-6.3.1.tar.xz) = fbd2513a9c563c8608cf169b7733e5fffa4ec3e42128434175b0737269b1923bdd5f89cad6ccdd4cf7ce857ee7c389b54b91fc1569a264cd0a8f132f7d3ae73b
+Size (qtlottie-everywhere-src-6.3.1.tar.xz) = 92344 bytes
diff --git a/qt6-qtmultimedia/Makefile b/qt6-qtmultimedia/Makefile
index 01feca5dee..a5ad1876dd 100644
--- a/qt6-qtmultimedia/Makefile
+++ b/qt6-qtmultimedia/Makefile
@@ -12,6 +12,8 @@ CONFIGURE_ARGS+= -no-alsa
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Multimedia.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6MultimediaWidgets.pc
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
diff --git a/qt6-qtmultimedia/PLIST b/qt6-qtmultimedia/PLIST
index eafdda9c75..858f413418 100644
--- a/qt6-qtmultimedia/PLIST
+++ b/qt6-qtmultimedia/PLIST
@@ -1,4 +1,6 @@
@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
@@ -324,6 +326,8 @@ qt6/lib/libQt6MultimediaWidgets.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/pkgconfig/Qt6Multimedia.pc
+qt6/lib/pkgconfig/Qt6MultimediaWidgets.pc
qt6/mkspecs/modules/qt_lib_multimedia.pri
qt6/mkspecs/modules/qt_lib_multimedia_private.pri
qt6/mkspecs/modules/qt_lib_multimediaquick_private.pri
diff --git a/qt6-qtmultimedia/buildlink3.mk b/qt6-qtmultimedia/buildlink3.mk
index 9a0afd5d0d..8dd0517d75 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.2.0
+BUILDLINK_API_DEPENDS.qt6-qtmultimedia+= qt6-qtmultimedia>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtmultimedia?= ../../wip/qt6-qtmultimedia
pkgbase := qt6-qtmultimedia
diff --git a/qt6-qtmultimedia/distinfo b/qt6-qtmultimedia/distinfo
index 828a47bb81..76bc235b9b 100644
--- a/qt6-qtmultimedia/distinfo
+++ b/qt6-qtmultimedia/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtmultimedia-everywhere-src-6.3.0.tar.xz) = 51a003d0072359c1c4bb72e75a45ff026ff233944665b92662ac8f50e8b758eb
-SHA512 (qtmultimedia-everywhere-src-6.3.0.tar.xz) = b437e6c7083c91eeafa4d016fcd33a2ffec0c40dbd057d2bb3d4cb19127559ea25fb239a6af2de717945e1ddbbbda824942981772b8292e65cda508fdab1c515
-Size (qtmultimedia-everywhere-src-6.3.0.tar.xz) = 4753932 bytes
+BLAKE2s (qtmultimedia-everywhere-src-6.3.1.tar.xz) = 07fc4d5a1ceb9ef039c9c4240438d167a9830ae4629926c8609ad33c7b8e96e9
+SHA512 (qtmultimedia-everywhere-src-6.3.1.tar.xz) = c557a8577a28df1997a07643c125033d6ab0e1d64a2e67b659f51d11d29c5634e7ea1264ad31705889e138521b65b74761ac68399dd94637ced8c5d6d07e03c3
+Size (qtmultimedia-everywhere-src-6.3.1.tar.xz) = 4737800 bytes
diff --git a/qt6-qtnetworkauth/Makefile b/qt6-qtnetworkauth/Makefile
index bf1abd6bcc..e3b527378d 100644
--- a/qt6-qtnetworkauth/Makefile
+++ b/qt6-qtnetworkauth/Makefile
@@ -8,5 +8,7 @@ LICENSE= gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6NetworkAuth.pc
+
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qtnetworkauth/PLIST b/qt6-qtnetworkauth/PLIST
index 1cb34497ab..05dbef64f5 100644
--- a/qt6-qtnetworkauth/PLIST
+++ b/qt6-qtnetworkauth/PLIST
@@ -1,4 +1,5 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6NetworkAuth.pc
qt6/include/QtNetworkAuth/${PKGVERSION}/QtNetworkAuth/private/qabstractoauth2_p.h
qt6/include/QtNetworkAuth/${PKGVERSION}/QtNetworkAuth/private/qabstractoauth_p.h
qt6/include/QtNetworkAuth/${PKGVERSION}/QtNetworkAuth/private/qabstractoauthreplyhandler_p.h
@@ -41,6 +42,7 @@ qt6/lib/libQt6NetworkAuth.so
qt6/lib/libQt6NetworkAuth.so.6
qt6/lib/libQt6NetworkAuth.so.${PKGVERSION}
qt6/lib/metatypes/qt6networkauth_release_metatypes.json
+qt6/lib/pkgconfig/Qt6NetworkAuth.pc
qt6/mkspecs/modules/qt_lib_networkauth.pri
qt6/mkspecs/modules/qt_lib_networkauth_private.pri
qt6/modules/NetworkAuth.json
diff --git a/qt6-qtnetworkauth/buildlink3.mk b/qt6-qtnetworkauth/buildlink3.mk
index 4982b5f585..3a3dd5828e 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.0.1
+BUILDLINK_API_DEPENDS.qt6-qtnetworkauth+= qt6-qtnetworkauth>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtnetworkauth?= ../../wip/qt6-qtnetworkauth
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtnetworkauth/distinfo b/qt6-qtnetworkauth/distinfo
index 57f505c573..13323001c2 100644
--- a/qt6-qtnetworkauth/distinfo
+++ b/qt6-qtnetworkauth/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtnetworkauth-everywhere-src-6.3.0.tar.xz) = 4fbc679ee73bacd007eb1249edf62e5e03d67e5be307807403684a08478bf238
-SHA512 (qtnetworkauth-everywhere-src-6.3.0.tar.xz) = b37910efae4d0ebc97e207067b2add07938e412f00c4447250e2426a166e31be314f68d2b89f0b13cbb484014d3d8d08aa6daf5985174fde69608ad5e6e2f4fc
-Size (qtnetworkauth-everywhere-src-6.3.0.tar.xz) = 145872 bytes
+BLAKE2s (qtnetworkauth-everywhere-src-6.3.1.tar.xz) = 7be1965cc128bb81d92d37573709b7dfdf5ce68e562495ea0a14d55ce09e2adb
+SHA512 (qtnetworkauth-everywhere-src-6.3.1.tar.xz) = e7e73c57f9bfebaca7990b5d886682a4fbe5d46c8c952d056514236ae7d6beee4614dc9c957c1fa2526c89c0fc70e7dc8727533d3cc754d367cd7ec749cf2e03
+Size (qtnetworkauth-everywhere-src-6.3.1.tar.xz) = 145924 bytes
diff --git a/qt6-qtquick3d/Makefile b/qt6-qtquick3d/Makefile
index 3798afc48e..b0d6e9e4fc 100644
--- a/qt6-qtquick3d/Makefile
+++ b/qt6-qtquick3d/Makefile
@@ -8,6 +8,17 @@ LICENSE= gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3D.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DAssetImport.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DAssetUtils.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DEffects.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DHelpers.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DIblBaker.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DParticleEffects.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DParticles.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DRuntimeRender.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DUtils.pc
+
.include "../../multimedia/assimp/buildlink3.mk"
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
diff --git a/qt6-qtquick3d/PLIST b/qt6-qtquick3d/PLIST
index d4ac7c5f98..5ef8ea764e 100644
--- a/qt6-qtquick3d/PLIST
+++ b/qt6-qtquick3d/PLIST
@@ -1,4 +1,14 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6Quick3D.pc
+lib/pkgconfig/Qt6Quick3DAssetImport.pc
+lib/pkgconfig/Qt6Quick3DAssetUtils.pc
+lib/pkgconfig/Qt6Quick3DEffects.pc
+lib/pkgconfig/Qt6Quick3DHelpers.pc
+lib/pkgconfig/Qt6Quick3DIblBaker.pc
+lib/pkgconfig/Qt6Quick3DParticleEffects.pc
+lib/pkgconfig/Qt6Quick3DParticles.pc
+lib/pkgconfig/Qt6Quick3DRuntimeRender.pc
+lib/pkgconfig/Qt6Quick3DUtils.pc
qt6/bin/balsam
qt6/bin/balsamui
qt6/bin/instancer
@@ -451,6 +461,16 @@ qt6/lib/metatypes/qt6quick3dparticleeffects_release_metatypes.json
qt6/lib/metatypes/qt6quick3dparticles_release_metatypes.json
qt6/lib/metatypes/qt6quick3druntimerender_release_metatypes.json
qt6/lib/metatypes/qt6quick3dutils_release_metatypes.json
+qt6/lib/pkgconfig/Qt6Quick3D.pc
+qt6/lib/pkgconfig/Qt6Quick3DAssetImport.pc
+qt6/lib/pkgconfig/Qt6Quick3DAssetUtils.pc
+qt6/lib/pkgconfig/Qt6Quick3DEffects.pc
+qt6/lib/pkgconfig/Qt6Quick3DHelpers.pc
+qt6/lib/pkgconfig/Qt6Quick3DIblBaker.pc
+qt6/lib/pkgconfig/Qt6Quick3DParticleEffects.pc
+qt6/lib/pkgconfig/Qt6Quick3DParticles.pc
+qt6/lib/pkgconfig/Qt6Quick3DRuntimeRender.pc
+qt6/lib/pkgconfig/Qt6Quick3DUtils.pc
qt6/mkspecs/modules/qt_lib_quick3d.pri
qt6/mkspecs/modules/qt_lib_quick3d_private.pri
qt6/mkspecs/modules/qt_lib_quick3dassetimport.pri
@@ -884,14 +904,9 @@ qt6/qml/QtQuick3D/designer/images/view3D.png
qt6/qml/QtQuick3D/designer/images/view3D16.png
qt6/qml/QtQuick3D/designer/images/view3D%2x.png@localhost
qt6/qml/QtQuick3D/designer/quick3d.metainfo
-qt6/qml/QtQuick3D/designer/source/cone_model_template.qml
-qt6/qml/QtQuick3D/designer/source/cube_model_template.qml
qt6/qml/QtQuick3D/designer/source/custom_material_default_shader.frag
-qt6/qml/QtQuick3D/designer/source/cylinder_model_template.qml
qt6/qml/QtQuick3D/designer/source/effect_default_shader.frag
qt6/qml/QtQuick3D/designer/source/effect_template.qml
-qt6/qml/QtQuick3D/designer/source/plane_model_template.qml
-qt6/qml/QtQuick3D/designer/source/sphere_model_template.qml
qt6/qml/QtQuick3D/designer/source/view3D_template.qml
qt6/qml/QtQuick3D/libqquick3dplugin.so
qt6/qml/QtQuick3D/plugins.qmltypes
diff --git a/qt6-qtquick3d/buildlink3.mk b/qt6-qtquick3d/buildlink3.mk
index 50416d79f6..025f8a0b80 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.0.1
+BUILDLINK_API_DEPENDS.qt6-qtquick3d+= qt6-qtquick3d>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtquick3d?= ../../wip/qt6-qtquick3d
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtquick3d/distinfo b/qt6-qtquick3d/distinfo
index 9c7a79a5fc..2e21008098 100644
--- a/qt6-qtquick3d/distinfo
+++ b/qt6-qtquick3d/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtquick3d-everywhere-src-6.3.0.tar.xz) = 00b21f7c1705146dc1ebe9666116a11a0780179153ba0dac6460d100244bc628
-SHA512 (qtquick3d-everywhere-src-6.3.0.tar.xz) = 7579243bceeeaf5f599866faffccf00d6baaa7c4c0467f5f0b514c16f0d9a74fea83182c3566a8773596382753ac2345d9cfbcf7c7f2632801e6825d26f8ebbe
-Size (qtquick3d-everywhere-src-6.3.0.tar.xz) = 37287488 bytes
+BLAKE2s (qtquick3d-everywhere-src-6.3.1.tar.xz) = 36ed20014697d460ae97dfdb29f480a608279f86924a3edca5d283081b9e278d
+SHA512 (qtquick3d-everywhere-src-6.3.1.tar.xz) = 342a1c558a4eece6e9442e45cc400af58c96fb59614902e0299291ea2c5b1c406d76cd8ec8cf1d8ac0d8b5fc4f2f4637063d1747dcdc54f191a81310df93534e
+Size (qtquick3d-everywhere-src-6.3.1.tar.xz) = 37289264 bytes
diff --git a/qt6-qtquicktimeline/Makefile b/qt6-qtquicktimeline/Makefile
index 1507186048..3b9f27543f 100644
--- a/qt6-qtquicktimeline/Makefile
+++ b/qt6-qtquicktimeline/Makefile
@@ -8,6 +8,8 @@ LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6QuickTimeline.pc
+
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qtquicktimeline/PLIST b/qt6-qtquicktimeline/PLIST
index 5f717ccc06..16b498a345 100644
--- a/qt6-qtquicktimeline/PLIST
+++ b/qt6-qtquicktimeline/PLIST
@@ -1,4 +1,5 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6QuickTimeline.pc
qt6/include/QtQuickTimeline/${PKGVERSION}/QtQuickTimeline/private/qquickkeyframe_p.h
qt6/include/QtQuickTimeline/${PKGVERSION}/QtQuickTimeline/private/qquickkeyframedatautils_p.h
qt6/include/QtQuickTimeline/${PKGVERSION}/QtQuickTimeline/private/qquicktimeline_p.h
@@ -31,6 +32,7 @@ qt6/lib/libQt6QuickTimeline.so
qt6/lib/libQt6QuickTimeline.so.6
qt6/lib/libQt6QuickTimeline.so.${PKGVERSION}
qt6/lib/metatypes/qt6quicktimeline_release_metatypes.json
+qt6/lib/pkgconfig/Qt6QuickTimeline.pc
qt6/mkspecs/modules/qt_lib_quicktimeline.pri
qt6/mkspecs/modules/qt_lib_quicktimeline_private.pri
qt6/modules/QuickTimeline.json
diff --git a/qt6-qtquicktimeline/buildlink3.mk b/qt6-qtquicktimeline/buildlink3.mk
index e6a0e04965..6375c4286b 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.2.0
+BUILDLINK_API_DEPENDS.qt6-qtquicktimeline+= qt6-qtquicktimeline>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtquicktimeline?= ../../wip/qt6-qtquicktimeline
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtquicktimeline/distinfo b/qt6-qtquicktimeline/distinfo
index 9442fcba7e..8eb88a5bef 100644
--- a/qt6-qtquicktimeline/distinfo
+++ b/qt6-qtquicktimeline/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtquicktimeline-everywhere-src-6.3.0.tar.xz) = c24fcfb9497876e53a8e0a2b1b25ab53b112923b82cdac9a1b89fe08828e97de
-SHA512 (qtquicktimeline-everywhere-src-6.3.0.tar.xz) = 975c4716e356323eafd6a27647b2bb954e32f552213efc848924a30817e835ada6b19c10110dca0bce12895332839ee32eee96a65e000932b777e03905de6be8
-Size (qtquicktimeline-everywhere-src-6.3.0.tar.xz) = 113460 bytes
+BLAKE2s (qtquicktimeline-everywhere-src-6.3.1.tar.xz) = 72d0376efd95bb2e7a202c9b533184857983de050268093d7cba577ec26a4bff
+SHA512 (qtquicktimeline-everywhere-src-6.3.1.tar.xz) = ad55ed87942ac39c28587e15a5928ed458d5019501a689b7e51d105032d65122ef866a9d39af91c382def54d6e5246a38d16a0906f05fb8d1374e9eecefd2646
+Size (qtquicktimeline-everywhere-src-6.3.1.tar.xz) = 113464 bytes
diff --git a/qt6-qtremoteobjects/Makefile b/qt6-qtremoteobjects/Makefile
index a87bb85bcb..bf793dc263 100644
--- a/qt6-qtremoteobjects/Makefile
+++ b/qt6-qtremoteobjects/Makefile
@@ -8,6 +8,9 @@ LICENSE= gnu-lgpl-v3 OR gnu-lgpl-v2 OR gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6RemoteObjects.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6RemoteObjectsQml.pc
+
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qtremoteobjects/PLIST b/qt6-qtremoteobjects/PLIST
index fd4078ad7a..2b1cade988 100644
--- a/qt6-qtremoteobjects/PLIST
+++ b/qt6-qtremoteobjects/PLIST
@@ -1,4 +1,7 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6RemoteObjects.pc
+lib/pkgconfig/Qt6RemoteObjectsQml.pc
+lib/pkgconfig/Qt6RepParser.pc
qt6/include/QtRemoteObjects/${PKGVERSION}/QtRemoteObjects/private/qconnection_local_backend_p.h
qt6/include/QtRemoteObjects/${PKGVERSION}/QtRemoteObjects/private/qconnection_qnx_backend_p.h
qt6/include/QtRemoteObjects/${PKGVERSION}/QtRemoteObjects/private/qconnection_qnx_global_p.h
@@ -123,6 +126,9 @@ qt6/lib/libQt6RemoteObjectsQml.so.6
qt6/lib/libQt6RemoteObjectsQml.so.${PKGVERSION}
qt6/lib/metatypes/qt6remoteobjects_release_metatypes.json
qt6/lib/metatypes/qt6remoteobjectsqml_release_metatypes.json
+qt6/lib/pkgconfig/Qt6RemoteObjects.pc
+qt6/lib/pkgconfig/Qt6RemoteObjectsQml.pc
+qt6/lib/pkgconfig/Qt6RepParser.pc
qt6/libexec/repc
qt6/mkspecs/features/remoteobjects_repc.prf
qt6/mkspecs/features/repcclient.pri
diff --git a/qt6-qtremoteobjects/buildlink3.mk b/qt6-qtremoteobjects/buildlink3.mk
index 9d583efa78..65984ef519 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.2.0
+BUILDLINK_API_DEPENDS.qt6-qtremoteobjects+= qt6-qtremoteobjects>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtremoteobjects?= ../../wip/qt6-qtremoteobjects
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtremoteobjects/distinfo b/qt6-qtremoteobjects/distinfo
index c0d719e57b..8d72940c67 100644
--- a/qt6-qtremoteobjects/distinfo
+++ b/qt6-qtremoteobjects/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtremoteobjects-everywhere-src-6.3.0.tar.xz) = ecfb64bad0b9b637ed1f7cb981732f5604eeb053833e7d9e9d23b720e704a715
-SHA512 (qtremoteobjects-everywhere-src-6.3.0.tar.xz) = 91e7d2f0be8804fd239ea3d569937cc3a9f1c679ec7f5a9ce51905a05f27a2dc91caca164f9e1a9af5e7c0d7d30f4dcda0df91a5b24a877cd42be90e4807a553
-Size (qtremoteobjects-everywhere-src-6.3.0.tar.xz) = 366980 bytes
+BLAKE2s (qtremoteobjects-everywhere-src-6.3.1.tar.xz) = cdb393b340243826c773bbe9c124c0e840f6d364a131eda8516743c36a47f7c3
+SHA512 (qtremoteobjects-everywhere-src-6.3.1.tar.xz) = 276f7744a2ee017e408957ab03546cb79f9ea92102b5c1fa28a206136ac14600612ca122c38f45b596ef5b9677563b8ba6ad2e3d778711f35b6d03aff6232eed
+Size (qtremoteobjects-everywhere-src-6.3.1.tar.xz) = 367468 bytes
diff --git a/qt6-qtscxml/Makefile b/qt6-qtscxml/Makefile
index 1139eed66a..cafb7ec519 100644
--- a/qt6-qtscxml/Makefile
+++ b/qt6-qtscxml/Makefile
@@ -8,10 +8,10 @@ LICENSE= gnu-lgpl-v3 OR gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
-#Fixme: for some reason this package creates an empty
-#${DESTDIR}${QTPREFIX}/lib/cmake/Qt6 directory
-post-install:
- ${RMDIR} ${DESTDIR}${QTPREFIX}/lib/cmake/Qt6
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Scxml.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6ScxmlQml.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6StateMachine.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6StateMachineQml.pc
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
diff --git a/qt6-qtscxml/PLIST b/qt6-qtscxml/PLIST
index 2672c0cc63..fc21498cef 100644
--- a/qt6-qtscxml/PLIST
+++ b/qt6-qtscxml/PLIST
@@ -1,4 +1,8 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6Scxml.pc
+lib/pkgconfig/Qt6ScxmlQml.pc
+lib/pkgconfig/Qt6StateMachine.pc
+lib/pkgconfig/Qt6StateMachineQml.pc
qt6/include/QtScxml/${PKGVERSION}/QtScxml/private/qscxmlcompiler_p.h
qt6/include/QtScxml/${PKGVERSION}/QtScxml/private/qscxmlcppdatamodel_p.h
qt6/include/QtScxml/${PKGVERSION}/QtScxml/private/qscxmldatamodel_p.h
@@ -185,6 +189,10 @@ qt6/lib/metatypes/qt6scxml_release_metatypes.json
qt6/lib/metatypes/qt6scxmlqml_release_metatypes.json
qt6/lib/metatypes/qt6statemachine_release_metatypes.json
qt6/lib/metatypes/qt6statemachineqml_release_metatypes.json
+qt6/lib/pkgconfig/Qt6Scxml.pc
+qt6/lib/pkgconfig/Qt6ScxmlQml.pc
+qt6/lib/pkgconfig/Qt6StateMachine.pc
+qt6/lib/pkgconfig/Qt6StateMachineQml.pc
qt6/libexec/qscxmlc
qt6/mkspecs/features/qscxmlc.prf
qt6/mkspecs/modules/qt_lib_scxml.pri
diff --git a/qt6-qtscxml/buildlink3.mk b/qt6-qtscxml/buildlink3.mk
index 576684cf57..a8d94f07c7 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.1.3
+BUILDLINK_API_DEPENDS.qt6-qtscxml+= qt6-qtscxml>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtscxml?= ../../wip/qt6-qtscxml
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtscxml/distinfo b/qt6-qtscxml/distinfo
index ff1fb24aed..bafc5b9373 100644
--- a/qt6-qtscxml/distinfo
+++ b/qt6-qtscxml/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtscxml-everywhere-src-6.3.0.tar.xz) = 5202456ee1e3c9c436e16f359747264801a16149ef0026b848e53d60482a91d3
-SHA512 (qtscxml-everywhere-src-6.3.0.tar.xz) = 57d076e61e9f20383b1ec2b014f6132bc87af77641ebb71ac333b5ad4ee7aea043b0dab0d3231568e058afe5d8a07ec524ebe52340edd1ab03dbc74273bf8b9d
-Size (qtscxml-everywhere-src-6.3.0.tar.xz) = 1786636 bytes
+BLAKE2s (qtscxml-everywhere-src-6.3.1.tar.xz) = 98dd3c2c7f84bd5ad9a0211248cddbfbd87fbe4c7d917488b7f49ca5fae8da85
+SHA512 (qtscxml-everywhere-src-6.3.1.tar.xz) = b4782c6e9e98dfd8dae0ce75e69db7a3bc2f2764f8f8ee086e05d01e1cd4b824512925d5afc48ed0a6e8d15d43086fefb05b917a28018786726a58ea5bab6a78
+Size (qtscxml-everywhere-src-6.3.1.tar.xz) = 1786608 bytes
diff --git a/qt6-qtshadertools/Makefile b/qt6-qtshadertools/Makefile
index 2c85a896e9..6d0209dbce 100644
--- a/qt6-qtshadertools/Makefile
+++ b/qt6-qtshadertools/Makefile
@@ -8,5 +8,7 @@ LICENSE= gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6ShaderTools.pc
+
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qtshadertools/PLIST b/qt6-qtshadertools/PLIST
index 2419dc4ccf..a1c7fc95bf 100644
--- a/qt6-qtshadertools/PLIST
+++ b/qt6-qtshadertools/PLIST
@@ -1,4 +1,5 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6ShaderTools.pc
qt6/bin/qsb
qt6/include/QtShaderTools/${PKGVERSION}/QtShaderTools/private/qshaderbaker_p.h
qt6/include/QtShaderTools/${PKGVERSION}/QtShaderTools/private/qshaderbatchablerewriter_p.h
@@ -36,6 +37,7 @@ qt6/lib/libQt6ShaderTools.so
qt6/lib/libQt6ShaderTools.so.6
qt6/lib/libQt6ShaderTools.so.${PKGVERSION}
qt6/lib/metatypes/qt6shadertools_release_metatypes.json
+qt6/lib/pkgconfig/Qt6ShaderTools.pc
qt6/mkspecs/modules/qt_lib_shadertools.pri
qt6/mkspecs/modules/qt_lib_shadertools_private.pri
qt6/modules/ShaderTools.json
diff --git a/qt6-qtshadertools/buildlink3.mk b/qt6-qtshadertools/buildlink3.mk
index 1377bebaf0..f3cf02e7f0 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.0.1
+BUILDLINK_API_DEPENDS.qt6-qtshadertools+= qt6-qtshadertools>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtshadertools?= ../../wip/qt6-qtshadertools
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtshadertools/distinfo b/qt6-qtshadertools/distinfo
index e186451b88..ae128aec80 100644
--- a/qt6-qtshadertools/distinfo
+++ b/qt6-qtshadertools/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtshadertools-everywhere-src-6.3.0.tar.xz) = 4a1b3145939f38b77995a00e8a05a63d3b76afa881c953013f4e1df83f59a3d9
-SHA512 (qtshadertools-everywhere-src-6.3.0.tar.xz) = e104fa3b04692c3c79c1caae738642e92fe077761a5d5b064ed201b8856b409677824d84cbc954bfb21e41aaa25b0d8808692c78cf787432b85604af6706e2bd
-Size (qtshadertools-everywhere-src-6.3.0.tar.xz) = 998180 bytes
+BLAKE2s (qtshadertools-everywhere-src-6.3.1.tar.xz) = 28a6f1d6c93a17378fe49bcda90890302220d9b6827e247f73382971ebd75d42
+SHA512 (qtshadertools-everywhere-src-6.3.1.tar.xz) = c9f62139e4407b7bfbec78c231d00fd627be5396056a68c054e6b6ecada8af846198aadcbe2af56bb2c525f2851ecd492195a432e4e084f1db346d2e3722747e
+Size (qtshadertools-everywhere-src-6.3.1.tar.xz) = 998200 bytes
diff --git a/qt6-qtsvg/Makefile b/qt6-qtsvg/Makefile
index 2986b2b768..9a6794454f 100644
--- a/qt6-qtsvg/Makefile
+++ b/qt6-qtsvg/Makefile
@@ -6,6 +6,9 @@ COMMENT= Qt6 module for SVG
CATEGORIES= graphics
LICENSE= gnu-lgpl-v2.1 OR gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Svg.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6SvgWidgets.pc
+
.include "../../wip/qt6-qtbase/Makefile.common"
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtsvg/PLIST b/qt6-qtsvg/PLIST
index b9b22d19a0..4d0b6e0cbc 100644
--- a/qt6-qtsvg/PLIST
+++ b/qt6-qtsvg/PLIST
@@ -1,4 +1,6 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6Svg.pc
+lib/pkgconfig/Qt6SvgWidgets.pc
qt6/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvgfont_p.h
qt6/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvggraphics_p.h
qt6/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvghandler_p.h
@@ -67,6 +69,8 @@ qt6/lib/libQt6SvgWidgets.so.6
qt6/lib/libQt6SvgWidgets.so.${PKGVERSION}
qt6/lib/metatypes/qt6svg_release_metatypes.json
qt6/lib/metatypes/qt6svgwidgets_release_metatypes.json
+qt6/lib/pkgconfig/Qt6Svg.pc
+qt6/lib/pkgconfig/Qt6SvgWidgets.pc
qt6/mkspecs/modules/qt_lib_svg.pri
qt6/mkspecs/modules/qt_lib_svg_private.pri
qt6/mkspecs/modules/qt_lib_svgwidgets.pri
diff --git a/qt6-qtsvg/buildlink3.mk b/qt6-qtsvg/buildlink3.mk
index 27c6eca095..3043e4fb24 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.0.0
+BUILDLINK_API_DEPENDS.qt6-qtsvg+= qt6-qtsvg>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtsvg?= ../../wip/qt6-qtsvg
BUILDLINK_INCDIRS.qt6-qtsvg+= qt6/include
diff --git a/qt6-qtsvg/distinfo b/qt6-qtsvg/distinfo
index c7029e294a..b0f529f122 100644
--- a/qt6-qtsvg/distinfo
+++ b/qt6-qtsvg/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtsvg-everywhere-src-6.3.0.tar.xz) = 9c1171baf6808dba0555501a5260fcfffc60148eacdbe37a1f945c8796953b81
-SHA512 (qtsvg-everywhere-src-6.3.0.tar.xz) = f00750df4eb43bcd69ccd20d3d1181252e19a19ddf94c8d5b4eb51e88d1005f67d35902942a795a6af434c4a9cad9754da2702248791e1e60feab54341514e98
-Size (qtsvg-everywhere-src-6.3.0.tar.xz) = 1727216 bytes
+BLAKE2s (qtsvg-everywhere-src-6.3.1.tar.xz) = 50f05f62508c251be8567e81be5b1ed668b1dbc9ac1c9ea27af17c110f6df3fe
+SHA512 (qtsvg-everywhere-src-6.3.1.tar.xz) = c040e96d2dc7ef615859dec589e0b0c4e5972c3761dcf9208086b0662bfa1c3d147a10534d62d86fd8c9786a1567f8e9ca196f942a372422fc81cd02f1312c4c
+Size (qtsvg-everywhere-src-6.3.1.tar.xz) = 1727104 bytes
diff --git a/qt6-qttools/Makefile b/qt6-qttools/Makefile
index 8186aeb234..dd11745db3 100644
--- a/qt6-qttools/Makefile
+++ b/qt6-qttools/Makefile
@@ -8,6 +8,10 @@ LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Designer.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Help.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6UiTools.pc
+
.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 d22fdffc16..53759c97a8 100644
--- a/qt6-qttools/PLIST
+++ b/qt6-qttools/PLIST
@@ -1,4 +1,9 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6Designer.pc
+lib/pkgconfig/Qt6Help.pc
+lib/pkgconfig/Qt6Linguist.pc
+lib/pkgconfig/Qt6UiPlugin.pc
+lib/pkgconfig/Qt6UiTools.pc
qt6/bin/assistant
qt6/bin/designer
qt6/bin/lconvert
@@ -356,6 +361,11 @@ qt6/lib/metatypes/qt6designer_release_metatypes.json
qt6/lib/metatypes/qt6designercomponentsprivate_release_metatypes.json
qt6/lib/metatypes/qt6help_release_metatypes.json
qt6/lib/metatypes/qt6uitools_release_metatypes.json
+qt6/lib/pkgconfig/Qt6Designer.pc
+qt6/lib/pkgconfig/Qt6Help.pc
+qt6/lib/pkgconfig/Qt6Linguist.pc
+qt6/lib/pkgconfig/Qt6UiPlugin.pc
+qt6/lib/pkgconfig/Qt6UiTools.pc
qt6/libexec/lprodump
qt6/libexec/lrelease-pro
qt6/libexec/lupdate-pro
diff --git a/qt6-qttools/buildlink3.mk b/qt6-qttools/buildlink3.mk
index 60892a1628..4a15e38318 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.0.1
+BUILDLINK_API_DEPENDS.qt6-qttools+= qt6-qttools>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qttools?= ../../wip/qt6-qttools
diff --git a/qt6-qttools/distinfo b/qt6-qttools/distinfo
index 6e1ebd4109..02a828b7dd 100644
--- a/qt6-qttools/distinfo
+++ b/qt6-qttools/distinfo
@@ -1,7 +1,7 @@
$NetBSD$
-BLAKE2s (qttools-everywhere-src-6.3.0.tar.xz) = 176bb3b3b750a071c472fc2651ece1c28feb8b2bb7b8b1fb8c893338211b9ccb
-SHA512 (qttools-everywhere-src-6.3.0.tar.xz) = 027db897817811f8e8003551ed95d4078311b6324284dd3d4149e636227c57a3b7fc0ebf9bc2b7d381c10080deb89074bcc198d54e15ecef73a7cf41e8ecdb1e
-Size (qttools-everywhere-src-6.3.0.tar.xz) = 8625544 bytes
+BLAKE2s (qttools-everywhere-src-6.3.1.tar.xz) = 411a29de00f060c471b0060619e03b8888c28a22ac076646cc00c15da73fea21
+SHA512 (qttools-everywhere-src-6.3.1.tar.xz) = 6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883
+Size (qttools-everywhere-src-6.3.1.tar.xz) = 8628880 bytes
SHA1 (patch-src_assistant_CMakeLists.txt) = 41e1a4eb77337f52f2b6b37a01d3217c83a29bc8
SHA1 (patch-src_linguist_lupdate_CMakeLists.txt) = d70ea348c3ba7f64bcc245de9445becefecf3a9c
diff --git a/qt6-qtwayland/Makefile b/qt6-qtwayland/Makefile
index 5be3e99454..38c0fa91b3 100644
--- a/qt6-qtwayland/Makefile
+++ b/qt6-qtwayland/Makefile
@@ -8,6 +8,9 @@ LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6WaylandClient.pc
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6WaylandCompositor.pc
+
.include "../../devel/wayland/buildlink3.mk"
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
diff --git a/qt6-qtwayland/PLIST b/qt6-qtwayland/PLIST
index d465081d4f..4f8b22aea8 100644
--- a/qt6-qtwayland/PLIST
+++ b/qt6-qtwayland/PLIST
@@ -1,4 +1,6 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6WaylandClient.pc
+lib/pkgconfig/Qt6WaylandCompositor.pc
qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qtwaylandclient-config_p.h
qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qtwaylandclientglobal_p.h
qt6/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qwayland-hardware-integration.h
@@ -87,6 +89,7 @@ qt6/include/QtWaylandClient/QtWaylandClient
qt6/include/QtWaylandClient/QtWaylandClientDepends
qt6/include/QtWaylandClient/QtWaylandClientVersion
qt6/include/QtWaylandClient/qtwaylandclient-config.h
+qt6/include/QtWaylandClient/qtwaylandclientexports.h
qt6/include/QtWaylandClient/qtwaylandclientglobal.h
qt6/include/QtWaylandClient/qtwaylandclientversion.h
qt6/include/QtWaylandClient/qwaylandclientexport.h
@@ -531,6 +534,8 @@ qt6/lib/metatypes/qt6waylandcompositor_release_metatypes.json
qt6/lib/metatypes/qt6waylandeglclienthwintegrationprivate_release_metatypes.json
qt6/lib/metatypes/qt6waylandeglcompositorhwintegrationprivate_release_metatypes.json
qt6/lib/metatypes/qt6wlshellintegrationprivate_release_metatypes.json
+qt6/lib/pkgconfig/Qt6WaylandClient.pc
+qt6/lib/pkgconfig/Qt6WaylandCompositor.pc
qt6/libexec/qtwaylandscanner
qt6/mkspecs/modules/qt_lib_wayland_egl_client_hw_integration_private.pri
qt6/mkspecs/modules/qt_lib_wayland_egl_compositor_hw_integration_private.pri
diff --git a/qt6-qtwayland/buildlink3.mk b/qt6-qtwayland/buildlink3.mk
index 8305db37ef..b1d5484906 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.0.1
+BUILDLINK_API_DEPENDS.qt6-qtwayland+= qt6-qtwayland>=6.3.1
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 6fec8d67cf..c2cde18279 100644
--- a/qt6-qtwayland/distinfo
+++ b/qt6-qtwayland/distinfo
@@ -1,6 +1,6 @@
$NetBSD$
-BLAKE2s (qtwayland-everywhere-src-6.3.0.tar.xz) = e2e68ddc84b3b9e2da229aeff5025fb17cc333c9f93c0adfe163c7febe312226
-SHA512 (qtwayland-everywhere-src-6.3.0.tar.xz) = 0c64b114c5b3edd2b278f03dbc46aa1907e5accf4c9512cc0b594f6a58571eb023541a3bc0185aec24367d9e6e675e32999bc5ac4f0ac671b09100e86add4cd6
-Size (qtwayland-everywhere-src-6.3.0.tar.xz) = 835420 bytes
+BLAKE2s (qtwayland-everywhere-src-6.3.1.tar.xz) = 9d9933178714dfca55b8717a668d1c6eaee9696deee5f710a76f50bece3efd2d
+SHA512 (qtwayland-everywhere-src-6.3.1.tar.xz) = 571654a6abcd865717d4624c65d78e1b911829bba84f609521f349bf896b9475a8ce7759ba6b69e4bc4eef10c31e404c71610816dbee20d1202401efefa2323d
+Size (qtwayland-everywhere-src-6.3.1.tar.xz) = 835896 bytes
SHA1 (patch-CMakeLists.txt) = 15eda7d0287098f7efc2acd70b05b524de1aebc6
diff --git a/qt6-qtwebchannel/Makefile b/qt6-qtwebchannel/Makefile
index f92513fa1b..e7ab1ad31a 100644
--- a/qt6-qtwebchannel/Makefile
+++ b/qt6-qtwebchannel/Makefile
@@ -8,6 +8,8 @@ LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6WebChannel.pc
+
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
.include "../../wip/qt6-qtwebsockets/buildlink3.mk"
diff --git a/qt6-qtwebchannel/PLIST b/qt6-qtwebchannel/PLIST
index b2a618f74e..ed4d502285 100644
--- a/qt6-qtwebchannel/PLIST
+++ b/qt6-qtwebchannel/PLIST
@@ -1,4 +1,5 @@
@comment $NetBSD$
+lib/pkgconfig/Qt6WebChannel.pc
qt6/include/QtWebChannel/${PKGVERSION}/QtWebChannel/private/qmetaobjectpublisher_p.h
qt6/include/QtWebChannel/${PKGVERSION}/QtWebChannel/private/qqmlwebchannelattached_p.h
qt6/include/QtWebChannel/${PKGVERSION}/QtWebChannel/private/qwebchannel_p.h
@@ -36,6 +37,7 @@ qt6/lib/libQt6WebChannel.so
qt6/lib/libQt6WebChannel.so.6
qt6/lib/libQt6WebChannel.so.${PKGVERSION}
qt6/lib/metatypes/qt6webchannel_release_metatypes.json
+qt6/lib/pkgconfig/Qt6WebChannel.pc
qt6/mkspecs/modules/qt_lib_webchannel.pri
qt6/mkspecs/modules/qt_lib_webchannel_private.pri
qt6/modules/WebChannel.json
diff --git a/qt6-qtwebchannel/buildlink3.mk b/qt6-qtwebchannel/buildlink3.mk
index 524e41d877..ad5adbe186 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.2.0
+BUILDLINK_API_DEPENDS.qt6-qtwebchannel+= qt6-qtwebchannel>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtwebchannel?= ../../wip/qt6-qtwebchannel
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtwebchannel/distinfo b/qt6-qtwebchannel/distinfo
index 35117f64d3..f21e2a8b1d 100644
--- a/qt6-qtwebchannel/distinfo
+++ b/qt6-qtwebchannel/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtwebchannel-everywhere-src-6.3.0.tar.xz) = da9b1d4fddcb56bb35782f2230abeb9190f8d33d7d211bd5176bd44da286cc5c
-SHA512 (qtwebchannel-everywhere-src-6.3.0.tar.xz) = 350892766af486f5f1d6925f156342c4958ce8a86ecd018f65f533af56f62c097d220dc59fa7d169206edb489134cebd7e5b247181d8111ca90630ddf603ca22
-Size (qtwebchannel-everywhere-src-6.3.0.tar.xz) = 214292 bytes
+BLAKE2s (qtwebchannel-everywhere-src-6.3.1.tar.xz) = 52773d6cf47bc3265e02be17e6743713290cc79bd3cdd7b62534f2628b6790f0
+SHA512 (qtwebchannel-everywhere-src-6.3.1.tar.xz) = d253e087a9e97173a6a97eac46d8dfa740d3c77182dfd57514c14e68e50f6745cd90e9367cbb5f5d0a7c43fcbfc046af0bd9124fb2517d741bb5ab1a5af5bf62
+Size (qtwebchannel-everywhere-src-6.3.1.tar.xz) = 213812 bytes
diff --git a/qt6-qtwebsockets/Makefile b/qt6-qtwebsockets/Makefile
index 6e211f5163..d7af721493 100644
--- a/qt6-qtwebsockets/Makefile
+++ b/qt6-qtwebsockets/Makefile
@@ -8,6 +8,8 @@ LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
.include "../../wip/qt6-qtbase/Makefile.common"
+PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6WebSockets.pc
+
.include "../../wip/qt6-qtbase/buildlink3.mk"
.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qtwebsockets/PLIST b/qt6-qtwebsockets/PLIST
index 79ad1cc5ee..2ea4438d3b 100644
--- a/qt6-qtwebsockets/PLIST
+++ b/qt6-qtwebsockets/PLIST
@@ -1,4 +1,5 @@
@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
@@ -45,6 +46,7 @@ qt6/lib/libQt6WebSockets.so
qt6/lib/libQt6WebSockets.so.6
qt6/lib/libQt6WebSockets.so.${PKGVERSION}
qt6/lib/metatypes/qt6websockets_release_metatypes.json
+qt6/lib/pkgconfig/Qt6WebSockets.pc
qt6/mkspecs/modules/qt_lib_websockets.pri
qt6/mkspecs/modules/qt_lib_websockets_private.pri
qt6/modules/WebSockets.json
diff --git a/qt6-qtwebsockets/buildlink3.mk b/qt6-qtwebsockets/buildlink3.mk
index 7b2a4d2be5..7a673d86e8 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.2.0
+BUILDLINK_API_DEPENDS.qt6-qtwebsockets+= qt6-qtwebsockets>=6.3.1
BUILDLINK_PKGSRCDIR.qt6-qtwebsockets?= ../../wip/qt6-qtwebsockets
.include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtwebsockets/distinfo b/qt6-qtwebsockets/distinfo
index c73e2fdd92..a43c6d5878 100644
--- a/qt6-qtwebsockets/distinfo
+++ b/qt6-qtwebsockets/distinfo
@@ -1,5 +1,5 @@
$NetBSD$
-BLAKE2s (qtwebsockets-everywhere-src-6.3.0.tar.xz) = 36d9a0e9bd1c8410946bf0da1dce660d6a35879facc5d130a66dbc81fa4e1c75
-SHA512 (qtwebsockets-everywhere-src-6.3.0.tar.xz) = 61ea5f6fbc1c416023aa8b2e34f1e0fcac84807b75010a37ee3d7fb63ef493273cda8d450ec5ef4ff08ac2edaf8ea61459dec75ec5a96774657f9b4604576fd8
-Size (qtwebsockets-everywhere-src-6.3.0.tar.xz) = 264404 bytes
+BLAKE2s (qtwebsockets-everywhere-src-6.3.1.tar.xz) = 07fe44a431b515ca1b0c135bd21674c3d4993b4e1d313f2059cd1274c52166f8
+SHA512 (qtwebsockets-everywhere-src-6.3.1.tar.xz) = 25ab603753fdc1c65585b6aa91d3777f48e0763cff97978478586a0f04d0536b5c4d5853f9218d2a0c3b3d01b1bd9ca7e2f0e90020737c1fc70bdd4a3cd5a30c
+Size (qtwebsockets-everywhere-src-6.3.1.tar.xz) = 264268 bytes
diff --git a/qt6/Makefile.common b/qt6/Makefile.common
index 0cc381545a..6e4e22ef36 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.0
+QTVERSION= 6.3.1
.include "../../mk/bsd.prefs.mk"
@@ -22,4 +22,3 @@ HOMEPAGE= https://www.qt.io/
# 3) you may also have to put ${PREFIX}/qt6/bin in your PATH
QTPREFIX= ${PREFIX}/qt6
-GCC_REQD+= 9
Home |
Main Index |
Thread Index |
Old Index