pkgsrc-WIP-changes archive

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

qt6: update to version 6.0.2



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Sat Mar 6 17:05:48 2021 +0000
Changeset:	4cf8c8b05fbb6f91735b410f65f5f12cbe3ed0d9

Modified Files:
	qt6-odbc/distinfo
	qt6-psql/distinfo
	qt6-qt3d/Makefile
	qt6-qt3d/distinfo
	qt6-qt5compat/distinfo
	qt6-qtbase/PLIST
	qt6-qtbase/distinfo
	qt6-qtdeclarative/distinfo
	qt6-qtimageformats/Makefile
	qt6-qtimageformats/distinfo
	qt6-qtnetworkauth/Makefile
	qt6-qtnetworkauth/distinfo
	qt6-qtquick3d/distinfo
	qt6-qtquickcontrols2/PLIST
	qt6-qtquickcontrols2/distinfo
	qt6-qtquicktimeline/distinfo
	qt6-qtshadertools/distinfo
	qt6-qtsvg/distinfo
	qt6-qttools/distinfo
	qt6-qtwayland/distinfo
	qt6/Makefile.common
Removed Files:
	qt6-qtimageformats/patches/patch-src_plugins_imageformats_tiff_qtiffhandler.cpp

Log Message:
qt6: update to version 6.0.2

pkgsrc changes:
  QT_ADDLIB doesn't have to be set to a directory due to changes in
  additional_libraries directory structure

  a patch in qt6-qtimageformats has been removed since it was applied
  in this release of qt

Qt changes:
  about 60 bug fixes

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

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

diffstat:
 qt6-odbc/distinfo                                        |  8 ++++----
 qt6-psql/distinfo                                        |  8 ++++----
 qt6-qt3d/Makefile                                        |  2 +-
 qt6-qt3d/distinfo                                        |  8 ++++----
 qt6-qt5compat/distinfo                                   |  8 ++++----
 qt6-qtbase/PLIST                                         |  2 +-
 qt6-qtbase/distinfo                                      |  8 ++++----
 qt6-qtdeclarative/distinfo                               |  8 ++++----
 qt6-qtimageformats/Makefile                              |  2 +-
 qt6-qtimageformats/distinfo                              |  9 ++++-----
 .../patch-src_plugins_imageformats_tiff_qtiffhandler.cpp | 16 ----------------
 qt6-qtnetworkauth/Makefile                               |  2 +-
 qt6-qtnetworkauth/distinfo                               |  8 ++++----
 qt6-qtquick3d/distinfo                                   |  8 ++++----
 qt6-qtquickcontrols2/PLIST                               |  1 +
 qt6-qtquickcontrols2/distinfo                            |  8 ++++----
 qt6-qtquicktimeline/distinfo                             |  8 ++++----
 qt6-qtshadertools/distinfo                               |  8 ++++----
 qt6-qtsvg/distinfo                                       |  8 ++++----
 qt6-qttools/distinfo                                     |  8 ++++----
 qt6-qtwayland/distinfo                                   |  8 ++++----
 qt6/Makefile.common                                      |  4 ++--
 22 files changed, 67 insertions(+), 83 deletions(-)

diffs:
diff --git a/qt6-odbc/distinfo b/qt6-odbc/distinfo
index b4a34b7bf3..81803aea47 100644
--- a/qt6-odbc/distinfo
+++ b/qt6-odbc/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (qtbase-everywhere-src-6.0.1.tar.xz) = 1cd91a1696b8e4b59483a271aa7f9fde22a95ecb
-RMD160 (qtbase-everywhere-src-6.0.1.tar.xz) = 2b3a5bc8834c3330ac4194eaaaedb327faeb9c3d
-SHA512 (qtbase-everywhere-src-6.0.1.tar.xz) = 69a24162239f19e8eb889d51662c6cea3869ad7e53a889fe16c35083840fde8c90053b0f943129c82066364eea0ec94eb86d91d3293ef874e100476dad10a998
-Size (qtbase-everywhere-src-6.0.1.tar.xz) = 46262020 bytes
+SHA1 (qtbase-everywhere-src-6.0.2.tar.xz) = a04a95beeecc82edaf376257e797d438ea4fde86
+RMD160 (qtbase-everywhere-src-6.0.2.tar.xz) = c00c96106db8c8c685b8708751fe29c679dc40e0
+SHA512 (qtbase-everywhere-src-6.0.2.tar.xz) = f8a14d6fdbaa5e9dd83f12ee6b02b375230e04e435d5bced290070ec09bd22997414243c71000b85e5d1c0ab57bbb4cb26831b6939b2f944ba1c2c8d40fafd27
+Size (qtbase-everywhere-src-6.0.2.tar.xz) = 46265472 bytes
diff --git a/qt6-psql/distinfo b/qt6-psql/distinfo
index b4a34b7bf3..81803aea47 100644
--- a/qt6-psql/distinfo
+++ b/qt6-psql/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (qtbase-everywhere-src-6.0.1.tar.xz) = 1cd91a1696b8e4b59483a271aa7f9fde22a95ecb
-RMD160 (qtbase-everywhere-src-6.0.1.tar.xz) = 2b3a5bc8834c3330ac4194eaaaedb327faeb9c3d
-SHA512 (qtbase-everywhere-src-6.0.1.tar.xz) = 69a24162239f19e8eb889d51662c6cea3869ad7e53a889fe16c35083840fde8c90053b0f943129c82066364eea0ec94eb86d91d3293ef874e100476dad10a998
-Size (qtbase-everywhere-src-6.0.1.tar.xz) = 46262020 bytes
+SHA1 (qtbase-everywhere-src-6.0.2.tar.xz) = a04a95beeecc82edaf376257e797d438ea4fde86
+RMD160 (qtbase-everywhere-src-6.0.2.tar.xz) = c00c96106db8c8c685b8708751fe29c679dc40e0
+SHA512 (qtbase-everywhere-src-6.0.2.tar.xz) = f8a14d6fdbaa5e9dd83f12ee6b02b375230e04e435d5bced290070ec09bd22997414243c71000b85e5d1c0ab57bbb4cb26831b6939b2f944ba1c2c8d40fafd27
+Size (qtbase-everywhere-src-6.0.2.tar.xz) = 46265472 bytes
diff --git a/qt6-qt3d/Makefile b/qt6-qt3d/Makefile
index b8fda21251..5cd5920ef5 100644
--- a/qt6-qt3d/Makefile
+++ b/qt6-qt3d/Makefile
@@ -5,7 +5,7 @@ PKGNAME=	qt6-qt3d-${QTVERSION}
 COMMENT=	Qt6 3d
 CATEGORIES=	graphics
 
-QT_ADDLIB=	qt3d
+QT_ADDLIB=	yes
 
 CONFIGURE_ARGS+=	-system-assimp
 CONFIGURE_ARGS+=	-no-fbxsdk
diff --git a/qt6-qt3d/distinfo b/qt6-qt3d/distinfo
index 4e2fd9d9cc..7bac06e47f 100644
--- a/qt6-qt3d/distinfo
+++ b/qt6-qt3d/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (qt3d-everywhere-src-6.0.1.tar.xz) = e0775fb251e1e2628449ee5a0e636a78d9d408dc
-RMD160 (qt3d-everywhere-src-6.0.1.tar.xz) = 751db4b8343b594167cf185787ed8a62907744ab
-SHA512 (qt3d-everywhere-src-6.0.1.tar.xz) = a2d6ab9c86cc26ccd980db7078cc5de56241ec421e0b7931876b9d18d04f6598aeac5628fa0bc0e710dde34e8d46e7c7fcfeae12655a5a4cf866b27fb73b39ef
-Size (qt3d-everywhere-src-6.0.1.tar.xz) = 103111632 bytes
+SHA1 (qt3d-everywhere-src-6.0.2.tar.xz) = a40335bb30ab5da3f804eaf8121878557292e968
+RMD160 (qt3d-everywhere-src-6.0.2.tar.xz) = 3a87816b1a611734df972f0060793ca59ecce97a
+SHA512 (qt3d-everywhere-src-6.0.2.tar.xz) = 8f5d1729a722dc09c09125b0bafe1283fe05879e87879794fb1390b8fa4f1960d15e77055bf8301e60c61f559a0a4e93d1a2d314ad385199ae9ca87a26bf1aea
+Size (qt3d-everywhere-src-6.0.2.tar.xz) = 103122804 bytes
 SHA1 (patch-qt__cmdline.cmake) = 3e744e23d675a308ecf7ff5c778c08966ca77491
 SHA1 (patch-src_plugins_geometryloaders_configure.cmake) = 02401ea3019229fdc448fe2b31c17ebeca69ca76
 SHA1 (patch-src_plugins_renderers_opengl_CMakeLists.txt) = 0a94746a8767cd9244ae394d95872b15b6eaefb0
diff --git a/qt6-qt5compat/distinfo b/qt6-qt5compat/distinfo
index 5760179a30..4eabc01f26 100644
--- a/qt6-qt5compat/distinfo
+++ b/qt6-qt5compat/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (qt5compat-everywhere-src-6.0.1.tar.xz) = be37fbdd59be19d36a4c20902b91670f797467b1
-RMD160 (qt5compat-everywhere-src-6.0.1.tar.xz) = a212234aee74724f1792368940b2ed49a2b697da
-SHA512 (qt5compat-everywhere-src-6.0.1.tar.xz) = 85a480f232e69e8be8cff3df2b4a79e8116779ef0085b03ae42b1f90cbe97258c078fb439f53280c748a32b45365b562a7b3d1208d7addcf561c89d4c84e871c
-Size (qt5compat-everywhere-src-6.0.1.tar.xz) = 602928 bytes
+SHA1 (qt5compat-everywhere-src-6.0.2.tar.xz) = 1b49764d72bc6b8075821b95d82a0f41f2fd5d6a
+RMD160 (qt5compat-everywhere-src-6.0.2.tar.xz) = 5d1ff0b0fba6093701002476bc28975c63a2d037
+SHA512 (qt5compat-everywhere-src-6.0.2.tar.xz) = ccc09bd79a26ef4e891df6aad1d664ab3abb2c1bc0275186c77f1c9aa36100e7e95eee8e2c784182e52b7f82d9efd5d9fe6fa44c129db81672d87381a5ed0125
+Size (qt5compat-everywhere-src-6.0.2.tar.xz) = 605028 bytes
diff --git a/qt6-qtbase/PLIST b/qt6-qtbase/PLIST
index b6c06c6e6c..ddcb5103ee 100644
--- a/qt6-qtbase/PLIST
+++ b/qt6-qtbase/PLIST
@@ -2599,6 +2599,7 @@ qt6/lib/cmake/Qt6/FindLibudev.cmake
 qt6/lib/cmake/Qt6/FindMtdev.cmake
 qt6/lib/cmake/Qt6/FindMySQL.cmake
 qt6/lib/cmake/Qt6/FindOracle.cmake
+qt6/lib/cmake/Qt6/FindPostgreSQL.cmake
 qt6/lib/cmake/Qt6/FindPPS.cmake
 qt6/lib/cmake/Qt6/FindSlog2.cmake
 qt6/lib/cmake/Qt6/FindTslib.cmake
@@ -3099,7 +3100,6 @@ qt6/lib/metatypes/qt6core_qobject_release_metatypes.json
 qt6/lib/metatypes/qt6core_release_metatypes.json
 qt6/lib/metatypes/qt6gui_release_metatypes.json
 qt6/lib/metatypes/qt6widgets_release_metatypes.json
-qt6/libexec/android_cmakelist_patcher.sh
 qt6/libexec/android_emulator_launcher.sh
 qt6/libexec/ensure_pro_file.cmake
 qt6/libexec/syncqt.pl
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 0cea063b5f..6e021aa2c5 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (qtbase-everywhere-src-6.0.1.tar.xz) = 1cd91a1696b8e4b59483a271aa7f9fde22a95ecb
-RMD160 (qtbase-everywhere-src-6.0.1.tar.xz) = 2b3a5bc8834c3330ac4194eaaaedb327faeb9c3d
-SHA512 (qtbase-everywhere-src-6.0.1.tar.xz) = 69a24162239f19e8eb889d51662c6cea3869ad7e53a889fe16c35083840fde8c90053b0f943129c82066364eea0ec94eb86d91d3293ef874e100476dad10a998
-Size (qtbase-everywhere-src-6.0.1.tar.xz) = 46262020 bytes
+SHA1 (qtbase-everywhere-src-6.0.2.tar.xz) = a04a95beeecc82edaf376257e797d438ea4fde86
+RMD160 (qtbase-everywhere-src-6.0.2.tar.xz) = c00c96106db8c8c685b8708751fe29c679dc40e0
+SHA512 (qtbase-everywhere-src-6.0.2.tar.xz) = f8a14d6fdbaa5e9dd83f12ee6b02b375230e04e435d5bced290070ec09bd22997414243c71000b85e5d1c0ab57bbb4cb26831b6939b2f944ba1c2c8d40fafd27
+Size (qtbase-everywhere-src-6.0.2.tar.xz) = 46265472 bytes
 SHA1 (patch-cmake_FindGSSAPI.cmake) = 2e26dcf1d412ff2dfe87d136012dfc74efb77e6c
 SHA1 (patch-cmake_QtBuild.cmake) = 9e51c025686de3b1a383056eb6c61b0884349b57
 SHA1 (patch-cmake_QtFeature.cmake) = 14f2f760c1e603b80fa14699e91240e8fcd699d3
diff --git a/qt6-qtdeclarative/distinfo b/qt6-qtdeclarative/distinfo
index d5b11952ee..1702df879c 100644
--- a/qt6-qtdeclarative/distinfo
+++ b/qt6-qtdeclarative/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (qtdeclarative-everywhere-src-6.0.1.tar.xz) = 35e0d3ef68d1a3cadce40d81e7012afd9e31a856
-RMD160 (qtdeclarative-everywhere-src-6.0.1.tar.xz) = 09ccb42b9cd9854021b1d3e63194bf7bedd09a38
-SHA512 (qtdeclarative-everywhere-src-6.0.1.tar.xz) = a0028a672dbe133873fb9ba6aab0b9c3389e6151de90b230b832a3cd08899b5266e6e1ff6a1878733ff5110d16db561ca085c8b3dd408e11e49774af5e5d60ce
-Size (qtdeclarative-everywhere-src-6.0.1.tar.xz) = 20733844 bytes
+SHA1 (qtdeclarative-everywhere-src-6.0.2.tar.xz) = 75340269ef1609c6a31c5e45dfce9149af738eb9
+RMD160 (qtdeclarative-everywhere-src-6.0.2.tar.xz) = 980660d307ce37ecdfb8d8faad27066f15b3760b
+SHA512 (qtdeclarative-everywhere-src-6.0.2.tar.xz) = ae32c8552e5f9545473825b6aa5a9d628fd160fef677deb0596983d3c7bd2882d3871d8d930235c6fbd0cd2e9a722c323ed0143d1d18fc749e5dc23750021796
+Size (qtdeclarative-everywhere-src-6.0.2.tar.xz) = 20736976 bytes
 SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 697cd2dc622aebabf640e1625494c981dcf6df19
 SHA1 (patch-src_3rdparty_masm_wtf_Compiler.h) = 8d7e318e0148eea0f262ec13463bc15bd03478dc
 SHA1 (patch-src_3rdparty_masm_yarr_YarrCanonicalize.h) = 3cb31384f5287a5449d1a6bdd03d42870ac9385f
diff --git a/qt6-qtimageformats/Makefile b/qt6-qtimageformats/Makefile
index 4a363442c9..57e1247670 100644
--- a/qt6-qtimageformats/Makefile
+++ b/qt6-qtimageformats/Makefile
@@ -5,7 +5,7 @@ PKGNAME=	qt6-qtimageformats-${QTVERSION}
 COMMENT=	Extra image handlers for Qt6
 CATEGORIES=	graphics
 
-QT_ADDLIB=	qtimageformats
+QT_ADDLIB=	yes
 .include "../../wip/qt6-qtbase/Makefile.common"
 
 post-extract:
diff --git a/qt6-qtimageformats/distinfo b/qt6-qtimageformats/distinfo
index b2414a4723..b59c2a92f9 100644
--- a/qt6-qtimageformats/distinfo
+++ b/qt6-qtimageformats/distinfo
@@ -1,10 +1,9 @@
 $NetBSD$
 
-SHA1 (qtimageformats-everywhere-src-6.0.1.tar.xz) = 29212e99d23923e9e8203abd843b42413794fc7f
-RMD160 (qtimageformats-everywhere-src-6.0.1.tar.xz) = 4893d0011841ffcd43d37c24d1144b231974a217
-SHA512 (qtimageformats-everywhere-src-6.0.1.tar.xz) = 064a185e80171cb18f4cfad2af71ab0ab1cd290771f34e9ac11a68cbb07e0cf1772ba8088f599cba2fefd81c3eabe2ae962ddfbff33f767678dfd2c2ad8ac8e0
-Size (qtimageformats-everywhere-src-6.0.1.tar.xz) = 1820636 bytes
+SHA1 (qtimageformats-everywhere-src-6.0.2.tar.xz) = 952d00121e95db419acf19519b8c39f8b6cc94ee
+RMD160 (qtimageformats-everywhere-src-6.0.2.tar.xz) = 3aefccfd171c4d390cf7f8df142d8c8a87a1660f
+SHA512 (qtimageformats-everywhere-src-6.0.2.tar.xz) = 123927368a00e9b233fb490db270fd582daeef074f8184d77d840b06e07f0dfea1bae9c6b522338b858afd129c6295ec42ab2a4cb83042e3298e9fa3b7b917cc
+Size (qtimageformats-everywhere-src-6.0.2.tar.xz) = 1820676 bytes
 SHA1 (patch-src_imageformats_configure.cmake) = ab6cfcb8b1de942ff0c04430a610bfa141819288
 SHA1 (patch-src_plugins_imageformats_CMakeLists.txt) = 8f04e7374749ba817af94561952a86ff0f6a163b
 SHA1 (patch-src_plugins_imageformats_mng_CMakeLists.txt) = 2f9cbcca62e0f00a924f212a124f9794eec69361
-SHA1 (patch-src_plugins_imageformats_tiff_qtiffhandler.cpp) = cd9f708caf836eca851f24bb696aad8a5e4b5506
diff --git a/qt6-qtimageformats/patches/patch-src_plugins_imageformats_tiff_qtiffhandler.cpp b/qt6-qtimageformats/patches/patch-src_plugins_imageformats_tiff_qtiffhandler.cpp
deleted file mode 100644
index a85ec413ec..0000000000
--- a/qt6-qtimageformats/patches/patch-src_plugins_imageformats_tiff_qtiffhandler.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Don't use deprecated APIs, from upstream
-https://code.qt.io/cgit/qt/qtimageformats.git/commit/?id=183e8d70a7a12f99c5a0853d7dae0026e74a91b1
-
---- src/plugins/imageformats/tiff/qtiffhandler.cpp.orig	2021-02-07 12:11:27.458967159 +0000
-+++ src/plugins/imageformats/tiff/qtiffhandler.cpp
-@@ -835,7 +835,7 @@ QVariant QTiffHandler::option(ImageOptio
- 
- void QTiffHandler::setOption(ImageOption option, const QVariant &value)
- {
--    if (option == CompressionRatio && value.type() == QVariant::Int)
-+    if (option == CompressionRatio && value.metaType().id() == QMetaType::Int)
-         d->compression = qBound(0, value.toInt(), 1);
-     if (option == ImageTransformation) {
-         int transformation = value.toInt();
diff --git a/qt6-qtnetworkauth/Makefile b/qt6-qtnetworkauth/Makefile
index b950ff2303..0078093ec5 100644
--- a/qt6-qtnetworkauth/Makefile
+++ b/qt6-qtnetworkauth/Makefile
@@ -5,7 +5,7 @@ PKGNAME=	qt6-qtnetworkauth-${QTVERSION}
 COMMENT=	Qt6 module with auth libraries
 CATEGORIES=	net security
 
-QT_ADDLIB=	qtnetworkauth
+QT_ADDLIB=	yes
 .include "../../wip/qt6-qtbase/Makefile.common"
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtnetworkauth/distinfo b/qt6-qtnetworkauth/distinfo
index 427d5087c5..2281b1b7b2 100644
--- a/qt6-qtnetworkauth/distinfo
+++ b/qt6-qtnetworkauth/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (qtnetworkauth-everywhere-src-6.0.1.tar.xz) = c906cb45a478af70fda0d43273277e461f94bdfd
-RMD160 (qtnetworkauth-everywhere-src-6.0.1.tar.xz) = 4a81798824ca5afc053ab66515fed6b1e222a2a7
-SHA512 (qtnetworkauth-everywhere-src-6.0.1.tar.xz) = 9d35b6275bbab9343b68388ee1eff4dc4de7bc227f9108315d33fc33a0b469caac158605ec0210b0889d800d936ba47a7b590a956dba4b82d9f65e0858a40f62
-Size (qtnetworkauth-everywhere-src-6.0.1.tar.xz) = 145788 bytes
+SHA1 (qtnetworkauth-everywhere-src-6.0.2.tar.xz) = e804da293ec66d01f5404b1931a3e0f6a54755e1
+RMD160 (qtnetworkauth-everywhere-src-6.0.2.tar.xz) = 757d927c9628832f9ed7f49ddce21a65846f4d23
+SHA512 (qtnetworkauth-everywhere-src-6.0.2.tar.xz) = e21281737a8ae45170228fa7e65fb351fe788404752f2d35cc845d71ba6ca4afdd4f28c517432320a14fd62690325ee825944d18c60ba1572992125ac090e6ac
+Size (qtnetworkauth-everywhere-src-6.0.2.tar.xz) = 145856 bytes
diff --git a/qt6-qtquick3d/distinfo b/qt6-qtquick3d/distinfo
index af0781c264..a6f87e4006 100644
--- a/qt6-qtquick3d/distinfo
+++ b/qt6-qtquick3d/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (qtquick3d-everywhere-src-6.0.1.tar.xz) = 6cf8a2407f7105abe4d370eca003de1bcb252038
-RMD160 (qtquick3d-everywhere-src-6.0.1.tar.xz) = 58172a61cac4703564c9f68025f36112634a5721
-SHA512 (qtquick3d-everywhere-src-6.0.1.tar.xz) = b388551848fe9bfa244c85885ef7775ea8af92f76493ebc8604ebb598818e3d6f94f63ff5742821f8161c78ec439c00a224d20d6e30161fbdbd2ea0596136800
-Size (qtquick3d-everywhere-src-6.0.1.tar.xz) = 47257848 bytes
+SHA1 (qtquick3d-everywhere-src-6.0.2.tar.xz) = afdb5f65152eadc79b210585428ecb15fdcaf4dc
+RMD160 (qtquick3d-everywhere-src-6.0.2.tar.xz) = 05f36293a3f937f4590566ca87efdd35b0e098b7
+SHA512 (qtquick3d-everywhere-src-6.0.2.tar.xz) = f7b8a52645a0978a98ec5cb325baa4380b6b12aa6926a1e5877b479eb85a8850619c480ca8ebc9e371fccd578811ca2cdb890aecf68bf5afda5ff641162744ba
+Size (qtquick3d-everywhere-src-6.0.2.tar.xz) = 47219840 bytes
diff --git a/qt6-qtquickcontrols2/PLIST b/qt6-qtquickcontrols2/PLIST
index a95aed40bc..7c9390652f 100644
--- a/qt6-qtquickcontrols2/PLIST
+++ b/qt6-qtquickcontrols2/PLIST
@@ -32,6 +32,7 @@ qt6/include/QtQuickControls2Impl/QtQuickControls2Impl
 qt6/include/QtQuickControls2Impl/QtQuickControls2ImplDepends
 qt6/include/QtQuickControls2Impl/QtQuickControls2ImplVersion
 qt6/include/QtQuickControls2Impl/qtquickcontrols2implversion.h
+qt6/include/QtQuickTemplates2/${PKGVERSION}/QtQuickTemplates2/private/qaccessiblequickpage_p.h
 qt6/include/QtQuickTemplates2/${PKGVERSION}/QtQuickTemplates2/private/qquickabstractbutton_p.h
 qt6/include/QtQuickTemplates2/${PKGVERSION}/QtQuickTemplates2/private/qquickabstractbutton_p_p.h
 qt6/include/QtQuickTemplates2/${PKGVERSION}/QtQuickTemplates2/private/qquickaction_p.h
diff --git a/qt6-qtquickcontrols2/distinfo b/qt6-qtquickcontrols2/distinfo
index 6710180803..22e423cba0 100644
--- a/qt6-qtquickcontrols2/distinfo
+++ b/qt6-qtquickcontrols2/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (qtquickcontrols2-everywhere-src-6.0.1.tar.xz) = 8a1644f511f841cadd285d3ac80662872338ea16
-RMD160 (qtquickcontrols2-everywhere-src-6.0.1.tar.xz) = 89a5e0bc40a80a9e216b502c82f6298172c7b242
-SHA512 (qtquickcontrols2-everywhere-src-6.0.1.tar.xz) = 0ff6490a6c4c4dd6412c1c46b8184729931f8d3735864ff1f624172a2c5fb30c61454006d753e44650d41b74c36e7a6a757a9a62b7f22dbe227bce71c7df5dff
-Size (qtquickcontrols2-everywhere-src-6.0.1.tar.xz) = 8419644 bytes
+SHA1 (qtquickcontrols2-everywhere-src-6.0.2.tar.xz) = 02c1ad4bbabf4fc06ced25fdc542701b4d504820
+RMD160 (qtquickcontrols2-everywhere-src-6.0.2.tar.xz) = b84a65bf89ff6c60501da1bb805949dbf1d68376
+SHA512 (qtquickcontrols2-everywhere-src-6.0.2.tar.xz) = edbfbbbf770e409b9f83d54a8b31852fc2b43866acea9df2cf2a9be682019031f66ae6649d8f832a6fe95732f4bcbcf8b85731a51b9f431417bf1fffe3b3802f
+Size (qtquickcontrols2-everywhere-src-6.0.2.tar.xz) = 8420556 bytes
diff --git a/qt6-qtquicktimeline/distinfo b/qt6-qtquicktimeline/distinfo
index 6dcbaceb05..29bcc3a29a 100644
--- a/qt6-qtquicktimeline/distinfo
+++ b/qt6-qtquicktimeline/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (qtquicktimeline-everywhere-src-6.0.1.tar.xz) = 5b8ef084f2bd7d01303023f743d8d536cbfc5404
-RMD160 (qtquicktimeline-everywhere-src-6.0.1.tar.xz) = dc76735c9cb2c82635dbe28f3e2bab24a10bb503
-SHA512 (qtquicktimeline-everywhere-src-6.0.1.tar.xz) = da4d11faeb977633e217ef5a924db8170dfaa3f2a1194d4d15e72ed577b6ed35d9c3cea767d51078e57f203d35aedf52116eb4e0eda7425be087973c12a404e0
-Size (qtquicktimeline-everywhere-src-6.0.1.tar.xz) = 109288 bytes
+SHA1 (qtquicktimeline-everywhere-src-6.0.2.tar.xz) = d16fbd195039bb85d6a991ea41f75b9cbe1f6565
+RMD160 (qtquicktimeline-everywhere-src-6.0.2.tar.xz) = 781252deb2960135fe0b7814e9631108900d876b
+SHA512 (qtquicktimeline-everywhere-src-6.0.2.tar.xz) = fa016ae7e09d7d0ca8068513850e2ae6b63a7f8fceec5f59dfce5b6f6053c8e4a4e7ad7c625a9dfd45be710903399ed61fd4c9a4e1e9a309c16665711c99d94d
+Size (qtquicktimeline-everywhere-src-6.0.2.tar.xz) = 109300 bytes
diff --git a/qt6-qtshadertools/distinfo b/qt6-qtshadertools/distinfo
index d4716db147..2058821aad 100644
--- a/qt6-qtshadertools/distinfo
+++ b/qt6-qtshadertools/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (qtshadertools-everywhere-src-6.0.1.tar.xz) = 477787d79be7e86150cd97b79e706ba21dd9ffed
-RMD160 (qtshadertools-everywhere-src-6.0.1.tar.xz) = 2dab26d4333f321787394e4b7323a544c30a7168
-SHA512 (qtshadertools-everywhere-src-6.0.1.tar.xz) = 8f123752970673a2257a47a71f3f8f53335dd3256df101332f38a8218549b75618a55d9a8948af6986325e40b2a3480dfce006d6c54760e9b92054fcbb24f6e2
-Size (qtshadertools-everywhere-src-6.0.1.tar.xz) = 905148 bytes
+SHA1 (qtshadertools-everywhere-src-6.0.2.tar.xz) = ec476d0acc836e02d47f2c805c99e03ec780bec6
+RMD160 (qtshadertools-everywhere-src-6.0.2.tar.xz) = fb53e65ea0c996775ee9eedc106beeea1106eff8
+SHA512 (qtshadertools-everywhere-src-6.0.2.tar.xz) = aba50ffec87c252e820919d83f408b1604c4e3c8b8777264eef19ba9dc995c152b6fdc779b8a30eb995e0668c748788c4c978f90504484171ade3ef145b63464
+Size (qtshadertools-everywhere-src-6.0.2.tar.xz) = 905036 bytes
diff --git a/qt6-qtsvg/distinfo b/qt6-qtsvg/distinfo
index 7a326089ba..b3d4f034cc 100644
--- a/qt6-qtsvg/distinfo
+++ b/qt6-qtsvg/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (qtsvg-everywhere-src-6.0.1.tar.xz) = d344f50645561868c16d450301da7ca78c9246aa
-RMD160 (qtsvg-everywhere-src-6.0.1.tar.xz) = bd5dcc02860b5aa761424dd68afa0ea252b36c3c
-SHA512 (qtsvg-everywhere-src-6.0.1.tar.xz) = 2c132bb8aaaa50a935c9d4cbeee0a73ae19c69671398cfe69f411a31172cef36172649943fcb507135f9abdecb188ada1ba25aa0c09654b9842e1a17fa5d4db6
-Size (qtsvg-everywhere-src-6.0.1.tar.xz) = 1652556 bytes
+SHA1 (qtsvg-everywhere-src-6.0.2.tar.xz) = 6b513e15414218bfe31ad528396beffc5873cd77
+RMD160 (qtsvg-everywhere-src-6.0.2.tar.xz) = d039edb1588392b082bb995f8ccf66f06998a1eb
+SHA512 (qtsvg-everywhere-src-6.0.2.tar.xz) = e88c9c8b5ac993c1e46923b9aab1ba550d0ac00bbeea1b3ecef33cece15ff1c2e0e6321de56033223f78bee93474fbe3da1e2add5f9bdd2dfda6ebecd29a5e7d
+Size (qtsvg-everywhere-src-6.0.2.tar.xz) = 1652556 bytes
diff --git a/qt6-qttools/distinfo b/qt6-qttools/distinfo
index d88a185499..5e258c05be 100644
--- a/qt6-qttools/distinfo
+++ b/qt6-qttools/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (qttools-everywhere-src-6.0.1.tar.xz) = dee5e27261ad77388043256c55f0077791a5dd04
-RMD160 (qttools-everywhere-src-6.0.1.tar.xz) = 6cffa21c7439ba2a6f5ab9555cc11d53b836821a
-SHA512 (qttools-everywhere-src-6.0.1.tar.xz) = 6ab06290b877b5eba14475f639aa1101e6fabfaa0e1af25042f00749136dca5756b20dbe6dd3514a3bde5fd7ea21f1ec6c44fd7b656b7898937566e6528cb3ba
-Size (qttools-everywhere-src-6.0.1.tar.xz) = 8387408 bytes
+SHA1 (qttools-everywhere-src-6.0.2.tar.xz) = 0983d7ff615d81a34171b78fcb497c21961042f1
+RMD160 (qttools-everywhere-src-6.0.2.tar.xz) = 1e9ab20c7256d8bf231bd0bb06409098702de0cc
+SHA512 (qttools-everywhere-src-6.0.2.tar.xz) = 888519ced7955e8ee392591fbabd389dee0597b95006fde402571a2a5b0da8bb9d887a4e5d8eee017b4f7f44e7b5313dcb0b510276a98d2474a7535cca830420
+Size (qttools-everywhere-src-6.0.2.tar.xz) = 8388156 bytes
 SHA1 (patch-src_linguist_lupdate_CMakeLists.txt) = 040034f45e8246403c28fe9738bd8f2c8c05872e
diff --git a/qt6-qtwayland/distinfo b/qt6-qtwayland/distinfo
index d51101a86d..caaaddf00e 100644
--- a/qt6-qtwayland/distinfo
+++ b/qt6-qtwayland/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (qtwayland-everywhere-src-6.0.1.tar.xz) = f388787f20ce68041bc1e493e8b3296e6c8b3a7c
-RMD160 (qtwayland-everywhere-src-6.0.1.tar.xz) = 6a47941c8e4b48063a345c0f53ba6684a4154292
-SHA512 (qtwayland-everywhere-src-6.0.1.tar.xz) = 94fb808c4e527055c8249a8cad3eb229c879612a3ef948a00fd140b9528d768ce2b27b3e7bdd23ed8e70c95d325f035d6ab5fe96c0a6e24d8681e75886ee3d47
-Size (qtwayland-everywhere-src-6.0.1.tar.xz) = 559700 bytes
+SHA1 (qtwayland-everywhere-src-6.0.2.tar.xz) = 047926cb45ce675ab4477a11529450ef6ea9a810
+RMD160 (qtwayland-everywhere-src-6.0.2.tar.xz) = 9b41bbafa19352549a158dffe57d091dad241cbf
+SHA512 (qtwayland-everywhere-src-6.0.2.tar.xz) = e87ac1804f462e04febd92c3f52d20264fa187d646eaf9321ca8facefcc632943126445e5e86543e72963beeb15afb15f0ac8ef7751f53402139290cdc4db959
+Size (qtwayland-everywhere-src-6.0.2.tar.xz) = 559852 bytes
 SHA1 (patch-CMakeLists.txt) = 15eda7d0287098f7efc2acd70b05b524de1aebc6
diff --git a/qt6/Makefile.common b/qt6/Makefile.common
index abf4749b71..9b7199578a 100644
--- a/qt6/Makefile.common
+++ b/qt6/Makefile.common
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile.common,v 1.24 2020/09/14 20:08:26 adam Exp $
 # used by wip/qt6-qtbase/Makefile.common
 
-QTVERSION=	6.0.1
+QTVERSION=	6.0.2
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(QT_ADDLIB)
-MASTER_SITES=	http://download.qt.io/official_releases/additional_libraries/${QT_ADDLIB}/${QTVERSION:R}/${QTVERSION}/
+MASTER_SITES=	http://download.qt.io/official_releases/additional_libraries/${QTVERSION:R}/${QTVERSION}/
 .else
 MASTER_SITES=	http://download.qt.io/official_releases/qt/${QTVERSION:R}/${QTVERSION}/submodules/
 .endif


Home | Main Index | Thread Index | Old Index