Adapt patches for mingw-w64 Qt 5 packages

* Update patch for static freetype2 in qt5 for brotli library renaming * Update patches for Qt 5 SQL drivers to include crypt32 * This library is required by OpenSSL's crypto library. Not sure why there were no linker errors before.
2024-01-07 21:14:04 +01:00 · 2024-01-07 21:14:04 +01:00 · f98e3bef4b
parent 084636ac44
commit f98e3bef4b
38 changed files with 108 additions and 109 deletions
--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@ -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'
-            '0d3a7d9bc5cf33ae658c08121fa1022f35e23f8c6893905adc5e804fe22e8424'
-            '1a1bc731cadeeca2aa15f5fa7ee3028af0ed573524e2e9465d543244e5d191a2'
-            'd516f67da137597b73e57550370a1ae9ab61d9b508df1904e877c45d40fb89f9'
-            'ac96a111c8e688d3d022464046c9ed26a86051ed522bea4e9f4cc5304ab7f62d'
-            '94fcf59fe0d5f9ef8e243f7535c60a0c2a4da6bef02245ba041055b63aa8865c'
-            '4fd5d561d0ff39f7f507815913ba1f4214100ad13bc19b36c9c404ed0ca1c744'
-            '95366d1549f2962ecd736f0be394a9bbdfd2ed6cc0943db644a15ef6068e0b35'
-            'f6e0fe4d39e0366528b5af90b8382e35527f6be3e0ade891ab2198094da49b50'
-            'f0b1e105934fa5827ded09cbae4cdbc953d6cefdd78b5d5a45ac9c7afa764381'
-            '654833448e8257047df0d2a265d6e83420c89a16deba986a9b671e3f63d875ac'
-            'dc4edf78179b4fad3c4bc0c80ddfa702e8a12bf24897bc3539666ef382532b64'
-            '669aaf2c17b98fe2d7bf398f15ab57a93e160348c9bbebc92cc78c682ad02aab'
-            '30b161914af53569059ad6925583422746a6fe9fad808d6c47368e1f0b4470c7'
-            '13f1135bc73004f76b733cc492bd498366728eb08a2d4569ae2aca7dbdc98921'
-            '1f2551b84862b70f2fc4b6f9d1799dd70ecb390a8036d13275a8cf1d66b30819'
-            '4f9e0b6bde13cc513d2644ac2d269ca40dd79c4eab533877c8b0b3ac390c4d8d'
-            '0a408ccfce3d17f9250fa5c48787c6360815aab020c8dcb85aabe783b006b31a'
-            'cb2290ce99328cc3d8d0719bb4ed592607b44ef673d3e19b158b5da28460cc57'
-            '82b7d6b0055cd36712019699b24d5e96a22527a4698e61c929f17ce252b9e5e0'
-            '359461702bd2b08d5564100c30b7abdecb0e816b70878311c3b3d8d7e45750b5'
-            '1afd01891758f848ccf74000898c2b231f469d87842c1b1186672081469d24b4'
-            '09d751f1e810ac2d8a77022b543774cff5f8f6170113f179e3d0e4eea390a5a1'
-            '4aca829c0f62a2de0ebb441297ef7be55003a87e00b64ff0ea7cf0982caf5ab7'
-            '7f54ed748287927cb7fb2ce80d402cdfe54ac1cbc8b4af0f1e13f50d89b93d08'
-            '4a155467584f365bb08b8cc3f5adb72a04ba12663e478b3f3f01f9e1063e9a57'
-            '351ff1bbb696ecf80fa136ff8a2c5e2accd9940e3694df37ebf563307550302c'
-            '5377d91e26d0106cfd8b26cfae25b826ac0100c5ffa2be580a8210fff59d1924'
-            '799fd36a34fb0ee2c1b9254a6e5960a537a3aa9051a823ae6c67d842857450c8'
-            '07c3edb88c336716152e827f66bbc20e8e6d925efe994811cf57046299bc8691'
-            '7087c054a93f4e22c23d4bf2c0b51ec104aa8d38a3a4d780dc1be8c360efaf4f'
-            '64b13f24a392fff62782afb93d2b361249148739fcbaec8d4aa91412572028e4'
-            'e421c682f4215bbe3383e4ac7b0ea6390d9bee46faf9d25ff7e4959ce890c680')
+            '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'

--- a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,4 +1,4 @@
-From 880f978bd80c8c8580c219294561d1dd071a9ba6 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
--- a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@ -1,4 +1,4 @@
-From 6ad4071d1459380e3f0fdb354533a5ae457fd3d4 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
--- a/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -1,4 +1,4 @@
-From 449f9cc5538d764dfe4c0db10b90163af366802d 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
--- a/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch
@ -1,4 +1,4 @@
-From c559489f863b9dd70af3ac7ea1134868d8d5d2da 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
--- a/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -1,4 +1,4 @@
-From c42233b1c9b2f5fdf181e1c8573b272f4c68a324 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
--- a/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@ -1,4 +1,4 @@
-From e0586e5f9910f90453bb194c6c6f9767556346c1 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
--- a/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch
@ -1,4 +1,4 @@
-From 9c275b709ec89473c0e32e0674f3d3c3160c7db3 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
--- a/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch
@ -1,4 +1,4 @@
-From 81975933efd5ed564f7917812a465732951b5bd8 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
--- a/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -1,4 +1,4 @@
-From e1710406e4ee80e1835738e13097242ce1185bed 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
--- a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch
@ -1,15 +1,14 @@
-From 8277bc09c0c7091a36af8962929b91f90eacee32 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,7 +18,7 @@ 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" },
--- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch
@ -1,4 +1,4 @@
-From b4c415a1f221c7a77e67b894472ce25fa100467a 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 @@
--- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch
@ -1,4 +1,4 @@
-From 6c680a436cdc77427def9c0cea38c318ac1e6c95 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
--- a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 7f681f5ad42f69b7b8c4cdde54388d395201cfcd 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,14 +9,14 @@ 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 },
--- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From a1387ada9374bbc857ef7d21ffa5171355715b1f 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,7 +18,7 @@ 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" }
             ]
--- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch
@ -1,4 +1,4 @@
-From 42c5aece2eaf76c6549d1f7385f3f327d6537d84 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
--- a/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch
@ -1,4 +1,4 @@
-From ac070935d259294b6997aa957c2c5b610791a8ac 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
--- a/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From b15e8c7c60573f0db3f833121bdab3cc4cb0c6f2 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
--- a/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From f56eb3873d1c0dc01f066af87d773f60be71700d 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
--- a/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From 1906fea47adb6438c2b394166dfca0f39fbe1c6d 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
--- a/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From a3e0ad75bf779757045d265a8bef264c1c50ac4c 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
--- a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From b48faee0e6d57d3812d52117973c8eac02ecfdf5 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
--- a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From 466c8ef65fa061ef48d06d28b498181fa7587fed 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
--- a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From 2bd02758a9925b87028aaad70023b895f8114902 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
--- a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From cdb86667ee1f1f420da31134b5e4bbb808828fbc 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
--- a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From 25d9daa1cdb210bd85c30faa0fbae8074c6940af 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
--- a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From a8accc3ed6706727fb65a9fb61edc2d9c1ae531f 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
--- a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From d485b040838ece2d0a5ca5a58e1ddb11a8c400f1 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
--- a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From 86737e878c859ca4452b1d3c1f7e94be5c9007b7 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
--- a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From efa9b173edffa74a258fd3ef8cb2936e762478d4 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
--- a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From 9017f532b1eeff2d57f3ba983f22cc40057b47de 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
--- a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@ -1,4 +1,4 @@
-From 6b05944fb3e923db33a49058a32bb46c83cb4dd8 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'
--- a/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
@ -1,4 +1,4 @@
-From 6c1d85a212305032a4e9e1f079c5e4df686e0520 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
--- a/qt5-base/mingw-w64/PKGBUILD
+++ b/qt5-base/mingw-w64/PKGBUILD
@ -70,38 +70,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'
-            '0d3a7d9bc5cf33ae658c08121fa1022f35e23f8c6893905adc5e804fe22e8424'
-            '1a1bc731cadeeca2aa15f5fa7ee3028af0ed573524e2e9465d543244e5d191a2'
-            'd516f67da137597b73e57550370a1ae9ab61d9b508df1904e877c45d40fb89f9'
-            'ac96a111c8e688d3d022464046c9ed26a86051ed522bea4e9f4cc5304ab7f62d'
-            '94fcf59fe0d5f9ef8e243f7535c60a0c2a4da6bef02245ba041055b63aa8865c'
-            '4fd5d561d0ff39f7f507815913ba1f4214100ad13bc19b36c9c404ed0ca1c744'
-            '95366d1549f2962ecd736f0be394a9bbdfd2ed6cc0943db644a15ef6068e0b35'
-            'f6e0fe4d39e0366528b5af90b8382e35527f6be3e0ade891ab2198094da49b50'
-            'f0b1e105934fa5827ded09cbae4cdbc953d6cefdd78b5d5a45ac9c7afa764381'
-            '654833448e8257047df0d2a265d6e83420c89a16deba986a9b671e3f63d875ac'
-            'dc4edf78179b4fad3c4bc0c80ddfa702e8a12bf24897bc3539666ef382532b64'
-            '669aaf2c17b98fe2d7bf398f15ab57a93e160348c9bbebc92cc78c682ad02aab'
-            '30b161914af53569059ad6925583422746a6fe9fad808d6c47368e1f0b4470c7'
-            '13f1135bc73004f76b733cc492bd498366728eb08a2d4569ae2aca7dbdc98921'
-            '1f2551b84862b70f2fc4b6f9d1799dd70ecb390a8036d13275a8cf1d66b30819'
-            '4f9e0b6bde13cc513d2644ac2d269ca40dd79c4eab533877c8b0b3ac390c4d8d'
-            '0a408ccfce3d17f9250fa5c48787c6360815aab020c8dcb85aabe783b006b31a'
-            'cb2290ce99328cc3d8d0719bb4ed592607b44ef673d3e19b158b5da28460cc57'
-            '82b7d6b0055cd36712019699b24d5e96a22527a4698e61c929f17ce252b9e5e0'
-            '359461702bd2b08d5564100c30b7abdecb0e816b70878311c3b3d8d7e45750b5'
-            '1afd01891758f848ccf74000898c2b231f469d87842c1b1186672081469d24b4'
-            '09d751f1e810ac2d8a77022b543774cff5f8f6170113f179e3d0e4eea390a5a1'
-            '4aca829c0f62a2de0ebb441297ef7be55003a87e00b64ff0ea7cf0982caf5ab7'
-            '7f54ed748287927cb7fb2ce80d402cdfe54ac1cbc8b4af0f1e13f50d89b93d08'
-            '4a155467584f365bb08b8cc3f5adb72a04ba12663e478b3f3f01f9e1063e9a57'
-            '351ff1bbb696ecf80fa136ff8a2c5e2accd9940e3694df37ebf563307550302c'
-            '5377d91e26d0106cfd8b26cfae25b826ac0100c5ffa2be580a8210fff59d1924'
-            '799fd36a34fb0ee2c1b9254a6e5960a537a3aa9051a823ae6c67d842857450c8'
-            '07c3edb88c336716152e827f66bbc20e8e6d925efe994811cf57046299bc8691'
-            '7087c054a93f4e22c23d4bf2c0b51ec104aa8d38a3a4d780dc1be8c360efaf4f'
-            '64b13f24a392fff62782afb93d2b361249148739fcbaec8d4aa91412572028e4'
-            'e421c682f4215bbe3383e4ac7b0ea6390d9bee46faf9d25ff7e4959ce890c680')
+            '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'

--- a/qt5-declarative/mingw-w64-static/PKGBUILD
+++ b/qt5-declarative/mingw-w64-static/PKGBUILD
--- a/qt5-declarative/mingw-w64/PKGBUILD
+++ b/qt5-declarative/mingw-w64/PKGBUILD
--- a/qt5-tools/mingw-w64-static/PKGBUILD
+++ b/qt5-tools/mingw-w64-static/PKGBUILD
--- a/qt5-tools/mingw-w64/PKGBUILD
+++ b/qt5-tools/mingw-w64/PKGBUILD