Update to 6.0.0

10 files changed, 38 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6fd57ed8a61..0708944696b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt6-base
 	pkgdesc = A cross-platform application and UI framework (mingw-w64)
-	pkgver = 6.0.0rc
+	pkgver = 6.0.0
 	pkgrel = 1
 	url = https://www.qt.io
 	arch = any
@@ -35,7 +35,7 @@ pkgbase = mingw-w64-qt6-base
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://download.qt.io/development_releases/qt/6.0/6.0.0-rc/submodules/qtbase-everywhere-src-6.0.0-rc.tar.xz
+	source = https://download.qt.io/official_releases/qt/6.0/6.0.0/submodules/qtbase-everywhere-src-6.0.0.tar.xz
 	source = 0001-Use-CMake-s-default-import-library-suffix.patch
 	source = 0002-Fix-finding-D-Bus.patch
 	source = 0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -43,14 +43,14 @@ pkgbase = mingw-w64-qt6-base
 	source = 0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
 	source = 0006-Support-finding-MariaDB.patch
 	source = 0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
-	sha256sums = 8dc2c6fe053235e4a2866d8e1927fd667e5e8c853c96de708b9688012089138d
-	sha256sums = bb9bec76506c3425d6fa2394c2c15cf8c8e84d6ce090f8cd9136c77e7a286d8f
-	sha256sums = 9ba0563f3c47327ca2f51c864fc1916a4355f56f82da77dea81c8a90cf315579
-	sha256sums = 37e533855b3b498bd1e93879aac05cc77dad3b2df64f9a61440aa2bcb73e9847
-	sha256sums = 3bdb93179f5258aa87ce3c2b8e560e2ff9fc9446bfd4688b2faf46c5deb45fc8
-	sha256sums = f2f64e7b6bc2a3b7c4414fc4c857b206c597ee7174cdaadaccc51ca4c0f5ada1
-	sha256sums = bd3a50b6a034e647a36cc4bf6a37532d892561255cda3e6cbdaf5849e710b657
-	sha256sums = df804bde0b39e507f07cbedc18001ea8eb939497c89586e93dc1cbb8c878fbed
+	sha256sums = ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
+	sha256sums = ea0d7432318261cfd13dadd39ecef5bb98d6ff3017c9e170209c9227bfddaed7
+	sha256sums = 42e06c8f4261adf434d3f570c22156dec8164745bcb25fd1a93c54a0a5f2277a
+	sha256sums = 01e52d9a60f6b31561c95798bc1fe0f3e0b6361c9e22307a8db47af789bd8544
+	sha256sums = c7a416a2bb61f938a81c7ddc82257776e6752f5372ee57f2cc08cba8761e2211
+	sha256sums = e11565af9b05b7714248324b5afecda78caa9be03e9c4872f80ea07636bfa1a7
+	sha256sums = 8fa423062a850d68341b80aade231cfec865f9a750324ff3819faecf77ff9347
+	sha256sums = c9c0289e08106dcc18973d1625526f2a90271452d375171d97a9793199549cea
 
 pkgname = mingw-w64-qt6-base
 
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch
index bbce7829b919..394e2e9deabe 100644
--- a/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,4 +1,4 @@
-From 302744ea356871a22f9cb6819bf0a9baf0e8211c Mon Sep 17 00:00:00 2001
+From b3a78b8672134e97f6a6b511dd1c6822fe9811e8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 22:08:10 +0100
 Subject: [PATCH 1/7] Use CMake's default import library suffix
@@ -13,10 +13,10 @@ Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a
  5 files changed, 21 insertions(+), 7 deletions(-)
 
 diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
-index 5fc0a5877b..5782de0f91 100644
+index e0f10d19bb..ae2fe6e8f3 100644
 --- a/cmake/QtPriHelpers.cmake
 +++ b/cmake/QtPriHelpers.cmake
-@@ -330,9 +330,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
+@@ -342,9 +342,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
          qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
          list(APPEND pri_files "${private_pri_file_path}")
  
@@ -31,7 +31,7 @@ index 5fc0a5877b..5782de0f91 100644
              ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
              ${CMAKE_STATIC_LIBRARY_SUFFIX})
          add_custom_command(
-@@ -737,9 +741,13 @@ CONFIG += ${private_config_joined}
+@@ -749,9 +753,13 @@ CONFIG += ${private_config_joined}
          list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
      endforeach()
  
@@ -47,10 +47,10 @@ index 5fc0a5877b..5782de0f91 100644
          ${CMAKE_STATIC_LIBRARY_SUFFIX})
      add_custom_command(
 diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
-index 35d321420c..40a85e6c73 100644
+index 0ad1747961..fcb520f2ad 100644
 --- a/cmake/QtPrlHelpers.cmake
 +++ b/cmake/QtPrlHelpers.cmake
-@@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION}
+@@ -348,11 +348,17 @@ ${prl_step1_content_libs}
           CONTENT
           "FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
  
@@ -70,10 +70,10 @@ index 35d321420c..40a85e6c73 100644
      if(QT_GENERATOR_IS_MULTI_CONFIG)
          set(configs ${CMAKE_CONFIGURATION_TYPES})
 diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
-index fcbb3ab1f2..332ef6ee4c 100644
+index fe8d461856..74dfefcedc 100644
 --- a/cmake/QtTargetHelpers.cmake
 +++ b/cmake/QtTargetHelpers.cmake
-@@ -283,8 +283,6 @@ function(qt_internal_apply_win_prefix_and_suffix target)
+@@ -288,8 +288,6 @@ function(qt_internal_apply_win_prefix_and_suffix target)
  
          # This should cover both MINGW with GCC and CLANG.
          if(NOT MSVC)
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index d5947a85a12e..16708512aae0 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,4 +1,4 @@
-From 8a975011cc6b9fa6277ad4bb9015d5d509ad769a Mon Sep 17 00:00:00 2001
+From cd942ac25b912c5a8ddf807d09124cb920327e66 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 7 Oct 2020 12:13:37 +0200
 Subject: [PATCH 2/7] Fix finding D-Bus
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index 7605922aa267..f0a87b0be523 100644
--- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,4 +1,4 @@
-From 7a839b449645c8978889c0a09f2c149398c833e3 Mon Sep 17 00:00:00 2001
+From a0f488c28adfd04e3eb47e1d33d13f7112c4baa7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:13:19 +0100
 Subject: [PATCH 3/7] Fix using static PCRE2 and DBus-1
diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch
index 8012f1d6856d..f149c1cb73d5 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,4 +1,4 @@
-From 7c05fdef291be4b1819c15845116005f865b185e Mon Sep 17 00:00:00 2001
+From f0176a1ae2e36b4ea89bda4a927bf387a4e20ead Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:59:33 +0100
 Subject: [PATCH 4/7] Fix transitive dependencies (of static libraries)
diff --git a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
index 4cf130cef3bc..ee82e8e225c7 100644
--- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@@ -1,4 +1,4 @@
-From 2e806336a1053599c6b9b2fb1bcd541b256506b2 Mon Sep 17 00:00:00 2001
+From 042b2c86c9f895980f400fdd1d4e6ab8ce8022d8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 2 Nov 2020 13:47:45 +0100
 Subject: [PATCH 5/7] Fix libjpeg workaround for conflict with rpcndr.h
@@ -13,7 +13,7 @@ Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e
  1 file changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
-index 29bf5ab589..dc336f156a 100644
+index beef18f260..72708145f4 100644
 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
 +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
 @@ -61,14 +61,8 @@
diff --git a/0006-Support-finding-MariaDB.patch b/0006-Support-finding-MariaDB.patch
index fa869f506ad8..d77c2f044b42 100644
--- a/0006-Support-finding-MariaDB.patch
+++ b/0006-Support-finding-MariaDB.patch
@@ -1,4 +1,4 @@
-From e8cb07cbabefc1bf1acfd238b3298c7fa7a6c536 Mon Sep 17 00:00:00 2001
+From baf1e987e55c90a32e6e32438f770f7aab4c4a3c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:33:12 +0100
 Subject: [PATCH 6/7] Support finding MariaDB
diff --git a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
index 5b830016ed14..a462075c256e 100644
--- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,4 +1,4 @@
-From dd3d798d4c338164db0ff41ba09af66c43a9d2ab Mon Sep 17 00:00:00 2001
+From 28e6e716d2a09f40720f3d213e82c1ff6e61a860 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:34:09 +0100
 Subject: [PATCH 7/7] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
@@ -10,7 +10,7 @@ Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c
  1 file changed, 5 insertions(+)
 
 diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index 5e49a99f5d..dd8ffc1972 100644
+index bb2de0a0c2..a2e8b37ba7 100644
 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 @@ -2,6 +2,10 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
@@ -24,7 +24,7 @@ index 5e49a99f5d..dd8ffc1972 100644
  ######################################
  #
  #       Macros for building Qt modules
-@@ -224,6 +228,7 @@ macro(qt_prepare_standalone_project)
+@@ -268,6 +272,7 @@ macro(qt_prepare_standalone_project)
  endmacro()
  
  macro(qt_build_repo_begin)
diff --git a/PKGBUILD b/PKGBUILD
index db259cdebd34..7b5eca7073c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase
 
 pkgname=mingw-w64-qt6-base
-_qtver=6.0.0-rc
+_qtver=6.0.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -30,7 +30,7 @@ optdepends=('mingw-w64-postgresql: PostgreSQL driver'
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(mingw-w64-qt6)
 _pkgfqn="qtbase-everywhere-src-${_qtver}"
-source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Use-CMake-s-default-import-library-suffix.patch'
         '0002-Fix-finding-D-Bus.patch'
         '0003-Fix-using-static-PCRE2-and-DBus-1.patch'
@@ -38,14 +38,14 @@ source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/s
         '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch'
         '0006-Support-finding-MariaDB.patch'
         '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
-sha256sums=('8dc2c6fe053235e4a2866d8e1927fd667e5e8c853c96de708b9688012089138d'
-            'bb9bec76506c3425d6fa2394c2c15cf8c8e84d6ce090f8cd9136c77e7a286d8f'
-            '9ba0563f3c47327ca2f51c864fc1916a4355f56f82da77dea81c8a90cf315579'
-            '37e533855b3b498bd1e93879aac05cc77dad3b2df64f9a61440aa2bcb73e9847'
-            '3bdb93179f5258aa87ce3c2b8e560e2ff9fc9446bfd4688b2faf46c5deb45fc8'
-            'f2f64e7b6bc2a3b7c4414fc4c857b206c597ee7174cdaadaccc51ca4c0f5ada1'
-            'bd3a50b6a034e647a36cc4bf6a37532d892561255cda3e6cbdaf5849e710b657'
-            'df804bde0b39e507f07cbedc18001ea8eb939497c89586e93dc1cbb8c878fbed')
+sha256sums=('ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656'
+            'ea0d7432318261cfd13dadd39ecef5bb98d6ff3017c9e170209c9227bfddaed7'
+            '42e06c8f4261adf434d3f570c22156dec8164745bcb25fd1a93c54a0a5f2277a'
+            '01e52d9a60f6b31561c95798bc1fe0f3e0b6361c9e22307a8db47af789bd8544'
+            'c7a416a2bb61f938a81c7ddc82257776e6752f5372ee57f2cc08cba8761e2211'
+            'e11565af9b05b7714248324b5afecda78caa9be03e9c4872f80ea07636bfa1a7'
+            '8fa423062a850d68341b80aade231cfec865f9a750324ff3819faecf77ff9347'
+            'c9c0289e08106dcc18973d1625526f2a90271452d375171d97a9793199549cea')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index 713f78c4a5ad..c441384ff6c1 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-8dc2c6fe053235e4a2866d8e1927fd667e5e8c853c96de708b9688012089138d
+ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656