Fix flags for static PostgreSQL

33 files changed, 113 insertions, 113 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da4bb821a6b0..8955128823a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -65,37 +65,37 @@ pkgbase = mingw-w64-qt5-base-static
 	source = 0030-Fix-linking-against-static-plugins-with-qmake.patch
 	source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
 	sha256sums = d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7
-	sha256sums = 4a57615e58ba06eb42d3723fd18e834cb8e5bd75e43bc855d17b553844490f4b
-	sha256sums = 41bb9278778ea4b8115ce4aa0472435d5499c537fd9dc7d1faf99fed3c25ac07
-	sha256sums = 91bc8d8e8eac2dddec9cac471f058f451d44bb0b8d45b6228b86d6e9de97f0a6
-	sha256sums = 350321acfb5bc2c5e6cc78672728be35f223cbc7b632b389d799bdba9160eab7
-	sha256sums = 5b8287a017d9397ffd1f60865bd8ba758ef340945f62c87ad2aafc9fbeb3b4b2
-	sha256sums = cf2a2b1e9c685592d059009aa8ffa3c834019213575ce7afed57037ea45dda3c
-	sha256sums = d9a11c90f9b0bbf82d1b9f7733b9fab1b33f3ddb4ffd7edf721c692538aa2649
-	sha256sums = d0965fa68ef531dea7e92328912e210cbe678a84b0447ecc86f2c259bd819615
-	sha256sums = 9a23154796e229b0f25994a191cf0eca916d2b2cafd9a1e77915a1157ef02ad2
-	sha256sums = 146648c3dcff2537661b2cef9d092e0c9105deb185cf3d7f367c45c0e46df566
-	sha256sums = ba29f00bec8bfb3467168b824efd729bd942d34c8da6ac3e428bd11f889da646
-	sha256sums = 934998c9cb40896d41ce4e15b50d5705183da6aaca3ad65750b43984ccf12c10
-	sha256sums = ad3f2deb37b057a85a3897a283515c8e2a9336cd3a1d9dbca463b9a74806c4f9
-	sha256sums = e1662059f05f4caa744224fb8cbc02671983dd333227c9499307720e24be9ba1
-	sha256sums = 4fd714fea42b27b763c7af8e1135b6e54b2b46b7d2cc8c71d2798c9c4fafd407
-	sha256sums = dce71cf64d40481a16b08395a5e01aa80938a08e358da18d010add9606da29a8
-	sha256sums = e787db710bd5e3ab77f173d5160fe879b971d3586bc88ed9f94d36d537e805db
-	sha256sums = c75152ebecdeb94e59c9471944fe800805086f98ae6c54392542686aae9ed7c4
-	sha256sums = 1910adf8ddba8b81a6dab9231752bbf0d391419241611ad903441f9d1f968340
-	sha256sums = 6c9d9164b24222ea63e2bb98254dd66a9eb1ad377589a91437f8bccbb149e757
-	sha256sums = 1e587e871fc6b8fbc5e47e73eaa4b8b484823c771d5d2ebc67396730d7deffe7
-	sha256sums = 4f45f035d0c12e30cabcf57058d206458999f09582486f79c485d00f3b57f53b
-	sha256sums = bd659e9867b1ec6c96c9602d9bb022b78a29e87f9690e9190c44a25967ede298
-	sha256sums = 3204a14c839c2e37a46688e93ba0e3f00f32995a6b8fbf53dbff6d7e48040775
-	sha256sums = 6745e3e157d6fb9db2f7147b5ab6cd40eb7ef4654cf0f9e0b59d2f90fc0abbbc
-	sha256sums = 214fa36eccef5a3a1b448ac9c8a2ddc230e3ef21638e424cfeff25d705e45cb9
-	sha256sums = 4d1ab6a03b65dddc2028177699e0cb5278d4a481a10a28690ec2347b3e7fa46e
-	sha256sums = 85c32d151741f2fa42ab5ed16c2c85dd9e2f373dad2c8d09f7a22fbd1e1e3d72
-	sha256sums = 6c163ddc1912544930d9984adcb54b6d50deb7c4a6d5bd26f6dad252748e5b92
-	sha256sums = 73fa679c14c9976923cd9605ab3b838a5bce4f23d3d61f47266915296346a771
-	sha256sums = d006ec483d8d7ab0e42e086f3827e4074b78dad8a098aa98aa90dcfe0e6d300c
+	sha256sums = 4ec86e817e97b84ca883144c1d9637fa624be0049ff44d682be0352ef7fde929
+	sha256sums = a44f778df1981a70211e84e30756c01da58900a88dcc42ec8946ae19ca541520
+	sha256sums = c79cac867cd73c83e6be8c02c36cb95d100199ada1602a448983a8a624bac97a
+	sha256sums = 32c71d398d66629e2d4598135ef70262b7510107a0136d557194aae4871206a2
+	sha256sums = e134748cf88137663fbf6cf00f5b1e2dcd38eeb679546a073ea509099c89b37f
+	sha256sums = f80f903cac3e2544ce4c480d7dff16e7bbb26ffaaee46ce33a70dff1d11d1e71
+	sha256sums = 582053415533f197579becf60b3001988ddf5a9fe16f6aaa31697e619c5f6490
+	sha256sums = bc80a103ddec2b0f726e2118b5a96bb6d5d00fe6ab44d8cd55b4ff27f4ab2db8
+	sha256sums = 99c1b16f3725a6b63fe714efa477bcc27227a9051d52742c682b34ff089e72e2
+	sha256sums = 231916474e098bec7f407a443240e465ca0756ca693ef080e4132d1bafff9bae
+	sha256sums = a577d6efcb138c5a06fb2cc9a2a00451eb34a585047854cef78e2133d5cfedaf
+	sha256sums = 92ec4e8237c84a9756016efba3120ac58a75316bf10727c28f8bb53ec52fba52
+	sha256sums = d6f878b78c1fd285118873c065d1bf82f36a5af532cbe2d34675c5099e8c9733
+	sha256sums = a452bbd2566e805a3cb62c0f76c3e4d375c988f923750a39b2f77ef04b6f1e3f
+	sha256sums = 55aeb64a56ce77848e708ad5330fe04c6b2fb42b1bf2b7bb3be8962500d6f692
+	sha256sums = efdd65bc89dcfab056024faeb1fd20738e08a03eb4e1a742a92a22b92341d34d
+	sha256sums = 8148358ddb7693204c0d0532be54eaca0caa8a21fc05a7b96a5b4fec236bfd6c
+	sha256sums = 6ccf074858de2e5d8aea85df1f86b2f642d9cbe10c93b51e655c8a33469bc4e2
+	sha256sums = 096b7547ce73d396dfc47eca36bbeab06de4447d63f110cb8b83f674f7cbd9f5
+	sha256sums = 481c1764d80a23aea2e4d38c7b86dc5eb432e4f8900d9d8ab1d16f4708351667
+	sha256sums = 1dbd4613645ba8814f61032df5187c6d253cbab16a62f8dc8586d5acc7c73bd2
+	sha256sums = 90a2d46373bf6b5b601a78ac5a2abb2335b3daf98d86ca4528b4cbed50f31a99
+	sha256sums = f0e52e0fc7b69420cc0f7d961eb78f1731d83e3c6908920fb2a3029d6f4037c7
+	sha256sums = 24da08db6f9ecaa66b8c2b408d772530abd92cc89230faac445d27f044f95798
+	sha256sums = 2f29672a98cf65c77a31dd5435e538c5cd036d07be52bbbe56f7fdab989753e2
+	sha256sums = 8c2655008ecd00d0d37da67604de1888b414042d846aebf4569bd7004b5234fd
+	sha256sums = 9cfdb253384e964b9be4aef16ac36f37561e94bb608bbb9bd5549afc1ea5fffa
+	sha256sums = 76810324f7da5958e2fc34f9a4498304f81a0d3f4b0522ace2a0eb55e0f24152
+	sha256sums = e131b2c62e05a182d8e34f878d619673fb2b8047aba76afa31305fbbf1b519a3
+	sha256sums = 635e126785ff8190802cbcf4c2627078c6e556b5aa66f0bed9a6a73eaf9d4a59
+	sha256sums = 414fe06844458684cc300f0a0c653c5b2e8727918179eff7884c9c0ba5ea473e
 
 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 0b9bca52e3b5..f8182ec068e2 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
@@ -163,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644
  
  QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.25.0
+2.25.1
 
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 2b043cf6f8f0..349d12f06c34 100644
--- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.25.0
+2.25.1
 
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 c57dff18a388..a12c3199f251 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
@@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.25.0
+2.25.1
 
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch
index c46d359c2650..f974943ed7f3 100644
--- a/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch
@@ -62,5 +62,5 @@ index 86d10c213c..c1b28a52e9 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.25.0
+2.25.1
 
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 e8eee6e2bb81..cfc95ac3c9a8 100644
--- a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.25.0
+2.25.1
 
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 29efcc8c40de..9af15baf58fa 100644
--- a/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -29,5 +29,5 @@ index f9532e0db9..9c65f21ac0 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch
index 177aee0dcfd4..212436113409 100644
--- a/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/0007-Fix-linking-against-shared-static-libpng.patch
@@ -26,5 +26,5 @@ index 0202f17b21..099c11da95 100644
              ],
              "use": [
 -- 
-2.25.0
+2.25.1
 
diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch
index 61bf7cf5a676..246b41969e1f 100644
--- a/0008-Fix-linking-against-static-D-Bus.patch
+++ b/0008-Fix-linking-against-static-D-Bus.patch
@@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.25.0
+2.25.1
 
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 3156e48a3919..8f41e99797cd 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
@@ -25,5 +25,5 @@ index f7d169f053..846cb678c9 100644
                      },
                      "condition": "config.win32 && features.shared"
 -- 
-2.25.0
+2.25.1
 
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
index 4b6cf4e43cbf..35423bfdefc5 100644
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ b/0010-Fix-linking-against-static-freetype2.patch
@@ -26,5 +26,5 @@ index 099c11da95..872deb3ad3 100644
                  { "libs": "-lfreetype" }
              ],
 -- 
-2.25.0
+2.25.1
 
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch
index d078ef3096aa..68c5df492b8b 100644
--- a/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/0011-Fix-linking-against-static-harfbuzz.patch
@@ -25,5 +25,5 @@ index 872deb3ad3..7daaaa5a11 100644
          },
          "imf": {
 -- 
-2.25.0
+2.25.1
 
diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch
index 0410f124f0d0..a3b179b3f131 100644
--- a/0012-Fix-linking-against-static-pcre.patch
+++ b/0012-Fix-linking-against-static-pcre.patch
@@ -24,5 +24,5 @@ index 67be67c243..0bc4c5157c 100644
  #include <pcre2.h>
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch
index a05f283032c1..ebcd671dbe75 100644
--- a/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0013-Fix-linking-against-shared-static-MariaDB.patch
@@ -22,5 +22,5 @@ index cd20eef1df..babd0465ce 100644
                  { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                  { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.25.0
+2.25.1
 
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
index 505b633ec1e9..c1bc565b64ad 100644
--- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,4 +1,4 @@
-From 44ddb94b2cab4338b0c4c941f5e3f8130a076530 Mon Sep 17 00:00:00 2001
+From d97b57e1de32789a2cdfee280c49b3b8dff31a55 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL
@@ -8,7 +8,7 @@ Subject: [PATCH 14/31] 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 babd0465ce..b4b3bdec6b 100644
+index babd0465ce..37e25881f0 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
 @@ -88,9 +88,9 @@
@@ -18,11 +18,11 @@ index babd0465ce..b4b3bdec6b 100644
 -                { "type": "pkgConfig", "args": "libpq" },
                  { "type": "psqlConfig" },
 -                { "type": "psqlEnv", "libs": "-llibpq -lws2_32 -ladvapi32", "condition": "config.win32" },
-+                { "type": "psqlEnv", "libs": "-lpq -lintl -lssl -lcrypto -lshell32 -lws2_32 -lsecur32 -liconv", "condition": "config.win32 && !features.shared" },
++                { "type": "psqlEnv", "libs": "-lpq -lpgcommon -lpgport -lintl -lssl -lcrypto -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.25.0
+2.25.1
 
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index e4ee2ef05423..1fb948e1254c 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,4 +1,4 @@
-From 27a910a4727d8d33ea9f2f70d572512365dde3e9 Mon Sep 17 00:00:00 2001
+From 8fcc619606cfa41f46f9b605a4752e33c376d5a1 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 15/31] Rename qtmain to qt5main
@@ -70,5 +70,5 @@ index 1f54c846ec..162e7a4b1b 100644
  
  CONFIG += static
 -- 
-2.25.0
+2.25.1
 
diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch
index 60af13a090d6..4ddd04c2e593 100644
--- a/0016-Enable-rpath-for-build-tools.patch
+++ b/0016-Enable-rpath-for-build-tools.patch
@@ -1,4 +1,4 @@
-From be3b19afd1ebff11fa14ddf7d91accd06a35afbe Mon Sep 17 00:00:00 2001
+From 6ca73861aeb489e9e46c8ad051c7afd100d09cc9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 16/31] Enable rpath for build tools
@@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
  INSTALLS += target
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch
index 9feb4242f7f2..851b7e4fceaa 100644
--- a/0017-Use-system-zlib-for-build-tools.patch
+++ b/0017-Use-system-zlib-for-build-tools.patch
@@ -1,4 +1,4 @@
-From e7c872f9a7e09ac30e4ea4b236630df96af1b601 Mon Sep 17 00:00:00 2001
+From eba7f4ccfeb320a5b6a3a458c765ae2e63d38efc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 17/31] Use system zlib for build tools
@@ -23,5 +23,5 @@ index 9863ff5e69..02329611bc 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.25.0
+2.25.1
 
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch
index fd9999428577..8833b9455be1 100644
--- a/0018-Merge-shared-and-static-library-trees.patch
+++ b/0018-Merge-shared-and-static-library-trees.patch
@@ -1,4 +1,4 @@
-From 56291bee2a83d3a267bb1dab7625afd37a17d178 Mon Sep 17 00:00:00 2001
+From 6b5826e9aa80d2daa13cf1e20c01186145a73841 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 18/31] 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.25.0
+2.25.1
 
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch
index 3864595bc497..eba90a8a6cd5 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 9388b61efd236a365cf12218bfc24f2ba7b24e2f Mon Sep 17 00:00:00 2001
+From c48e5bd1dca8cc003d70c9bf4f64b9954375afec Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 19/31] Use *.dll.a as import lib extension
@@ -94,5 +94,5 @@ index c1b28a52e9..3b4372ad05 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.25.0
+2.25.1
 
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 6ff538d10604..0444c851c239 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 987965be28fab78041880dfbede4be209e142b26 Mon Sep 17 00:00:00 2001
+From fbd7da2201a41d429753dd3833e59a867d336497 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules
@@ -484,5 +484,5 @@ index 7b70cfed09..25f2162fe6 100644
 -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\")
 -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\")
 -- 
-2.25.0
+2.25.1
 
diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch
index ea31373ccf8d..130bbd3e19c0 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 5be3611a84819a60ac3cb3ad9dd440b7af07c34f Mon Sep 17 00:00:00 2001
+From 0bda7826502a4c823953ffbd1d9b4f851a61c651 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 21/31] Allow usage of static version with CMake
@@ -1061,5 +1061,5 @@ index 2a575958ae..ca0e3be3b5 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.25.0
+2.25.1
 
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 d4e2c7c4ccaa..a98ba27d4450 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 37aba0f5c23f1f71126e7472ad54ade6885137dc Mon Sep 17 00:00:00 2001
+From de31d365cb6423a2d49a92d4c388d6b0b59c2155 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 22/31] Adjust linker flags for static build with
@@ -25,5 +25,5 @@ index 58d1d5b366..967dc64a19 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.25.0
+2.25.1
 
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index 55c7fcb91908..d44204996f04 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From 623d8969b98de1c286aef4b94d54ddf38dbe6238 Mon Sep 17 00:00:00 2001
+From 543ad4d7a56be3c281cabaaa42115ce8c1ab6858 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 23/31] Use correct pkg-config --static flag
@@ -22,5 +22,5 @@ index 910e59188f..aaa4123f4c 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.25.0
+2.25.1
 
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
index 2aafe2b53a9a..17d26b5e6d51 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 27a3b8f6185d125e39267456483abdde1f53ba44 Mon Sep 17 00:00:00 2001
+From 879dc7704da01c3dd0df17f7575c5d1a395c92b9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic
@@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
            MAIN_DEPENDENCY ${infile} VERBATIM)
          set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.25.0
+2.25.1
 
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index 085d7ec53ac0..1397d6a422e1 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From 4da7840c0167fba67d57c7879291b996b094ca0b Mon Sep 17 00:00:00 2001
+From 9552d093c269e20a62ba18609043eeb2f3a6739f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 25/31] Ignore errors about missing feature static
@@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch
index 470a8cbe466a..9e452fb655cd 100644
--- a/0026-Enable-and-fix-use-of-iconv.patch
+++ b/0026-Enable-and-fix-use-of-iconv.patch
@@ -1,4 +1,4 @@
-From fe813fad22868934acf9f628d28eb9ebc8f1b944 Mon Sep 17 00:00:00 2001
+From 7adbe6e5728f93cbe5c57d12d626b0fd9a1a53d1 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 26/31] Enable and fix use of iconv
@@ -74,5 +74,5 @@ index ae360239c6..5fd57a1a66 100644
          },
          "icu": {
 -- 
-2.25.0
+2.25.1
 
diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch
index 11fff5fb448e..28a8c6c1d9b6 100644
--- a/0027-Ignore-failing-pkg-config-test.patch
+++ b/0027-Ignore-failing-pkg-config-test.patch
@@ -1,4 +1,4 @@
-From 30363a160959be31f59f2b3a07f2a1b0d0295937 Mon Sep 17 00:00:00 2001
+From 5360d8b33d7de6d7176f8d58eccb24e86f1ea27c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 27/31] Ignore failing pkg-config test
@@ -21,5 +21,5 @@ index 846cb678c9..c39adc981f 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.25.0
+2.25.1
 
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 3bb514e1d30d..71677b29b527 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 818b881fa3b76f914565d61c77845bdf4607aa18 Mon Sep 17 00:00:00 2001
+From 9373b1bc70fc28166449e309a5e0c66da9b8cfe9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies
@@ -41,5 +41,5 @@ index 3b4372ad05..cd10225e99 100644
      int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 -- 
-2.25.0
+2.25.1
 
diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch
index 2c599cdb6987..0dccfbcd94b3 100644
--- a/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,4 +1,4 @@
-From 5b7476e45f7ee7d513045582757d0de8874dcf17 Mon Sep 17 00:00:00 2001
+From 5f73a31460be033f22aceb8d20446a7c249d4d67 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 29/31] Hardcode linker flags for platform plugins
@@ -152,5 +152,5 @@ index 50a3bb41a9..285d90c6d3 100644
  include(windows.pri)
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch
index 252d8c70fcbc..2318f61f6d78 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 8138905dc5c2fa0dd00267fd5c8f26c2236d44b4 Mon Sep 17 00:00:00 2001
+From 9edcc83a1b0e2686592a4cbdc6d550105d4fd1ff Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 30/31] Fix linking against static plugins with qmake
@@ -33,5 +33,5 @@ index d6299d8eed..5311748953 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.25.0
+2.25.1
 
diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
index 16208a1a15c7..ccf282a5ba89 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 7a33424a70724ff3a404d4f8a5d537fd6d6b4895 Mon Sep 17 00:00:00 2001
+From f8de051c13a2c97bef20a6b0282f5808498eb9c4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Jun 2019 13:51:02 +0200
 Subject: [PATCH 31/31] 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.25.0
+2.25.1
 
diff --git a/PKGBUILD b/PKGBUILD
index f8e9c4547222..febe2123e1f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -87,37 +87,37 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0030-Fix-linking-against-static-plugins-with-qmake.patch'
         '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
 sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
-            '4a57615e58ba06eb42d3723fd18e834cb8e5bd75e43bc855d17b553844490f4b'
-            '41bb9278778ea4b8115ce4aa0472435d5499c537fd9dc7d1faf99fed3c25ac07'
-            '91bc8d8e8eac2dddec9cac471f058f451d44bb0b8d45b6228b86d6e9de97f0a6'
-            '350321acfb5bc2c5e6cc78672728be35f223cbc7b632b389d799bdba9160eab7'
-            '5b8287a017d9397ffd1f60865bd8ba758ef340945f62c87ad2aafc9fbeb3b4b2'
-            'cf2a2b1e9c685592d059009aa8ffa3c834019213575ce7afed57037ea45dda3c'
-            'd9a11c90f9b0bbf82d1b9f7733b9fab1b33f3ddb4ffd7edf721c692538aa2649'
-            'd0965fa68ef531dea7e92328912e210cbe678a84b0447ecc86f2c259bd819615'
-            '9a23154796e229b0f25994a191cf0eca916d2b2cafd9a1e77915a1157ef02ad2'
-            '146648c3dcff2537661b2cef9d092e0c9105deb185cf3d7f367c45c0e46df566'
-            'ba29f00bec8bfb3467168b824efd729bd942d34c8da6ac3e428bd11f889da646'
-            '934998c9cb40896d41ce4e15b50d5705183da6aaca3ad65750b43984ccf12c10'
-            'ad3f2deb37b057a85a3897a283515c8e2a9336cd3a1d9dbca463b9a74806c4f9'
-            'e1662059f05f4caa744224fb8cbc02671983dd333227c9499307720e24be9ba1'
-            '4fd714fea42b27b763c7af8e1135b6e54b2b46b7d2cc8c71d2798c9c4fafd407'
-            'dce71cf64d40481a16b08395a5e01aa80938a08e358da18d010add9606da29a8'
-            'e787db710bd5e3ab77f173d5160fe879b971d3586bc88ed9f94d36d537e805db'
-            'c75152ebecdeb94e59c9471944fe800805086f98ae6c54392542686aae9ed7c4'
-            '1910adf8ddba8b81a6dab9231752bbf0d391419241611ad903441f9d1f968340'
-            '6c9d9164b24222ea63e2bb98254dd66a9eb1ad377589a91437f8bccbb149e757'
-            '1e587e871fc6b8fbc5e47e73eaa4b8b484823c771d5d2ebc67396730d7deffe7'
-            '4f45f035d0c12e30cabcf57058d206458999f09582486f79c485d00f3b57f53b'
-            'bd659e9867b1ec6c96c9602d9bb022b78a29e87f9690e9190c44a25967ede298'
-            '3204a14c839c2e37a46688e93ba0e3f00f32995a6b8fbf53dbff6d7e48040775'
-            '6745e3e157d6fb9db2f7147b5ab6cd40eb7ef4654cf0f9e0b59d2f90fc0abbbc'
-            '214fa36eccef5a3a1b448ac9c8a2ddc230e3ef21638e424cfeff25d705e45cb9'
-            '4d1ab6a03b65dddc2028177699e0cb5278d4a481a10a28690ec2347b3e7fa46e'
-            '85c32d151741f2fa42ab5ed16c2c85dd9e2f373dad2c8d09f7a22fbd1e1e3d72'
-            '6c163ddc1912544930d9984adcb54b6d50deb7c4a6d5bd26f6dad252748e5b92'
-            '73fa679c14c9976923cd9605ab3b838a5bce4f23d3d61f47266915296346a771'
-            'd006ec483d8d7ab0e42e086f3827e4074b78dad8a098aa98aa90dcfe0e6d300c')
+            '4ec86e817e97b84ca883144c1d9637fa624be0049ff44d682be0352ef7fde929'
+            'a44f778df1981a70211e84e30756c01da58900a88dcc42ec8946ae19ca541520'
+            'c79cac867cd73c83e6be8c02c36cb95d100199ada1602a448983a8a624bac97a'
+            '32c71d398d66629e2d4598135ef70262b7510107a0136d557194aae4871206a2'
+            'e134748cf88137663fbf6cf00f5b1e2dcd38eeb679546a073ea509099c89b37f'
+            'f80f903cac3e2544ce4c480d7dff16e7bbb26ffaaee46ce33a70dff1d11d1e71'
+            '582053415533f197579becf60b3001988ddf5a9fe16f6aaa31697e619c5f6490'
+            'bc80a103ddec2b0f726e2118b5a96bb6d5d00fe6ab44d8cd55b4ff27f4ab2db8'
+            '99c1b16f3725a6b63fe714efa477bcc27227a9051d52742c682b34ff089e72e2'
+            '231916474e098bec7f407a443240e465ca0756ca693ef080e4132d1bafff9bae'
+            'a577d6efcb138c5a06fb2cc9a2a00451eb34a585047854cef78e2133d5cfedaf'
+            '92ec4e8237c84a9756016efba3120ac58a75316bf10727c28f8bb53ec52fba52'
+            'd6f878b78c1fd285118873c065d1bf82f36a5af532cbe2d34675c5099e8c9733'
+            'a452bbd2566e805a3cb62c0f76c3e4d375c988f923750a39b2f77ef04b6f1e3f'
+            '55aeb64a56ce77848e708ad5330fe04c6b2fb42b1bf2b7bb3be8962500d6f692'
+            'efdd65bc89dcfab056024faeb1fd20738e08a03eb4e1a742a92a22b92341d34d'
+            '8148358ddb7693204c0d0532be54eaca0caa8a21fc05a7b96a5b4fec236bfd6c'
+            '6ccf074858de2e5d8aea85df1f86b2f642d9cbe10c93b51e655c8a33469bc4e2'
+            '096b7547ce73d396dfc47eca36bbeab06de4447d63f110cb8b83f674f7cbd9f5'
+            '481c1764d80a23aea2e4d38c7b86dc5eb432e4f8900d9d8ab1d16f4708351667'
+            '1dbd4613645ba8814f61032df5187c6d253cbab16a62f8dc8586d5acc7c73bd2'
+            '90a2d46373bf6b5b601a78ac5a2abb2335b3daf98d86ca4528b4cbed50f31a99'
+            'f0e52e0fc7b69420cc0f7d961eb78f1731d83e3c6908920fb2a3029d6f4037c7'
+            '24da08db6f9ecaa66b8c2b408d772530abd92cc89230faac445d27f044f95798'
+            '2f29672a98cf65c77a31dd5435e538c5cd036d07be52bbbe56f7fdab989753e2'
+            '8c2655008ecd00d0d37da67604de1888b414042d846aebf4569bd7004b5234fd'
+            '9cfdb253384e964b9be4aef16ac36f37561e94bb608bbb9bd5549afc1ea5fffa'
+            '76810324f7da5958e2fc34f9a4498304f81a0d3f4b0522ace2a0eb55e0f24152'
+            'e131b2c62e05a182d8e34f878d619673fb2b8047aba76afa31305fbbf1b519a3'
+            '635e126785ff8190802cbcf4c2627078c6e556b5aa66f0bed9a6a73eaf9d4a59'
+            '414fe06844458684cc300f0a0c653c5b2e8727918179eff7884c9c0ba5ea473e')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'