Update to 5.15.12

34 files changed, 144 insertions, 145 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0acfb0ccede..6ec15b0153fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt5-base-static
 	pkgdesc = A cross-platform application and UI framework, native OpenGL backend (mingw-w64)
-	pkgver = 5.15.11+kde+r135
+	pkgver = 5.15.12+kde+r147
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -34,7 +34,7 @@ pkgbase = mingw-w64-qt5-base-static
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = git+https://invent.kde.org/qt/qt/qtbase#commit=b6867eef3dd3ac7e825e22b4ad4d2fc182cf20ff
+	source = git+https://invent.kde.org/qt/qt/qtbase#commit=8907dedc858cc344d770a2e826d6acc516429540
 	source = 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
 	source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
 	source = 0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -68,37 +68,37 @@ pkgbase = mingw-w64-qt5-base-static
 	source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
 	source = 0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
 	sha256sums = SKIP
-	sha256sums = bc889545b0486b17a03451b1f66e2f99d1d932632471a5b055ffdce97e2c4d0f
-	sha256sums = 23c51a529968b0b070340a8f894c23496a28a14bf572868d144084f008848011
-	sha256sums = 53dcb69be09c72394aee605cd041efafbc3a65fc5d8f7031093dfd5132698b4b
-	sha256sums = d325dea31991750ea6e723ae7a6498af282fc2d0dc498457809e25b5165da5bf
-	sha256sums = a0e57693ab82add358884b08a20e6a76c46ff37c0517ac35020fe686f9e26250
-	sha256sums = fd87249482995aca6dbf04d5b0bfd774d7144c49a6d71e7ef2dc933ead7e18c8
-	sha256sums = 4531990f46c4d937b25fb9c2815eec1127cbf5b4c56fa504226047f56b4e9d96
-	sha256sums = 9ecd7eaef3b3447762fe07b8021905832351c2a3ad2de6b057c08b147f4af06d
-	sha256sums = eb70362a0307bf96af8534de0da314c12673df6518cc94d95682e66201bfab43
-	sha256sums = 7f7ea0ede86aa04f93fa960f84e2e450e28d39c240ff0e3bc6bc97e9ee3d8673
-	sha256sums = 885a96fe07e42cdecf590119e22fe492f84e20f2564bc6ee8e7ff4c43949c461
-	sha256sums = 6a2a5615f96e5f9eb51bbfca41d61b299ac2000097eb2e919705a85d258f2736
-	sha256sums = d7102c593422b3f172de40789b8a27427afbb1bcfbbe4b165bf2ffe139346045
-	sha256sums = b7c96667d2b73748ef911cfef9b714c05f1f4f0253576a9a1cd725cb62b62a1a
-	sha256sums = a4fdfe1f6383d0dc51b4cc898f415a37494ebd478db105daf036244b9a5f27c0
-	sha256sums = c32cccabeea035f91d3436fbad07f8ce63453ea3c82b69d88c7876a474ebbcb4
-	sha256sums = d34ac9ab2302b9c380f400eed50ca056ea9fd2412c5a97eb0746fca7a43921d6
-	sha256sums = 5a31c5857a14f66f0e53d10f756c3ae6b46ac5ccffc790acf599a93812d68230
-	sha256sums = 7e3de1428531b6d9225a0045c5fe4b2d3d5e4a12e211c4e44e7fc2045a8911b0
-	sha256sums = 25a1de3adc46b4daac58cc7d83cd230522058b48aad2492251dd4d7c898a7993
-	sha256sums = c9a49609d6a126375da7465d203db602de3b7b9118214f97f9960001b9ad6a35
-	sha256sums = 1021c5a078e9d59ee68be81ef1921a919a7d3f517d0ef619ed8266276fdef46b
-	sha256sums = b8902c748ae6f4c9b974780bf0f853ba6068a269b18ac667ac5eb8927de129fa
-	sha256sums = fb95bcfc8d76a774fa8d5c4f40becc381c35b7442ae882cd56b638627816d3f4
-	sha256sums = b1bdc2c14b99869a34f2894f88873b150cb2e9e6ef2c41f65846685489167412
-	sha256sums = 2768a79e5d4c98111ecfdadb05ce5325a902f67d1357e1f3c655c5adca28a9be
-	sha256sums = 30a7aa33a21fd4e620f023ee6dcecdef468c12b3c631555c12f4091f0b6e4d80
-	sha256sums = f2323e6aa5ff97e9517adf343fde65dbaaa7696bd368bbf6be7ae7eb6cd930f8
-	sha256sums = 4511e3ce148f5016eb1b1ec021c942ef437b08ebbd4f3195fd263735e5940a0a
-	sha256sums = 22ff54ddfebfa08d2721d6c0b9398376d99b84d7a63dcf72f6c91c5b8ed3cb89
-	sha256sums = ef3549c142c604db36737f6665e38c06b331c9eb1948c7e8860abb976ef4f025
-	sha256sums = 6c9f598777fd6c1c35ab85bacb17e7022b66afe223b1720e240c34228cedfd22
+	sha256sums = 6abea753da212719c065ba5001380257098fcb78ebfb1743d511c827f470a636
+	sha256sums = 19b2918d73c1fe63c284602e9315e22d0c9b3240705b8a6459f2b0967933c969
+	sha256sums = 23d6ace78834c831ea97e19b443a88291e4d103fd85da920e1cf430047a73d41
+	sha256sums = 66924a2642debb2a76ff085c1c2c4a6912993d313efea392308859edc825672c
+	sha256sums = 306cc84dbb13f1315b6d060dffbca4d4a9637f9672e43c58a3d01bf766ae3f71
+	sha256sums = 167a7c2cece750b7da922ec25e47eed618feaca92897d085a0c635f828b1a9b9
+	sha256sums = 9667d35f3beb5c9042bd7190342f8e86bc9ff62f0bcbb438e25450025c1cf597
+	sha256sums = 09c6de90337c1a8d42e695fdea53bdea9800e9d7fc8d12578e9fb1fd564988cc
+	sha256sums = b5442e2b87f39defa6e38793b2fd26c1e0f3610ae02b3d14a4b680e687ca2ccc
+	sha256sums = c3c3c0f651da11e3b78cf71399a0d95519e9dc0361e9732adc7f36d60c9e45c1
+	sha256sums = 561c0ec6fce7f61166097ea7037020b657dc21abb3fbbf136318f0d43940c396
+	sha256sums = e80f2dedaf91bd3302c27244451a510ba3a576bb60d6e96a0f3c8ad8bd0fbd68
+	sha256sums = 0d77c5d3f9e84fa2dff90c5faf32b51b1b19f110a503fa9630cdc5e33bc6d72e
+	sha256sums = c49304f8c99bc4213dc62a65f7f8d1089b72c7ec49d8895afaf5d059da7b905f
+	sha256sums = 3eb93b2fb1b6eb5e6f5d4fff8e75e5b0cfab96503b077c121e4bc405eda08f42
+	sha256sums = 16cc6c9c49d91e2a6c8c6e53a7305db868f4080affd387ec3d932fa474b5841c
+	sha256sums = 06fb708234c783bc1aa9e0bf1f9db6f16b3fe62ee8a94300252796de841fd56d
+	sha256sums = 1ab92232b3a94446c391c822a82aab767f4b1b077c73e839b316473163887ad4
+	sha256sums = b174ddca0726fadf191176336f8fbddf18ab95f2967e1e0bebdb8e0425d4223f
+	sha256sums = 376aebad348858696a4f8ecaf9668cf4b12687ef2213706e768d8aa11a01e631
+	sha256sums = f266866a8f01cb95a1d686b1a5ce3ec46ab8fa0ddec268b0e2eb53ddbf53aae3
+	sha256sums = 91730e65dee6d4a3b1c36e2153c0608e9fb419060ccb57800452895cfe5e08c3
+	sha256sums = 575c14e7ff04515a934491fcfd0328316f734045a419581b356db9e9dbd69d20
+	sha256sums = a1c8251c4d9747fdfb2fa319cbef604bec6f3826ca4b0d2277b3e56b24e1d44a
+	sha256sums = 40419107bdd48d47c8d5c8cbee3624fd14c32e2daa42993ff08ea9d5eae21d0f
+	sha256sums = af7f4c80119c33607d142a591dcf86463796526333a964f7dee5813eab7a2705
+	sha256sums = 1684c496c58ecff4fc5e21335a96824ee07282479d0d5f7edf52e844264ce76e
+	sha256sums = f610d74cffc6c2d089eedde8f31624da25172cc9825a24c085ff6e9c80cb3352
+	sha256sums = 30decf5cf1c862c183350ac9af71263ecd45a9701d9e85bc765af8e74ddd0df6
+	sha256sums = 811ad201d74106dea202ce28806dc1eca091139da5a71d2dd8656c592ec721ed
+	sha256sums = 8a154c511e6e3e35a64338890edbbc2a12d6a7079fff9a14491146a4b66e5b59
+	sha256sums = c2a61b245c312b71c043ee274d7beba0daf213d7a6f6ba748c2965e4dc27ff0a
 
 pkgname = mingw-w64-qt5-base-static
diff --git a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
index c5a6c7611dd0..169e6d4d5649 100644
--- a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@@ -1,4 +1,4 @@
-From e1e294676110887797fcd817cc04cf9ae42af6ec Mon Sep 17 00:00:00 2001
+From b6ccf3e66d2a7988a4ffe3407feb56ad782ed586 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with
@@ -13,7 +13,7 @@ Also see the following issues:
 * https://github.com/Martchus/PKGBUILDs/issues/59
 * https://github.com/Martchus/PKGBUILDs/issues/60
 
-Change-Id: I127bb0516bd4acfea588a5d48c46811525a8fca8
+Change-Id: I94f5a6c44c112bd44a84f802712077bc14782b4c
 ---
  mkspecs/common/g++-win32.conf      | 51 ++++++++++++++++++++----------
  mkspecs/win32-clang-g++/qmake.conf |  4 +--
@@ -21,7 +21,7 @@ Change-Id: I127bb0516bd4acfea588a5d48c46811525a8fca8
  3 files changed, 38 insertions(+), 21 deletions(-)
 
 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index c3a1f3a373..793ff540a1 100644
+index c3a1f3a373..0cc6e93c93 100644
 --- a/mkspecs/common/g++-win32.conf
 +++ b/mkspecs/common/g++-win32.conf
 @@ -8,18 +8,24 @@
@@ -95,8 +95,8 @@ index c3a1f3a373..793ff540a1 100644
 +QMAKE_LIBS_CORE         = -lz -lpcre2-16 -liconv -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
 +QMAKE_LIBS_GUI          = $$system($${QMAKE_PKG_CONFIG} --libs harfbuzz) $$system($${QMAKE_PKG_CONFIG} --libs freetype2) \
 +                          -ljpeg -lpng -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-+QMAKE_LIBS_GUI_STATIC   = $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz | sed -e "'s/\\([^ ]*\\)brotli\\([^ ]*\\)/\\1brotli\\2-static/g'" ) \
-+                          $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2 | sed -e "'s/\\([^ ]*\\)brotli\\([^ ]*\\)/\\1brotli\\2-static/g'" ) \
++QMAKE_LIBS_GUI_STATIC   = $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
++                          $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) \
 +                          -ljpeg -lpng -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ldxgi -ld3d11
 +QMAKE_LIBS_NETWORK      = -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
 +QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
@@ -162,5 +162,5 @@ index 5de482f23b..3c3d22c699 100644
  
  QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.42.0
+2.43.0
 
diff --git a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
index fad0dc455594..99f250273572 100644
--- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,4 +1,4 @@
-From bb03df95d708361017e1656ba036ab1d0b95318b Mon Sep 17 00:00:00 2001
+From ff91032556f863a8c7211cd874fd3b703622b2f3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL
@@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.42.0
+2.43.0
 
diff --git a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
index e1c2b93f0c63..b51679321393 100644
--- a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -1,4 +1,4 @@
-From 1e1e8d2976c9a803d2f81a06e78b6b519f1315bd Mon Sep 17 00:00:00 2001
+From a04c5b24efbf3a049eb5deeb0e65bbc50cc13c49 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 03/32] Fix too many sections assemler error in OpenGL factory
@@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.42.0
+2.43.0
 
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch
index c4d0d54f57cc..2ca9bd3b17b4 100644
--- a/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,4 +1,4 @@
-From 7ed1e37c090b45fec92e58597e77e0e15770b5be Mon Sep 17 00:00:00 2001
+From e92060e9f2082620f5e2a90f5caf962e5ddf6cc8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 04/32] Make sure *.pc files are installed correctly
@@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.42.0
+2.43.0
 
diff --git a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
index f656caef5f22..40a82b65871c 100644
--- a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,4 +1,4 @@
-From f64f48aa8a335b7fc872138b0d10f9fb832058cc Mon Sep 17 00:00:00 2001
+From 1509d40b75406e82868a8150080ce6137095115a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 05/32] Don't add resource files to LIBS parameter
@@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.42.0
+2.43.0
 
diff --git a/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
index d3bfd1d0440a..04d9bd085733 100644
--- a/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From 64def00870b3ec7ce340fa17723278c3a34d1b9d Mon Sep 17 00:00:00 2001
+From f14efd1bfe50197db8350b7042c4f7e0f64c7d9f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 06/32] Prevent debug library names in pkg-config files
@@ -29,5 +29,5 @@ index fc996663d8..23ac736fc0 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.42.0
+2.43.0
 
diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch
index 013ba907bcf8..23af4df0f545 100644
--- a/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/0007-Fix-linking-against-shared-static-libpng.patch
@@ -1,4 +1,4 @@
-From 5a91a9f8b73d169bedffb4da3ca38a4b23bfb365 Mon Sep 17 00:00:00 2001
+From 1d63d54f3678c7511eba98e6f372d7546501aeba Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 07/32] Fix linking against shared/static libpng
@@ -26,5 +26,5 @@ index 12c95742d2..e0043542ec 100644
              ],
              "use": [
 -- 
-2.42.0
+2.43.0
 
diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch
index ee076593f8ed..67e07ef36efc 100644
--- a/0008-Fix-linking-against-static-D-Bus.patch
+++ b/0008-Fix-linking-against-static-D-Bus.patch
@@ -1,4 +1,4 @@
-From 823153dcc57354cbcd5e06646c3170e4f09767c5 Mon Sep 17 00:00:00 2001
+From 5fa0a841ce62337e7280279b8aa70874b12148a4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 08/32] Fix linking against static D-Bus
@@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.42.0
+2.43.0
 
diff --git a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
index 7190d8ed4f81..d6203cc3ccf9 100644
--- a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,4 +1,4 @@
-From 7bd306eea37be85abb1cdc11f32f0fda8c145aea Mon Sep 17 00:00:00 2001
+From ccb0d3a691abf2be1e6ee5ff6293dae1c9246a20 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 09/32] Don't try to use debug version of D-Bus library
@@ -25,5 +25,5 @@ index e97969ab25..b75f8a8033 100644
                      },
                      "condition": "config.win32 && features.shared"
 -- 
-2.42.0
+2.43.0
 
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
index c875b742887d..038f9f470459 100644
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ b/0010-Fix-linking-against-static-freetype2.patch
@@ -1,15 +1,14 @@
-From 73f26d2cf4de3c101b86bfafe4d85e0e88ea447a Mon Sep 17 00:00:00 2001
+From 029df9db41b422111966430faa85fa12d96bdde4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 10/32] Fix linking against static freetype2
 
-Change-Id: I6e4a2baa25beb5f63b46f25153bd7bac52a2262f
 ---
  src/gui/configure.json | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index e0043542ec..3f77f67a07 100644
+index e0043542ec..6c5e99fa9a 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -238,8 +238,10 @@
@@ -19,12 +18,12 @@ index e0043542ec..3f77f67a07 100644
 -                { "type": "pkgConfig", "args": "freetype2" },
 -                { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
 +                { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
-+                { "libs": "-lfreetype -lharfbuzz -lfreetype -lbrotlidec-static -lbrotlicommon-static -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre2-8 -lintl -lpcre2-8 -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
++                { "libs": "-lfreetype -lharfbuzz -lfreetype -lbrotlidec -lbrotlicommon -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre2-8 -lintl -lpcre2-8 -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
                  { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
                  { "libs": "-lfreetype" }
              ],
 -- 
-2.42.0
+2.43.0
 
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch
index 4ee5469f1b46..cdea7a8f0826 100644
--- a/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/0011-Fix-linking-against-static-harfbuzz.patch
@@ -1,4 +1,4 @@
-From 716c10c6e40754024812695949098b5d1d41232d Mon Sep 17 00:00:00 2001
+From 2fb25bad89b6df6903f81d9efac2aa000513d02d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 11/32] Fix linking against static harfbuzz
@@ -8,7 +8,7 @@ Subject: [PATCH 11/32] Fix linking against static harfbuzz
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 3f77f67a07..f6da787b13 100644
+index 6c5e99fa9a..d8afe79b0b 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -305,7 +305,11 @@
@@ -25,5 +25,5 @@ index 3f77f67a07..f6da787b13 100644
          },
          "imf": {
 -- 
-2.42.0
+2.43.0
 
diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch
index babc53cfb168..45e8888e8bc4 100644
--- a/0012-Fix-linking-against-static-pcre.patch
+++ b/0012-Fix-linking-against-static-pcre.patch
@@ -1,4 +1,4 @@
-From e088f3091a9525b7713768b97bfafb9d1dd94d61 Mon Sep 17 00:00:00 2001
+From c5de4d5b6a0cdb2b8931bf7baf43e75e7e562d45 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 12/32] Fix linking against static pcre
@@ -24,5 +24,5 @@ index 1f10150435..6a97b47773 100644
  #include <pcre2.h>
  
 -- 
-2.42.0
+2.43.0
 
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch
index de6f7cc46ba4..1887de970934 100644
--- a/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0013-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,4 +1,4 @@
-From d2866fb33b4e0cc5938d2f71487aaa0d8ee2660a Mon Sep 17 00:00:00 2001
+From 1ebf69214e4ef2269ab0135d126ce5d9bba2fa04 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 13/32] Fix linking against shared/static MariaDB
@@ -9,18 +9,18 @@ Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
  1 file changed, 2 insertions(+)
 
 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 28ccbeadcd..7262914c64 100644
+index 28ccbeadcd..a5e3001bf6 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
 @@ -67,6 +67,8 @@
              },
              "headers": "mysql.h",
              "sources": [
-+                { "libs": "-lmariadbclient -lssl -lcrypto -lshlwapi -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
++                { "libs": "-lmariadbclient -lssl -lcrypto -lcrypt32 -lshlwapi -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
 +                { "libs": "-lmariadb", "condition": "config.win32 && features.shared" },
                  { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
                  { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                  { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.42.0
+2.43.0
 
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
index b790684e02ec..707e3acbda22 100644
--- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,4 +1,4 @@
-From b04536fd019cb855eeb9f4bdda33daddd83fff0d Mon Sep 17 00:00:00 2001
+From 2759362b0676bda304c86d30c30bab30444ffbb9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL
@@ -8,7 +8,7 @@ Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 7262914c64..852ba558be 100644
+index a5e3001bf6..5768d3b9a9 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
 @@ -90,9 +90,9 @@
@@ -18,11 +18,11 @@ index 7262914c64..852ba558be 100644
 -                { "type": "pkgConfig", "args": "libpq" },
                  { "type": "psqlConfig" },
 -                { "type": "psqlEnv", "libs": "-llibpq -lws2_32 -ladvapi32", "condition": "config.win32" },
-+                { "type": "psqlEnv", "libs": "-lpq -lpgcommon -lpgport -lintl -lssl -lcrypto -lshell32 -lws2_32 -lsecur32 -liconv", "condition": "config.win32 && !features.shared" },
++                { "type": "psqlEnv", "libs": "-lpq -lpgcommon -lpgport -lintl -lssl -lcrypto -lcrypt32 -lshell32 -lws2_32 -lsecur32 -liconv", "condition": "config.win32 && !features.shared" },
 +                { "type": "psqlEnv", "libs": "-lpq", "condition": "config.win32 && features.shared" },
                  { "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" }
              ]
          },
 -- 
-2.42.0
+2.43.0
 
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index eccfcd53e88e..63156a4e1fb4 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,4 +1,4 @@
-From 1a9bd50672d0ddf8527ece84610120e9ebc13eb0 Mon Sep 17 00:00:00 2001
+From ff832ccc532edcd8ed520ee84db3b00454f33651 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 15/32] Rename qtmain to qt5main
@@ -12,7 +12,7 @@ Prevents conflict with mingw-w64-qt4 package
  4 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index 793ff540a1..4f3bb7e764 100644
+index 0cc6e93c93..c2882d0b2c 100644
 --- a/mkspecs/common/g++-win32.conf
 +++ b/mkspecs/common/g++-win32.conf
 @@ -83,7 +83,7 @@ QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
@@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
  
  CONFIG += static
 -- 
-2.42.0
+2.43.0
 
diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch
index 78b4b78f1ad9..704655145ce1 100644
--- a/0016-Enable-rpath-for-build-tools.patch
+++ b/0016-Enable-rpath-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 93a9af797542e5df74bc00848c5f2b2be98fb843 Mon Sep 17 00:00:00 2001
+From a4cd073cad8030792dd7822ff3a4317441ec3824 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 16/32] Enable rpath for build tools
@@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
  INSTALLS += target
  
 -- 
-2.42.0
+2.43.0
 
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch
index 11842c52b0fc..1feef395011a 100644
--- a/0017-Use-system-zlib-for-build-tools.patch
+++ b/0017-Use-system-zlib-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 21fe2f04cccc4e69c7d2678d0f6b2a497e73cbf2 Mon Sep 17 00:00:00 2001
+From 83459578b49cefb55f3977182b2f2a8dff1eff32 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 17/32] Use system zlib for build tools
@@ -23,5 +23,5 @@ index 24862a07db..698e6cfb95 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.42.0
+2.43.0
 
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch
index d8fcca3928d4..0f64cacaabce 100644
--- a/0018-Merge-shared-and-static-library-trees.patch
+++ b/0018-Merge-shared-and-static-library-trees.patch
@@ -1,4 +1,4 @@
-From 08e55886e72410970435c2ac4fd962dec5ec2070 Mon Sep 17 00:00:00 2001
+From 2171c0bfb817495fb64d7a0b31ced2a4fa9c4f4f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 18/32] Merge shared and static library trees
@@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
  mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
  INSTALLS += mkspecs
 -- 
-2.42.0
+2.43.0
 
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch
index ac82644d281c..099b966227b1 100644
--- a/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/0019-Use-.dll.a-as-import-lib-extension.patch
@@ -1,4 +1,4 @@
-From 480779ee0ad4c5bc41ace06ab7015d381005563a Mon Sep 17 00:00:00 2001
+From b90b122dde2818d7c43c2400ec5aad542909ec67 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 19/32] Use *.dll.a as import lib extension
@@ -116,5 +116,5 @@ index 183cef2908..03732df4a8 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.42.0
+2.43.0
 
diff --git a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index b965d1a368ed..26e7923d7c75 100644
--- a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,4 +1,4 @@
-From 51a4be11551cb2962d7c012538f21f8bd1159215 Mon Sep 17 00:00:00 2001
+From 52e0f0689c9bfc6f10e5b5eeaf51181fea9beb25 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 20/32] Pull dependencies of static libraries in CMake modules
@@ -499,5 +499,5 @@ index b465a7fa89..eaf9011c3d 100644
  set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\")
 +endif()
 -- 
-2.42.0
+2.43.0
 
diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch
index 0890a63dada8..1876db935437 100644
--- a/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/0021-Allow-usage-of-static-version-with-CMake.patch
@@ -1,4 +1,4 @@
-From 3e661746886b8ca742435eae2f5021ba3ccc040a Mon Sep 17 00:00:00 2001
+From c748cb3cc99435da4123f5822c544dc8a4a0960f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 21/32] Allow usage of static version with CMake
@@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.42.0
+2.43.0
 
diff --git a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index 7a1f435ffcf4..a420a7c9ed97 100644
--- a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,4 +1,4 @@
-From 4f825d28697c05b6e7c37d97c20ca877450e2941 Mon Sep 17 00:00:00 2001
+From 3fb4f9b9186af92e95cd35ba994ee9e9fa3be4d6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 22/32] Adjust linker flags for static build with
@@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644
 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
 +unset(_isExe)
 -- 
-2.42.0
+2.43.0
 
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index 67755c61ddc9..02eac25b0e7a 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From 30959679d5c157f5668e352bbc91c7f42af696f4 Mon Sep 17 00:00:00 2001
+From 4e95aba534172824d9756ec22bfe903d29d98e54 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 23/32] Use correct pkg-config --static flag
@@ -22,5 +22,5 @@ index 85acb3757a..0a4db10dfc 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.42.0
+2.43.0
 
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
index aadea269e5ca..9930cb377c73 100644
--- a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,4 +1,4 @@
-From 827417e8858523312cc69417af6e490d7df91583 Mon Sep 17 00:00:00 2001
+From c78641f7d7f6fc5878153d219e83dbf27d8a07b4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic
@@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
            MAIN_DEPENDENCY ${infile} VERBATIM)
          set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.42.0
+2.43.0
 
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index c5fa837872b8..32896986ae3d 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From c1909d49d8c9aa2051fb7a30edee775813b3460b Mon Sep 17 00:00:00 2001
+From 446017c200c59d2332a0b17c24a897d3165b8de9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 25/32] Ignore errors about missing feature static
@@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 -- 
-2.42.0
+2.43.0
 
diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch
index ed0393096efa..6605d3365180 100644
--- a/0026-Enable-and-fix-use-of-iconv.patch
+++ b/0026-Enable-and-fix-use-of-iconv.patch
@@ -1,4 +1,4 @@
-From dc4527078cccf8d61b992ee1d8b9d4950dcae114 Mon Sep 17 00:00:00 2001
+From a567a7a191d2616a372529383a10bad8e9306f6a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 26/32] Enable and fix use of iconv
@@ -74,5 +74,5 @@ index a9025a2dd2..ffb6f50fbe 100644
          },
          "icu": {
 -- 
-2.42.0
+2.43.0
 
diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch
index 9e8049fa5264..8eff0aa5dbae 100644
--- a/0027-Ignore-failing-pkg-config-test.patch
+++ b/0027-Ignore-failing-pkg-config-test.patch
@@ -1,4 +1,4 @@
-From 94764ace8366331b86968ce06cf41e5e82e04e5f Mon Sep 17 00:00:00 2001
+From ebca1e4ba71b42a0b9f3358118dd1bf7e5184450 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 27/32] Ignore failing pkg-config test
@@ -21,5 +21,5 @@ index b75f8a8033..72a963a679 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.42.0
+2.43.0
 
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 4b57a2276795..f5e770e0e0f4 100644
--- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,4 +1,4 @@
-From 9d573b7ad97025ed056d0c39c4e642fe43d396bd Mon Sep 17 00:00:00 2001
+From fc455d2b8916fbfe7b0b5240822b96c6567a7e2c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies
@@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644
      int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 -- 
-2.42.0
+2.43.0
 
diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch
index 36cfcf2d8c9f..a46035d930f7 100644
--- a/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,4 +1,4 @@
-From 0c12fef4493fa91cfb1eef704a68b6a0b5de7393 Mon Sep 17 00:00:00 2001
+From 9858a911afe59c3768b5eb76f7c9cb1d7ea2f06c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 29/32] Hardcode linker flags for platform plugins
@@ -174,5 +174,5 @@ index 50a3bb41a9..02f74650a9 100644
  include(windows.pri)
  
 -- 
-2.42.0
+2.43.0
 
diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch
index c765a1c49965..58dca6fdbe2c 100644
--- a/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/0030-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,4 +1,4 @@
-From dcb8c0bc61f7b8731dba4dfbf7f53ca015316461 Mon Sep 17 00:00:00 2001
+From e12301fa179a7196624b12d02a2ddacd997ecc7e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 30/32] Fix linking against static plugins with qmake
@@ -33,5 +33,5 @@ index b79b324b88..6a03b7a74b 100644
          # Check if the plugin is known to Qt. We can use this to determine
          # the plugin path. Unknown plugins must rely on the default link path.
 -- 
-2.42.0
+2.43.0
 
diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
index ed4621d9daf2..700dd6485137 100644
--- a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@@ -1,4 +1,4 @@
-From 6a56d08dec1ff1e60e06515df25f362240b26b1f Mon Sep 17 00:00:00 2001
+From a7a3f6a64e90aee5a0024f9b8b1d6d4876d25d7e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Jun 2019 13:51:02 +0200
 Subject: [PATCH 31/32] Prevent 'Cannot find feature windows_vulkan_sdk'
@@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
      LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
      for (nu, LD_USES) {
 -- 
-2.42.0
+2.43.0
 
diff --git a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
index 5b82da678c98..a35aa695581e 100644
--- a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
@@ -1,4 +1,4 @@
-From 0a5405232e44b2d9d26276a3553b6c67e0e9f545 Mon Sep 17 00:00:00 2001
+From 5f254a0f2f5857a6c1da88166549b38a3864a38c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 Jun 2021 22:24:12 +0200
 Subject: [PATCH 32/32] Fix crashes in rasterization code using setjmp
@@ -244,5 +244,5 @@ index 1a2b907606..746a41efa8 100644
          "Description": "FreeType is a freely available software library to render fonts.",
          "Homepage": "http://www.freetype.org",
 -- 
-2.42.0
+2.43.0
 
diff --git a/PKGBUILD b/PKGBUILD
index cd115b3ae993..d536c74ebb6a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,10 +17,10 @@
 
 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base-static
-pkgver=5.15.11+kde+r135
+pkgver=5.15.12+kde+r147
 pkgrel=1
 _basever=${pkgver%%+*}
-_commit=b6867eef3dd3ac7e825e22b4ad4d2fc182cf20ff
+_commit=8907dedc858cc344d770a2e826d6acc516429540
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('any')
 url='https://www.qt.io/'
@@ -71,38 +71,38 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch'
         '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch')
 sha256sums=('SKIP'
-            'bc889545b0486b17a03451b1f66e2f99d1d932632471a5b055ffdce97e2c4d0f'
-            '23c51a529968b0b070340a8f894c23496a28a14bf572868d144084f008848011'
-            '53dcb69be09c72394aee605cd041efafbc3a65fc5d8f7031093dfd5132698b4b'
-            'd325dea31991750ea6e723ae7a6498af282fc2d0dc498457809e25b5165da5bf'
-            'a0e57693ab82add358884b08a20e6a76c46ff37c0517ac35020fe686f9e26250'
-            'fd87249482995aca6dbf04d5b0bfd774d7144c49a6d71e7ef2dc933ead7e18c8'
-            '4531990f46c4d937b25fb9c2815eec1127cbf5b4c56fa504226047f56b4e9d96'
-            '9ecd7eaef3b3447762fe07b8021905832351c2a3ad2de6b057c08b147f4af06d'
-            'eb70362a0307bf96af8534de0da314c12673df6518cc94d95682e66201bfab43'
-            '7f7ea0ede86aa04f93fa960f84e2e450e28d39c240ff0e3bc6bc97e9ee3d8673'
-            '885a96fe07e42cdecf590119e22fe492f84e20f2564bc6ee8e7ff4c43949c461'
-            '6a2a5615f96e5f9eb51bbfca41d61b299ac2000097eb2e919705a85d258f2736'
-            'd7102c593422b3f172de40789b8a27427afbb1bcfbbe4b165bf2ffe139346045'
-            'b7c96667d2b73748ef911cfef9b714c05f1f4f0253576a9a1cd725cb62b62a1a'
-            'a4fdfe1f6383d0dc51b4cc898f415a37494ebd478db105daf036244b9a5f27c0'
-            'c32cccabeea035f91d3436fbad07f8ce63453ea3c82b69d88c7876a474ebbcb4'
-            'd34ac9ab2302b9c380f400eed50ca056ea9fd2412c5a97eb0746fca7a43921d6'
-            '5a31c5857a14f66f0e53d10f756c3ae6b46ac5ccffc790acf599a93812d68230'
-            '7e3de1428531b6d9225a0045c5fe4b2d3d5e4a12e211c4e44e7fc2045a8911b0'
-            '25a1de3adc46b4daac58cc7d83cd230522058b48aad2492251dd4d7c898a7993'
-            'c9a49609d6a126375da7465d203db602de3b7b9118214f97f9960001b9ad6a35'
-            '1021c5a078e9d59ee68be81ef1921a919a7d3f517d0ef619ed8266276fdef46b'
-            'b8902c748ae6f4c9b974780bf0f853ba6068a269b18ac667ac5eb8927de129fa'
-            'fb95bcfc8d76a774fa8d5c4f40becc381c35b7442ae882cd56b638627816d3f4'
-            'b1bdc2c14b99869a34f2894f88873b150cb2e9e6ef2c41f65846685489167412'
-            '2768a79e5d4c98111ecfdadb05ce5325a902f67d1357e1f3c655c5adca28a9be'
-            '30a7aa33a21fd4e620f023ee6dcecdef468c12b3c631555c12f4091f0b6e4d80'
-            'f2323e6aa5ff97e9517adf343fde65dbaaa7696bd368bbf6be7ae7eb6cd930f8'
-            '4511e3ce148f5016eb1b1ec021c942ef437b08ebbd4f3195fd263735e5940a0a'
-            '22ff54ddfebfa08d2721d6c0b9398376d99b84d7a63dcf72f6c91c5b8ed3cb89'
-            'ef3549c142c604db36737f6665e38c06b331c9eb1948c7e8860abb976ef4f025'
-            '6c9f598777fd6c1c35ab85bacb17e7022b66afe223b1720e240c34228cedfd22')
+            '6abea753da212719c065ba5001380257098fcb78ebfb1743d511c827f470a636'
+            '19b2918d73c1fe63c284602e9315e22d0c9b3240705b8a6459f2b0967933c969'
+            '23d6ace78834c831ea97e19b443a88291e4d103fd85da920e1cf430047a73d41'
+            '66924a2642debb2a76ff085c1c2c4a6912993d313efea392308859edc825672c'
+            '306cc84dbb13f1315b6d060dffbca4d4a9637f9672e43c58a3d01bf766ae3f71'
+            '167a7c2cece750b7da922ec25e47eed618feaca92897d085a0c635f828b1a9b9'
+            '9667d35f3beb5c9042bd7190342f8e86bc9ff62f0bcbb438e25450025c1cf597'
+            '09c6de90337c1a8d42e695fdea53bdea9800e9d7fc8d12578e9fb1fd564988cc'
+            'b5442e2b87f39defa6e38793b2fd26c1e0f3610ae02b3d14a4b680e687ca2ccc'
+            'c3c3c0f651da11e3b78cf71399a0d95519e9dc0361e9732adc7f36d60c9e45c1'
+            '561c0ec6fce7f61166097ea7037020b657dc21abb3fbbf136318f0d43940c396'
+            'e80f2dedaf91bd3302c27244451a510ba3a576bb60d6e96a0f3c8ad8bd0fbd68'
+            '0d77c5d3f9e84fa2dff90c5faf32b51b1b19f110a503fa9630cdc5e33bc6d72e'
+            'c49304f8c99bc4213dc62a65f7f8d1089b72c7ec49d8895afaf5d059da7b905f'
+            '3eb93b2fb1b6eb5e6f5d4fff8e75e5b0cfab96503b077c121e4bc405eda08f42'
+            '16cc6c9c49d91e2a6c8c6e53a7305db868f4080affd387ec3d932fa474b5841c'
+            '06fb708234c783bc1aa9e0bf1f9db6f16b3fe62ee8a94300252796de841fd56d'
+            '1ab92232b3a94446c391c822a82aab767f4b1b077c73e839b316473163887ad4'
+            'b174ddca0726fadf191176336f8fbddf18ab95f2967e1e0bebdb8e0425d4223f'
+            '376aebad348858696a4f8ecaf9668cf4b12687ef2213706e768d8aa11a01e631'
+            'f266866a8f01cb95a1d686b1a5ce3ec46ab8fa0ddec268b0e2eb53ddbf53aae3'
+            '91730e65dee6d4a3b1c36e2153c0608e9fb419060ccb57800452895cfe5e08c3'
+            '575c14e7ff04515a934491fcfd0328316f734045a419581b356db9e9dbd69d20'
+            'a1c8251c4d9747fdfb2fa319cbef604bec6f3826ca4b0d2277b3e56b24e1d44a'
+            '40419107bdd48d47c8d5c8cbee3624fd14c32e2daa42993ff08ea9d5eae21d0f'
+            'af7f4c80119c33607d142a591dcf86463796526333a964f7dee5813eab7a2705'
+            '1684c496c58ecff4fc5e21335a96824ee07282479d0d5f7edf52e844264ce76e'
+            'f610d74cffc6c2d089eedde8f31624da25172cc9825a24c085ff6e9c80cb3352'
+            '30decf5cf1c862c183350ac9af71263ecd45a9701d9e85bc765af8e74ddd0df6'
+            '811ad201d74106dea202ce28806dc1eca091139da5a71d2dd8656c592ec721ed'
+            '8a154c511e6e3e35a64338890edbbc2a12d6a7079fff9a14491146a4b66e5b59'
+            'c2a61b245c312b71c043ee274d7beba0daf213d7a6f6ba748c2965e4dc27ff0a')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'