Update to beta4

10 files changed, 32 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7eb77cf47a5..d605dede145f 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.0beta3
+	pkgver = 6.0.0beta4
 	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-beta3/submodules/qtbase-everywhere-src-6.0.0-beta3.tar.xz
+	source = https://download.qt.io/development_releases/qt/6.0/6.0.0-beta4/submodules/qtbase-everywhere-src-6.0.0-beta4.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 = 37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268
-	sha256sums = 272d7231b65b6af60c897ff9ac645929976f75c30a9229670da98333fa598811
-	sha256sums = f95f407ce4ec738ee98b9219e197d4c1e0926cca35f63179114d598b2591e80a
-	sha256sums = cb8f9ef03daf86444572f21e38b514794aa23e4419983edde1118e93287750bf
-	sha256sums = 399b81b9fd5bedfe135f60b1e91721a8edbaf267539754e27849532130b7077b
-	sha256sums = 4311c05baf1da78f5acec304dbc53c402542aaa81268939251bda81cc004afd0
-	sha256sums = 1200b9c57290fcb9e54e0bddf88536fe58b39ae2a24a3e2fd802cd16c7bfeb62
-	sha256sums = 45201209696cce59d9e4f0358889eafb68c8e10b314892fac05692b24c301db7
+	sha256sums = 5cb57bf0c513eb48cf57115dc1f1792eb3092a412806b46b836b960f82e31b3e
+	sha256sums = bb9bec76506c3425d6fa2394c2c15cf8c8e84d6ce090f8cd9136c77e7a286d8f
+	sha256sums = 9ba0563f3c47327ca2f51c864fc1916a4355f56f82da77dea81c8a90cf315579
+	sha256sums = 37e533855b3b498bd1e93879aac05cc77dad3b2df64f9a61440aa2bcb73e9847
+	sha256sums = 3bdb93179f5258aa87ce3c2b8e560e2ff9fc9446bfd4688b2faf46c5deb45fc8
+	sha256sums = f2f64e7b6bc2a3b7c4414fc4c857b206c597ee7174cdaadaccc51ca4c0f5ada1
+	sha256sums = bd3a50b6a034e647a36cc4bf6a37532d892561255cda3e6cbdaf5849e710b657
+	sha256sums = df804bde0b39e507f07cbedc18001ea8eb939497c89586e93dc1cbb8c878fbed
 
 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 6df148946b23..bbce7829b919 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 8073b269bb69ab091bb29600c1f7a493f3543a83 Mon Sep 17 00:00:00 2001
+From 302744ea356871a22f9cb6819bf0a9baf0e8211c 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 56c60b1b18..18e1aeddb1 100644
+index 5fc0a5877b..5782de0f91 100644
 --- a/cmake/QtPriHelpers.cmake
 +++ b/cmake/QtPriHelpers.cmake
-@@ -320,9 +320,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
+@@ -330,9 +330,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 56c60b1b18..18e1aeddb1 100644
              ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
              ${CMAKE_STATIC_LIBRARY_SUFFIX})
          add_custom_command(
-@@ -727,9 +731,13 @@ CONFIG += ${private_config_joined}
+@@ -737,9 +741,13 @@ CONFIG += ${private_config_joined}
          list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
      endforeach()
  
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index 28c2424850f0..d5947a85a12e 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,4 +1,4 @@
-From 5c192c74f9f5fd7369742a413fe26bdd67ed677f Mon Sep 17 00:00:00 2001
+From 8a975011cc6b9fa6277ad4bb9015d5d509ad769a 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 d8a3748a30ff..7605922aa267 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 084aa1b73f9f33096c4a5f34cba773545da3ae33 Mon Sep 17 00:00:00 2001
+From 7a839b449645c8978889c0a09f2c149398c833e3 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 3e4cbd998adc..8012f1d6856d 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,4 +1,4 @@
-From 4341f7b4267e1287fa6c41ba0a4afddf505408dc Mon Sep 17 00:00:00 2001
+From 7c05fdef291be4b1819c15845116005f865b185e 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 b528b949a504..4cf130cef3bc 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 0f92aeca18858e11ddaa25b7cdad7d89303052ea Mon Sep 17 00:00:00 2001
+From 2e806336a1053599c6b9b2fb1bcd541b256506b2 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
diff --git a/0006-Support-finding-MariaDB.patch b/0006-Support-finding-MariaDB.patch
index ab1defa785a7..fa869f506ad8 100644
--- a/0006-Support-finding-MariaDB.patch
+++ b/0006-Support-finding-MariaDB.patch
@@ -1,4 +1,4 @@
-From 757964d9bf2e3d2f315f4210cedd7be6cac54c3f Mon Sep 17 00:00:00 2001
+From e8cb07cbabefc1bf1acfd238b3298c7fa7a6c536 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 c1013acb9531..5b830016ed14 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 9bae5f17b9371f03d5075f596bc3d5e50018759d Mon Sep 17 00:00:00 2001
+From dd3d798d4c338164db0ff41ba09af66c43a9d2ab 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 56e7e99d63..e3025fb2c0 100644
+index 5e49a99f5d..dd8ffc1972 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 56e7e99d63..e3025fb2c0 100644
  ######################################
  #
  #       Macros for building Qt modules
-@@ -220,6 +224,7 @@ macro(qt_prepare_standalone_project)
+@@ -224,6 +228,7 @@ macro(qt_prepare_standalone_project)
  endmacro()
  
  macro(qt_build_repo_begin)
diff --git a/PKGBUILD b/PKGBUILD
index 92d567c06735..3e73b34e2106 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-beta3
+_qtver=6.0.0-beta4
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -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=('37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268'
-            '272d7231b65b6af60c897ff9ac645929976f75c30a9229670da98333fa598811'
-            'f95f407ce4ec738ee98b9219e197d4c1e0926cca35f63179114d598b2591e80a'
-            'cb8f9ef03daf86444572f21e38b514794aa23e4419983edde1118e93287750bf'
-            '399b81b9fd5bedfe135f60b1e91721a8edbaf267539754e27849532130b7077b'
-            '4311c05baf1da78f5acec304dbc53c402542aaa81268939251bda81cc004afd0'
-            '1200b9c57290fcb9e54e0bddf88536fe58b39ae2a24a3e2fd802cd16c7bfeb62'
-            '45201209696cce59d9e4f0358889eafb68c8e10b314892fac05692b24c301db7')
+sha256sums=('5cb57bf0c513eb48cf57115dc1f1792eb3092a412806b46b836b960f82e31b3e'
+            'bb9bec76506c3425d6fa2394c2c15cf8c8e84d6ce090f8cd9136c77e7a286d8f'
+            '9ba0563f3c47327ca2f51c864fc1916a4355f56f82da77dea81c8a90cf315579'
+            '37e533855b3b498bd1e93879aac05cc77dad3b2df64f9a61440aa2bcb73e9847'
+            '3bdb93179f5258aa87ce3c2b8e560e2ff9fc9446bfd4688b2faf46c5deb45fc8'
+            'f2f64e7b6bc2a3b7c4414fc4c857b206c597ee7174cdaadaccc51ca4c0f5ada1'
+            'bd3a50b6a034e647a36cc4bf6a37532d892561255cda3e6cbdaf5849e710b657'
+            'df804bde0b39e507f07cbedc18001ea8eb939497c89586e93dc1cbb8c878fbed')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index 5057e6d92c6f..3f14737b17a8 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268
+5cb57bf0c513eb48cf57115dc1f1792eb3092a412806b46b836b960f82e31b3e