Update to 6.2.4

11 files changed, 41 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea0055a022d2..8d3e11184f62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt6-base-static
 	pkgdesc = A cross-platform application and UI framework (mingw-w64)
-	pkgver = 6.2.3
+	pkgver = 6.2.4
 	pkgrel = 1
 	url = https://www.qt.io
 	arch = any
@@ -35,7 +35,7 @@ pkgbase = mingw-w64-qt6-base-static
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://download.qt.io/official_releases/qt/6.2/6.2.3/submodules/qtbase-everywhere-src-6.2.3.tar.xz
+	source = https://download.qt.io/official_releases/qt/6.2/6.2.4/submodules/qtbase-everywhere-src-6.2.4.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
@@ -44,14 +44,14 @@ pkgbase = mingw-w64-qt6-base-static
 	source = 0006-Support-finding-static-MariaDB-client-library.patch
 	source = 0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
 	source = 0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
-	sha256sums = 34d6d0072e197241463c417ad72610c3d44e2efd6062868e9a95283103d75df4
-	sha256sums = a7a41b7bf86616846347eef2fc29cb8927d402b3f96c6bfed72103084a1a6693
-	sha256sums = 9272e36e21c5af94e5cb3c21dfaa693f4f351abf7da3ca8e3c7700ec347256ec
-	sha256sums = 3a2022ec8a9395f7d369fbc3a45434f237d80712a5dcf44261d06e3cd4932e02
-	sha256sums = 9e4ded98abaa44b13982202427b25c4a1839cc1a9ed3b66568e4f7ea36992dcd
-	sha256sums = e365d7ed9560da5f03b4c32788e5eef9f22b0eeeedf2e40bd5c1092c2eca1a87
-	sha256sums = 2ce06fe5f7abbcb497c158d96d3dbe8b25f71bab1d09b110988588853b6ede3b
-	sha256sums = df44dfb678bc91b706987f6e067b75341b6411ec3f89bc05462533153f90b410
-	sha256sums = cbf11ace17ba1ebe0b9195107415c562a666490572d68ea362212c8c22014a1f
+	sha256sums = d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634
+	sha256sums = fbe69e74e323464ef9f47947fab599ae856427836c540f7aecb0658632ced136
+	sha256sums = c53aa6a55d02d0574c9cefd1228d44ed264ed2c1a00d1117dc201114a64e26f8
+	sha256sums = e94d874958913c80a4863dfafc68a6c9c9fa9bf6a0b64a47051951221328d1db
+	sha256sums = 8a00b5de194b1118f41eeeb0d82989f71d2e833064053130201e1d253afff37e
+	sha256sums = 10fb54c70f78cc5da75f115d3ad7508ae5aa21dfacaa87e30635dfce94476a73
+	sha256sums = fc3d7916c72ae949bb8a79350ba79e5c0255a4423c881eec4055adede19202f7
+	sha256sums = 60d954158b2afd5767373444a2f027fe4d8259c42bd509169b46de0e44bc86e6
+	sha256sums = 7c8b68c72802f4d8c87e0d58e443fdcd711a45034333700343af58264225bf50
 
 pkgname = mingw-w64-qt6-base-static
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch
index b258d1f59079..6a8d16a3fa69 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 9df2dbd52b07e1964c3949c2b63970cf304c3bc7 Mon Sep 17 00:00:00 2001
+From 891c21a58a3ae6b649d54feb81c1bed15cbd768c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 22:08:10 +0100
 Subject: [PATCH 1/8] Use CMake's default import library suffix
@@ -98,7 +98,7 @@ index 24ed125f12..73ebe453d3 100644
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
 diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
-index 5741e05bf7..39e4b2bd9e 100644
+index ba1bf5c28c..7777364536 100644
 --- a/src/corelib/Qt6CoreMacros.cmake
 +++ b/src/corelib/Qt6CoreMacros.cmake
 @@ -495,7 +495,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
@@ -110,5 +110,5 @@ index 5741e05bf7..39e4b2bd9e 100644
              get_target_property(target_type ${target} TYPE)
              if(target_type STREQUAL "STATIC_LIBRARY")
 -- 
-2.35.0
+2.35.1
 
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index 8d76dc5f2240..917f124faed2 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,4 +1,4 @@
-From 947f67d520c060d0b7d9915a530dd5465fb09d3e Mon Sep 17 00:00:00 2001
+From 72409b1135172ea0a802c6011ce6867e7d95adb4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 7 Oct 2020 12:13:37 +0200
 Subject: [PATCH 2/8] Fix finding D-Bus
@@ -20,5 +20,5 @@ index e227d224e0..bdbcab9eb3 100644
 +    set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
 +endif()
 -- 
-2.35.0
+2.35.1
 
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index 188cbc20e6d7..4bc7f6a82594 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 7065ae3429f350e5597ecde9114dff5ce5626937 Mon Sep 17 00:00:00 2001
+From 3073fd5aa7d6251b4c66b1fa114cdb3eaa6bae1a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:13:19 +0100
 Subject: [PATCH 3/8] Fix using static PCRE2 and DBus-1
@@ -44,5 +44,5 @@ index accaa4f5ed..4b11c74caa 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.35.0
+2.35.1
 
diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch
index b88ddcc9468f..957bbb81939f 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,4 +1,4 @@
-From 72a9795f3610e10bed26b25b46ec7d12f9ad1954 Mon Sep 17 00:00:00 2001
+From 37bf424036f912d433c76af752aea89477a72b7c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:59:33 +0100
 Subject: [PATCH 4/8] Fix transitive dependencies (of static libraries)
@@ -132,5 +132,5 @@ index d3a6a8588e..743154fc50 100644
          Qt::CorePrivate
          Qt::SqlPrivate
 -- 
-2.35.0
+2.35.1
 
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 198054360b71..1537ebcdc6c1 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 958130bfc5c3b80a430d89e46a7689e040c38c9e Mon Sep 17 00:00:00 2001
+From a51400ce845484b44aea004d144f6b22b7295518 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 2 Nov 2020 13:47:45 +0100
 Subject: [PATCH 5/8] Fix libjpeg workaround for conflict with rpcndr.h
@@ -25,5 +25,5 @@ index a17afc0f69..72708145f4 100644
  #ifdef const
  #  undef const          // remove crazy C hackery in jconfig.h
 -- 
-2.35.0
+2.35.1
 
diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch
index 987d7654ce87..60b829d69405 100644
--- a/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/0006-Support-finding-static-MariaDB-client-library.patch
@@ -1,4 +1,4 @@
-From 2baf3496ba7e51582f2bfd68c68d4712d10949aa Mon Sep 17 00:00:00 2001
+From bac2beb56ed38a878cda23906b1ab138987bbe76 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:33:12 +0100
 Subject: [PATCH 6/8] Support finding static MariaDB client library
@@ -27,5 +27,5 @@ index 0fcba2148e..ab4f6fdc9e 100644
  
  include(FindPackageHandleStandardArgs)
 -- 
-2.35.0
+2.35.1
 
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 d3ba0b22d8f6..97d434edf6a6 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 c679b09bd5e579f0bf33ddd81b022b72324eda40 Mon Sep 17 00:00:00 2001
+From 07bd9df2162db5dba418b3b372d1a762363c1f3d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:34:09 +0100
 Subject: [PATCH 7/8] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
@@ -10,7 +10,7 @@ Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
  1 file changed, 4 insertions(+)
 
 diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index a10296d45b..cd3c9c3e29 100644
+index cd36934f71..84f0f0b91c 100644
 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 @@ -1,6 +1,10 @@
@@ -25,5 +25,5 @@ index a10296d45b..cd3c9c3e29 100644
  #
  # Macros and functions for building Qt modules
 -- 
-2.35.0
+2.35.1
 
diff --git a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
index 0489ee803228..6636682c4e03 100644
--- a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
@@ -1,4 +1,4 @@
-From 291f15bce942ecfcb5edffb3bd7a292a57e19779 Mon Sep 17 00:00:00 2001
+From bc1d5f5f195f9b80f092e531aa566e1e95fb114f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 Jun 2021 22:24:12 +0200
 Subject: [PATCH 8/8] Fix crashes in rasterization code using setjmp
@@ -28,7 +28,7 @@ Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c
  rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
 
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 1e212b25fc..dd8d376024 100644
+index e3062561df..4d64d1588d 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
 @@ -165,7 +165,7 @@ qt_internal_add_module(Gui
@@ -248,5 +248,5 @@ index e2326a56c1..7b30969ec8 100644
          "Description": "FreeType is a freely available software library to render fonts.",
          "Homepage": "http://www.freetype.org",
 -- 
-2.35.0
+2.35.1
 
diff --git a/PKGBUILD b/PKGBUILD
index b06ea39c20c1..5908358abaec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase
 
 pkgname=mingw-w64-qt6-base-static
-_qtver=6.2.3
+_qtver=6.2.4
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -39,15 +39,15 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         '0006-Support-finding-static-MariaDB-client-library.patch'
         '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch'
         '0008-Fix-crashes-in-rasterization-code-using-setjmp.patch')
-sha256sums=('34d6d0072e197241463c417ad72610c3d44e2efd6062868e9a95283103d75df4'
-            'a7a41b7bf86616846347eef2fc29cb8927d402b3f96c6bfed72103084a1a6693'
-            '9272e36e21c5af94e5cb3c21dfaa693f4f351abf7da3ca8e3c7700ec347256ec'
-            '3a2022ec8a9395f7d369fbc3a45434f237d80712a5dcf44261d06e3cd4932e02'
-            '9e4ded98abaa44b13982202427b25c4a1839cc1a9ed3b66568e4f7ea36992dcd'
-            'e365d7ed9560da5f03b4c32788e5eef9f22b0eeeedf2e40bd5c1092c2eca1a87'
-            '2ce06fe5f7abbcb497c158d96d3dbe8b25f71bab1d09b110988588853b6ede3b'
-            'df44dfb678bc91b706987f6e067b75341b6411ec3f89bc05462533153f90b410'
-            'cbf11ace17ba1ebe0b9195107415c562a666490572d68ea362212c8c22014a1f')
+sha256sums=('d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634'
+            'fbe69e74e323464ef9f47947fab599ae856427836c540f7aecb0658632ced136'
+            'c53aa6a55d02d0574c9cefd1228d44ed264ed2c1a00d1117dc201114a64e26f8'
+            'e94d874958913c80a4863dfafc68a6c9c9fa9bf6a0b64a47051951221328d1db'
+            '8a00b5de194b1118f41eeeb0d82989f71d2e833064053130201e1d253afff37e'
+            '10fb54c70f78cc5da75f115d3ad7508ae5aa21dfacaa87e30635dfce94476a73'
+            'fc3d7916c72ae949bb8a79350ba79e5c0255a4423c881eec4055adede19202f7'
+            '60d954158b2afd5767373444a2f027fe4d8259c42bd509169b46de0e44bc86e6'
+            '7c8b68c72802f4d8c87e0d58e443fdcd711a45034333700343af58264225bf50')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index efb9ac9a4de9..b440388010dd 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-34d6d0072e197241463c417ad72610c3d44e2efd6062868e9a95283103d75df4
+d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634