Rebuild mingw-w64-qt5-base* against updated mingw-w64-mariadb-connector-c

2020-04-17 22:24:39 +02:00 · 2020-04-17 22:24:39 +02:00 · abc84a158f
parent f5bd9d2ae9
commit abc84a158f
130 changed files with 345 additions and 341 deletions
--- a/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep
@ -29,7 +29,7 @@
 _qt_module=qt<%== $qt_module %>
 pkgname=<%= $package_name %>
 pkgver=5.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform application and UI framework, <%= $opengl_backend %> OpenGL backend (mingw-w64)'
 % if ($is_static) {
 arch=('any')
--- a/devel/qt5/update-patches.sh
+++ b/devel/qt5/update-patches.sh
@ -88,6 +88,10 @@ if ! git checkout "${branch}"; then
    exit 0
 fi
 git format-patch "origin/${pkgver}" --output-directory "$dest"
+for other_variant_dir in "$dest/../$variant"?*; do
+    [[ -d $other_variant_dir ]] || continue
+    cp --target-directory="$other_variant_dir" "$dest/"*.patch
+done
 popd > /dev/null

 # skip if building all Qt modules in one package (currently used for Android target)
--- a/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64-angle/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64-angle/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-angle/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-angle/0004-Make-sure-.pc-files-are-installed-correctly.patch
@ -62,5 +62,5 @@ index 3ec2704625..f33edb5bd9 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-angle/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-angle/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-angle/0007-Fix-linking-against-shared-static-libpng.patch
@ -26,5 +26,5 @@ index 0202f17b21..099c11da95 100644
             ],
             "use": [
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-static-D-Bus.patch
@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-angle/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -25,5 +25,5 @@ index 147cf9eb00..a481e54b8d 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch
@ -26,5 +26,5 @@ index 099c11da95..872deb3ad3 100644
                 { "libs": "-lfreetype" }
             ],
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch
@ -25,5 +25,5 @@ index 872deb3ad3..7daaaa5a11 100644
         },
         "imf": {
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch
@ -24,5 +24,5 @@ index 59d21e0a23..518f91d753 100644
 #include <pcre2.h>
 
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 2852ac7e9e087b8374daa044dba1885d5c2bbac5 Mon Sep 17 00:00:00 2001
+From 99c6804513dc0dc010fa00108914ff7e865c9ae7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 13/31] 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 cd20eef1df..babd0465ce 100644
+index cd20eef1df..9c8475439f 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 -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
+                { "libs": "-lmariadbclient -lssl -lcrypto -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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 5f3fb54d36009c5eced4335e79437b5d8eecdf08 Mon Sep 17 00:00:00 2001
+From 718ed1a58165a785123450d2e00ceaef0d1121e5 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..37e25881f0 100644
+index 9c8475439f..478c669e88 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
@@ -88,9 +88,9 @@
@ -24,5 +24,5 @@ index babd0465ce..37e25881f0 100644
             ]
         },
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch
@ -1,4 +1,4 @@
-From d61af2077d70356fc0f69aeb27e82bed66f8d52e Mon Sep 17 00:00:00 2001
+From 1bbc646bd5ceb497aba73d8fc77214bf29d34f48 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
@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
 
 CONFIG += static
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0016-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-angle/0016-Enable-rpath-for-build-tools.patch
@ -1,4 +1,4 @@
-From f24d3dd8face31fb7b522ca383b8515ba2913911 Mon Sep 17 00:00:00 2001
+From d8faa947bfaa0a4d7e0a4e861904773dd7479938 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0017-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-angle/0017-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From 3b9033c42d77fba36734f8268f042e2c0154c2b5 Mon Sep 17 00:00:00 2001
+From cd29a4171cddcae9ad0e6367ea7de43fc6507e02 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0018-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-angle/0018-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From 5756d20ee409d114a355bd07051311757af46fa4 Mon Sep 17 00:00:00 2001
+From 7cfd69a804680ba04a89bc921f5e35a5add12fd4 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-angle/0019-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From e21df21893a3071ea5908c9cc19becda0287a231 Mon Sep 17 00:00:00 2001
+From 6d6041eed5ab64b15648c60a378a46976481161c 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 f33edb5bd9..3a75986257 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-angle/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From 181461364ddf790c194108c4d6130cdd117c3a0a Mon Sep 17 00:00:00 2001
+From 13269a57b3bd20b86c50d0bd8b4e9fb2dc771601 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-angle/0021-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From f92560dca3a5ade9c23dc6f5cf84ec0ab6404080 Mon Sep 17 00:00:00 2001
+From 3401a7615a3a3639a5fd9568e1d5f594952462ea 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
@ -1049,5 +1049,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-angle/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From d214392ab20e45037c817c0150c5086993358e9f Mon Sep 17 00:00:00 2001
+From 089d8ff8c8306acdfa6c9c96c41498b2e5771be6 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From 58af82ed3fefd7b230341376c20dc8be84c913a3 Mon Sep 17 00:00:00 2001
+From ce7fd8296fa3e9a7438b93c8f76fa821e6a4024a 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From b14162daa442d61ba3747a68aff6b0a33677e606 Mon Sep 17 00:00:00 2001
+From 7a3de1e7695a79bde92ed2bb58eaf0c04ade9e7e 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From b01de5ed0031d69b552b980214d4bfe6ce8ee52d Mon Sep 17 00:00:00 2001
+From 2bdc5cdeae34bd597089e931b69f44479caf841e 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From e2636a2a9b11a10ba86ce55a11d29623feca0c28 Mon Sep 17 00:00:00 2001
+From 49f3d67d12980ba69d8cd8e3a44bc0479916fb4e 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From 8aad5efe320b053525a8cdcf5dd498c349cd5050 Mon Sep 17 00:00:00 2001
+From e4ced51f891bf9c754725b1ea2558b4904a9b4ce 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 a481e54b8d..34cac288a7 100644
                 "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-angle/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From 90787e1baa580ced40a79a20c8624ecdeee3aad4 Mon Sep 17 00:00:00 2001
+From 0104780784ba1a49d5f034a95ba00743915c82b1 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 3a75986257..34e7776e44 100644
     int libidx = 0;
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From 437223bd0628fc9f1081dc332412007df267e3fd Mon Sep 17 00:00:00 2001
+From f96561bfde665a530525fb9cd0091525774de43c 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-angle/0030-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From 3888a84625dae5abbf387498fe5f39166eab17e4 Mon Sep 17 00:00:00 2001
+From 9e55df2614a99e6fce2460ea3f32c1039bc9f0e6 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/qt5-base/mingw-w64-angle/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@ -1,4 +1,4 @@
-From 68a2b716616ba060e856840cebb5601c61d60773 Mon Sep 17 00:00:00 2001
+From 20363801bd57755feb7ff76e6dd2103e6e946869 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-angle/PKGBUILD
+++ b/qt5-base/mingw-w64-angle/PKGBUILD
@ -16,7 +16,7 @@
 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base-angle
 pkgver=5.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform application and UI framework, ANGLE OpenGL backend (mingw-w64)'
 arch=('i686' 'x86_64')
 url='https://www.qt.io/'
@ -69,37 +69,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=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'c758e9ec290052a3ea029f40e5d5cfaadd2135ad7841366393449a4c71d84a88'
-            'a0280ed9dd31b2cdffa1c7ae25f9a6cb3a4164c76b7fa07c4e2eaa8cc01e6762'
-            '9a3c591e2645997a94d30687adfc08f1ea7f64597fef78c777ed7137071de02f'
-            '1d7fe2ef6be292e9ec84f313e4ba543f1b368a1ee0915f858d54615be93cf794'
-            '3099b7210a873ee12374d452fb98204d046a2d5c6b1a330d32d45ae59c95cd86'
-            'c2a8f4a7536ad0293bdab882d01e0055bc7d4a3e97794f7c304d01d1daa24bf7'
-            '3b7e90637b3a0671fac0f8607d613bf0f3f9a73cc62e43848049125c7a925a52'
-            '2e08efe5160c91899ac549303f888c5872e1d198068c5a00c3a34d7040f5410f'
-            '82764b7047b65a262f7c49305dee6579171a5e179fa85f8801d121e03937576e'
-            '27dd7df0721e8d4d3f4f4c30c8e9ca8793f50a04f983b3489ff1227aae996f43'
-            '4f0754277a14bdd8682b5d3701871f8901d2dd9f00ef8318bf6d62e9d4a26171'
-            'd4b3fb742c973119d1c98a34063fcc29861fa6325481a8baf5dfac13c32db597'
-            'd70ce95ddaa3dac7bdf273c3a8926df6b41771d75f17c68e205a1b9bb80a77e1'
-            '0366353ce1e4da4e800be55b457d649b0c3e6ba83a2d53dc8c6e3e08dd82637f'
-            '4632228567fd25ffb75de6750120c0ceea1d2c4ce2e91ef214a39b54ee7b56fc'
-            'ab79617e34dbc8bcefb63f0ff59a3efc5da2d313284aa3e690f8c6025a9cb090'
-            'b4f68710feda5c11dc2c3b4fdc755bb2186599046a8443c6f61ff9d369357193'
-            'a4656c1d3ec12ad50b2c92382775619d435e49a392bb08be5cbc8a654248f3dd'
-            '36e3520481ef8d58e7595195c0eb230df80034590c27622836a38199abf7721c'
-            '640ac515c0453def45cdaf2d5813d1ae95ce953014aeacb78cb1747fa2c0da3e'
-            '612b95a477b9956e61ac1557c0e885a7dd2ae0aa56ef69e29116cafcbc7b0d50'
-            '2bfb7e8400b0e14b5e8c14413d67b9fa437fe920fa9ffc458f769ea22b2bed29'
-            '26473b4a55ce4b764354ff54b40a6dcc6d93aea41b7175afeb1a030cb118f3a8'
-            '98058d1696ff05af14d10017062d697839736cf8cfef94ac77d6cefb6c46f311'
-            '30d2cf6c309c4922ebc4a5822aab76161950f7036666dc18489da22315ef214d'
-            '692c3e1679aa82c6aa395d75a06f02f0d1a0b05230197ef19fe4ef7c7b3b888e'
-            'c285e9900a63d67a01accd6d7a798c5f2476e90f3d8ea8ffb0f272d90d942141'
-            'fbd28eeed43e451240c52582f675e5f5ba069450ee20488bf993b33e76e8275c'
-            '1709f452c4986f6b7366412bc906b52e4a01d412e20d3fda561b7fa090ed8890'
-            '245af9755b5637200ea1d678e0ac1a493ed0fbcb9c25dc2a79c0a5e3c007a19a'
-            '810255e443f940b57e90f4934e4317c050d3edf3593cd0a30c1e2b5a35cf7f68')
+            '14affce3bf8d6a2d2682e0cc7113a62fe851a62fcd5a76539acfe1f4b0c9ea4b'
+            '96d750723b2e44fdb78520ebb369111391850554b55a4cb1c0a57299b97579fd'
+            '4daa7399d1b8523cdf1446e2e4e3cefeaf8a1b14a467f808c3fda9e8e8516965'
+            'ef4d333e7f0aa5bcfe1b4f67bf687f5ea2c9698189a0d001080783829c1b85bf'
+            '54fcf347fe0355306b7ba122ff461c1153919908f89b1306ea50f4f8cf8c69f0'
+            'e55dc7743472c72e58bf0ae780ca0a029670f075538a5c7c5658fe6742476985'
+            'a5f5a87fc80182aeff9ea463c675243b91da432e02d0ca1e8d3b6f9f77013e4b'
+            '1fbf437012eca9276178180a2cb15b6b0296553ca9304ae258b1cce6aed15bc0'
+            '9a1d2f0f2059beeb70236e2f7ecbb2ef15e50644cb6a909a125306f067b3293f'
+            '701bff16f7ad0809dbb61806c050d0742df10e125c24a841db8712e6146d6235'
+            'dfba051c3fec6a77bcd07ebcd4d5e077d7b6fc7ae5291d0680820ac0cc320f2d'
+            '8cc25ac98e8bff73fc980e4afc9e774569218145d2123808e14fe5d8649fe0d0'
+            '8c0709d32c38a226116126ecf4d7fc71944fe3d6a42b8b5a27351e824ed445eb'
+            'dfd12ab7e72b9721d16f902e97fe1c3379d20ae52633610c56d10bcb5e294395'
+            '66c4cf8d218ee5582d6cf8836ed9916502e6ac5d4b77c46ee122460bb98f515d'
+            'a5667634a5940620ca71cdc77c6e1ab656891c308d5053c25736e994ea4c78e0'
+            'd82a344682f1290dfbc174ccdf35bbdeb4cf9f5418d3bfc664491451bb7a8229'
+            'd10bbf540f58388557e5f39c447cff09ff1ddb733ea18f3d8678a308c478dbec'
+            '8691b0a628c04e624d8d98680cb54814a46cd9af67168155a1c46bc9ecd5eafe'
+            'a75a275232484eb616942731052552764348654b413225a334082635558def39'
+            '4b8ceafdf29b045bcc3633c3b2f5682f925b9c79a73c738336e8c795201cbca0'
+            '065ffac8cc7835f941fbbf355aa1ba63c1203c0491672ce7f99576198c0ee3eb'
+            '567f9e136382f7373fd898d7699acc198767d2d5fa93375391826125aa7f7196'
+            '389697028d0a704caffa06e47d70d9c2c3cd852616d5a4cad6e6482d5e3e7ff2'
+            '90898fd84a95b03298d1eaa136459cd65b50957593e1e02a0c02be660097ddb1'
+            'a4681e107f97cc802c1dc975c3118c492256e7baf398598061c7ae5ed3e1d65e'
+            'e22cb9b06d182145433f4bbf7200273a009d62676570f476268ab8db2c23e36b'
+            'eb409f1146c39f19d43fe71c103f40ec6c37d0760cae333f05146ca7e61b47b2'
+            '8ee993247e7240947e5e8a549407ebbda2fa9e73c8310b41caff7da767012a6c'
+            '03cb0da4cfe2315c4d8fc845e6a758f3ef6fc51883f993b3bf600653ab342579'
+            '745e15a29bea515c0d65ddad01851e06c8ece5f1f18a0df871f09d5db55057fb')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64-dynamic/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64-dynamic/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-dynamic/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-dynamic/0004-Make-sure-.pc-files-are-installed-correctly.patch
@ -62,5 +62,5 @@ index 3ec2704625..f33edb5bd9 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-dynamic/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-dynamic/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-dynamic/0007-Fix-linking-against-shared-static-libpng.patch
@ -26,5 +26,5 @@ index 0202f17b21..099c11da95 100644
             ],
             "use": [
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-static-D-Bus.patch
@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-dynamic/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -25,5 +25,5 @@ index 147cf9eb00..a481e54b8d 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch
@ -26,5 +26,5 @@ index 099c11da95..872deb3ad3 100644
                 { "libs": "-lfreetype" }
             ],
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch
@ -25,5 +25,5 @@ index 872deb3ad3..7daaaa5a11 100644
         },
         "imf": {
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch
@ -24,5 +24,5 @@ index 59d21e0a23..518f91d753 100644
 #include <pcre2.h>
 
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 2852ac7e9e087b8374daa044dba1885d5c2bbac5 Mon Sep 17 00:00:00 2001
+From 99c6804513dc0dc010fa00108914ff7e865c9ae7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 13/31] 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 cd20eef1df..babd0465ce 100644
+index cd20eef1df..9c8475439f 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 -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
+                { "libs": "-lmariadbclient -lssl -lcrypto -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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 5f3fb54d36009c5eced4335e79437b5d8eecdf08 Mon Sep 17 00:00:00 2001
+From 718ed1a58165a785123450d2e00ceaef0d1121e5 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..37e25881f0 100644
+index 9c8475439f..478c669e88 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
@@ -88,9 +88,9 @@
@ -24,5 +24,5 @@ index babd0465ce..37e25881f0 100644
             ]
         },
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch
@ -1,4 +1,4 @@
-From d61af2077d70356fc0f69aeb27e82bed66f8d52e Mon Sep 17 00:00:00 2001
+From 1bbc646bd5ceb497aba73d8fc77214bf29d34f48 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
@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
 
 CONFIG += static
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0016-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-dynamic/0016-Enable-rpath-for-build-tools.patch
@ -1,4 +1,4 @@
-From f24d3dd8face31fb7b522ca383b8515ba2913911 Mon Sep 17 00:00:00 2001
+From d8faa947bfaa0a4d7e0a4e861904773dd7479938 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0017-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-dynamic/0017-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From 3b9033c42d77fba36734f8268f042e2c0154c2b5 Mon Sep 17 00:00:00 2001
+From cd29a4171cddcae9ad0e6367ea7de43fc6507e02 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0018-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-dynamic/0018-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From 5756d20ee409d114a355bd07051311757af46fa4 Mon Sep 17 00:00:00 2001
+From 7cfd69a804680ba04a89bc921f5e35a5add12fd4 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-dynamic/0019-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From e21df21893a3071ea5908c9cc19becda0287a231 Mon Sep 17 00:00:00 2001
+From 6d6041eed5ab64b15648c60a378a46976481161c 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 f33edb5bd9..3a75986257 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-dynamic/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From 181461364ddf790c194108c4d6130cdd117c3a0a Mon Sep 17 00:00:00 2001
+From 13269a57b3bd20b86c50d0bd8b4e9fb2dc771601 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-dynamic/0021-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From f92560dca3a5ade9c23dc6f5cf84ec0ab6404080 Mon Sep 17 00:00:00 2001
+From 3401a7615a3a3639a5fd9568e1d5f594952462ea 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
@ -1049,5 +1049,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-dynamic/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From d214392ab20e45037c817c0150c5086993358e9f Mon Sep 17 00:00:00 2001
+From 089d8ff8c8306acdfa6c9c96c41498b2e5771be6 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From 58af82ed3fefd7b230341376c20dc8be84c913a3 Mon Sep 17 00:00:00 2001
+From ce7fd8296fa3e9a7438b93c8f76fa821e6a4024a 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From b14162daa442d61ba3747a68aff6b0a33677e606 Mon Sep 17 00:00:00 2001
+From 7a3de1e7695a79bde92ed2bb58eaf0c04ade9e7e 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From b01de5ed0031d69b552b980214d4bfe6ce8ee52d Mon Sep 17 00:00:00 2001
+From 2bdc5cdeae34bd597089e931b69f44479caf841e 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From e2636a2a9b11a10ba86ce55a11d29623feca0c28 Mon Sep 17 00:00:00 2001
+From 49f3d67d12980ba69d8cd8e3a44bc0479916fb4e 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From 8aad5efe320b053525a8cdcf5dd498c349cd5050 Mon Sep 17 00:00:00 2001
+From e4ced51f891bf9c754725b1ea2558b4904a9b4ce 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 a481e54b8d..34cac288a7 100644
                 "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-dynamic/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From 90787e1baa580ced40a79a20c8624ecdeee3aad4 Mon Sep 17 00:00:00 2001
+From 0104780784ba1a49d5f034a95ba00743915c82b1 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 3a75986257..34e7776e44 100644
     int libidx = 0;
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From 437223bd0628fc9f1081dc332412007df267e3fd Mon Sep 17 00:00:00 2001
+From f96561bfde665a530525fb9cd0091525774de43c 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-dynamic/0030-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From 3888a84625dae5abbf387498fe5f39166eab17e4 Mon Sep 17 00:00:00 2001
+From 9e55df2614a99e6fce2460ea3f32c1039bc9f0e6 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/qt5-base/mingw-w64-dynamic/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@ -1,4 +1,4 @@
-From 68a2b716616ba060e856840cebb5601c61d60773 Mon Sep 17 00:00:00 2001
+From 20363801bd57755feb7ff76e6dd2103e6e946869 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-dynamic/PKGBUILD
+++ b/qt5-base/mingw-w64-dynamic/PKGBUILD
@ -16,7 +16,7 @@
 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base-dynamic
 pkgver=5.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform application and UI framework, dynamic OpenGL backend (mingw-w64)'
 arch=('i686' 'x86_64')
 url='https://www.qt.io/'
@ -69,37 +69,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=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'c758e9ec290052a3ea029f40e5d5cfaadd2135ad7841366393449a4c71d84a88'
-            'a0280ed9dd31b2cdffa1c7ae25f9a6cb3a4164c76b7fa07c4e2eaa8cc01e6762'
-            '9a3c591e2645997a94d30687adfc08f1ea7f64597fef78c777ed7137071de02f'
-            '1d7fe2ef6be292e9ec84f313e4ba543f1b368a1ee0915f858d54615be93cf794'
-            '3099b7210a873ee12374d452fb98204d046a2d5c6b1a330d32d45ae59c95cd86'
-            'c2a8f4a7536ad0293bdab882d01e0055bc7d4a3e97794f7c304d01d1daa24bf7'
-            '3b7e90637b3a0671fac0f8607d613bf0f3f9a73cc62e43848049125c7a925a52'
-            '2e08efe5160c91899ac549303f888c5872e1d198068c5a00c3a34d7040f5410f'
-            '82764b7047b65a262f7c49305dee6579171a5e179fa85f8801d121e03937576e'
-            '27dd7df0721e8d4d3f4f4c30c8e9ca8793f50a04f983b3489ff1227aae996f43'
-            '4f0754277a14bdd8682b5d3701871f8901d2dd9f00ef8318bf6d62e9d4a26171'
-            'd4b3fb742c973119d1c98a34063fcc29861fa6325481a8baf5dfac13c32db597'
-            'd70ce95ddaa3dac7bdf273c3a8926df6b41771d75f17c68e205a1b9bb80a77e1'
-            '0366353ce1e4da4e800be55b457d649b0c3e6ba83a2d53dc8c6e3e08dd82637f'
-            '4632228567fd25ffb75de6750120c0ceea1d2c4ce2e91ef214a39b54ee7b56fc'
-            'ab79617e34dbc8bcefb63f0ff59a3efc5da2d313284aa3e690f8c6025a9cb090'
-            'b4f68710feda5c11dc2c3b4fdc755bb2186599046a8443c6f61ff9d369357193'
-            'a4656c1d3ec12ad50b2c92382775619d435e49a392bb08be5cbc8a654248f3dd'
-            '36e3520481ef8d58e7595195c0eb230df80034590c27622836a38199abf7721c'
-            '640ac515c0453def45cdaf2d5813d1ae95ce953014aeacb78cb1747fa2c0da3e'
-            '612b95a477b9956e61ac1557c0e885a7dd2ae0aa56ef69e29116cafcbc7b0d50'
-            '2bfb7e8400b0e14b5e8c14413d67b9fa437fe920fa9ffc458f769ea22b2bed29'
-            '26473b4a55ce4b764354ff54b40a6dcc6d93aea41b7175afeb1a030cb118f3a8'
-            '98058d1696ff05af14d10017062d697839736cf8cfef94ac77d6cefb6c46f311'
-            '30d2cf6c309c4922ebc4a5822aab76161950f7036666dc18489da22315ef214d'
-            '692c3e1679aa82c6aa395d75a06f02f0d1a0b05230197ef19fe4ef7c7b3b888e'
-            'c285e9900a63d67a01accd6d7a798c5f2476e90f3d8ea8ffb0f272d90d942141'
-            'fbd28eeed43e451240c52582f675e5f5ba069450ee20488bf993b33e76e8275c'
-            '1709f452c4986f6b7366412bc906b52e4a01d412e20d3fda561b7fa090ed8890'
-            '245af9755b5637200ea1d678e0ac1a493ed0fbcb9c25dc2a79c0a5e3c007a19a'
-            '810255e443f940b57e90f4934e4317c050d3edf3593cd0a30c1e2b5a35cf7f68')
+            '14affce3bf8d6a2d2682e0cc7113a62fe851a62fcd5a76539acfe1f4b0c9ea4b'
+            '96d750723b2e44fdb78520ebb369111391850554b55a4cb1c0a57299b97579fd'
+            '4daa7399d1b8523cdf1446e2e4e3cefeaf8a1b14a467f808c3fda9e8e8516965'
+            'ef4d333e7f0aa5bcfe1b4f67bf687f5ea2c9698189a0d001080783829c1b85bf'
+            '54fcf347fe0355306b7ba122ff461c1153919908f89b1306ea50f4f8cf8c69f0'
+            'e55dc7743472c72e58bf0ae780ca0a029670f075538a5c7c5658fe6742476985'
+            'a5f5a87fc80182aeff9ea463c675243b91da432e02d0ca1e8d3b6f9f77013e4b'
+            '1fbf437012eca9276178180a2cb15b6b0296553ca9304ae258b1cce6aed15bc0'
+            '9a1d2f0f2059beeb70236e2f7ecbb2ef15e50644cb6a909a125306f067b3293f'
+            '701bff16f7ad0809dbb61806c050d0742df10e125c24a841db8712e6146d6235'
+            'dfba051c3fec6a77bcd07ebcd4d5e077d7b6fc7ae5291d0680820ac0cc320f2d'
+            '8cc25ac98e8bff73fc980e4afc9e774569218145d2123808e14fe5d8649fe0d0'
+            '8c0709d32c38a226116126ecf4d7fc71944fe3d6a42b8b5a27351e824ed445eb'
+            'dfd12ab7e72b9721d16f902e97fe1c3379d20ae52633610c56d10bcb5e294395'
+            '66c4cf8d218ee5582d6cf8836ed9916502e6ac5d4b77c46ee122460bb98f515d'
+            'a5667634a5940620ca71cdc77c6e1ab656891c308d5053c25736e994ea4c78e0'
+            'd82a344682f1290dfbc174ccdf35bbdeb4cf9f5418d3bfc664491451bb7a8229'
+            'd10bbf540f58388557e5f39c447cff09ff1ddb733ea18f3d8678a308c478dbec'
+            '8691b0a628c04e624d8d98680cb54814a46cd9af67168155a1c46bc9ecd5eafe'
+            'a75a275232484eb616942731052552764348654b413225a334082635558def39'
+            '4b8ceafdf29b045bcc3633c3b2f5682f925b9c79a73c738336e8c795201cbca0'
+            '065ffac8cc7835f941fbbf355aa1ba63c1203c0491672ce7f99576198c0ee3eb'
+            '567f9e136382f7373fd898d7699acc198767d2d5fa93375391826125aa7f7196'
+            '389697028d0a704caffa06e47d70d9c2c3cd852616d5a4cad6e6482d5e3e7ff2'
+            '90898fd84a95b03298d1eaa136459cd65b50957593e1e02a0c02be660097ddb1'
+            'a4681e107f97cc802c1dc975c3118c492256e7baf398598061c7ae5ed3e1d65e'
+            'e22cb9b06d182145433f4bbf7200273a009d62676570f476268ab8db2c23e36b'
+            'eb409f1146c39f19d43fe71c103f40ec6c37d0760cae333f05146ca7e61b47b2'
+            '8ee993247e7240947e5e8a549407ebbda2fa9e73c8310b41caff7da767012a6c'
+            '03cb0da4cfe2315c4d8fc845e6a758f3ef6fc51883f993b3bf600653ab342579'
+            '745e15a29bea515c0d65ddad01851e06c8ece5f1f18a0df871f09d5db55057fb')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64-static/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64-static/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-static/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-static/0004-Make-sure-.pc-files-are-installed-correctly.patch
@ -62,5 +62,5 @@ index 3ec2704625..f33edb5bd9 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-static/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-static/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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-static/0007-Fix-linking-against-shared-static-libpng.patch
@ -26,5 +26,5 @@ index 0202f17b21..099c11da95 100644
             ],
             "use": [
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0008-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-static/0008-Fix-linking-against-static-D-Bus.patch
@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-static/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -25,5 +25,5 @@ index 147cf9eb00..a481e54b8d 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch
@ -26,5 +26,5 @@ index 099c11da95..872deb3ad3 100644
                 { "libs": "-lfreetype" }
             ],
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch
@ -25,5 +25,5 @@ index 872deb3ad3..7daaaa5a11 100644
         },
         "imf": {
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch
@ -24,5 +24,5 @@ index 59d21e0a23..518f91d753 100644
 #include <pcre2.h>
 
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 2852ac7e9e087b8374daa044dba1885d5c2bbac5 Mon Sep 17 00:00:00 2001
+From 99c6804513dc0dc010fa00108914ff7e865c9ae7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 13/31] 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 cd20eef1df..babd0465ce 100644
+index cd20eef1df..9c8475439f 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 -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
+                { "libs": "-lmariadbclient -lssl -lcrypto -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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 5f3fb54d36009c5eced4335e79437b5d8eecdf08 Mon Sep 17 00:00:00 2001
+From 718ed1a58165a785123450d2e00ceaef0d1121e5 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..37e25881f0 100644
+index 9c8475439f..478c669e88 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
@@ -88,9 +88,9 @@
@ -24,5 +24,5 @@ index babd0465ce..37e25881f0 100644
             ]
         },
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch
@ -1,4 +1,4 @@
-From d61af2077d70356fc0f69aeb27e82bed66f8d52e Mon Sep 17 00:00:00 2001
+From 1bbc646bd5ceb497aba73d8fc77214bf29d34f48 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
@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
 
 CONFIG += static
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0016-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-static/0016-Enable-rpath-for-build-tools.patch
@ -1,4 +1,4 @@
-From f24d3dd8face31fb7b522ca383b8515ba2913911 Mon Sep 17 00:00:00 2001
+From d8faa947bfaa0a4d7e0a4e861904773dd7479938 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0017-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-static/0017-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From 3b9033c42d77fba36734f8268f042e2c0154c2b5 Mon Sep 17 00:00:00 2001
+From cd29a4171cddcae9ad0e6367ea7de43fc6507e02 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0018-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-static/0018-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From 5756d20ee409d114a355bd07051311757af46fa4 Mon Sep 17 00:00:00 2001
+From 7cfd69a804680ba04a89bc921f5e35a5add12fd4 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-static/0019-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From e21df21893a3071ea5908c9cc19becda0287a231 Mon Sep 17 00:00:00 2001
+From 6d6041eed5ab64b15648c60a378a46976481161c 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 f33edb5bd9..3a75986257 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-static/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From 181461364ddf790c194108c4d6130cdd117c3a0a Mon Sep 17 00:00:00 2001
+From 13269a57b3bd20b86c50d0bd8b4e9fb2dc771601 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-static/0021-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From f92560dca3a5ade9c23dc6f5cf84ec0ab6404080 Mon Sep 17 00:00:00 2001
+From 3401a7615a3a3639a5fd9568e1d5f594952462ea 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
@ -1049,5 +1049,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-static/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From d214392ab20e45037c817c0150c5086993358e9f Mon Sep 17 00:00:00 2001
+From 089d8ff8c8306acdfa6c9c96c41498b2e5771be6 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From 58af82ed3fefd7b230341376c20dc8be84c913a3 Mon Sep 17 00:00:00 2001
+From ce7fd8296fa3e9a7438b93c8f76fa821e6a4024a 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From b14162daa442d61ba3747a68aff6b0a33677e606 Mon Sep 17 00:00:00 2001
+From 7a3de1e7695a79bde92ed2bb58eaf0c04ade9e7e 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-static/0025-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From b01de5ed0031d69b552b980214d4bfe6ce8ee52d Mon Sep 17 00:00:00 2001
+From 2bdc5cdeae34bd597089e931b69f44479caf841e 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0026-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-static/0026-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From e2636a2a9b11a10ba86ce55a11d29623feca0c28 Mon Sep 17 00:00:00 2001
+From 49f3d67d12980ba69d8cd8e3a44bc0479916fb4e 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0027-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-static/0027-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From 8aad5efe320b053525a8cdcf5dd498c349cd5050 Mon Sep 17 00:00:00 2001
+From e4ced51f891bf9c754725b1ea2558b4904a9b4ce 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 a481e54b8d..34cac288a7 100644
                 "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-static/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From 90787e1baa580ced40a79a20c8624ecdeee3aad4 Mon Sep 17 00:00:00 2001
+From 0104780784ba1a49d5f034a95ba00743915c82b1 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 3a75986257..34e7776e44 100644
     int libidx = 0;
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 -- 
-2.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-static/0029-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From 437223bd0628fc9f1081dc332412007df267e3fd Mon Sep 17 00:00:00 2001
+From f96561bfde665a530525fb9cd0091525774de43c 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-static/0030-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From 3888a84625dae5abbf387498fe5f39166eab17e4 Mon Sep 17 00:00:00 2001
+From 9e55df2614a99e6fce2460ea3f32c1039bc9f0e6 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/qt5-base/mingw-w64-static/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@ -1,4 +1,4 @@
-From 68a2b716616ba060e856840cebb5601c61d60773 Mon Sep 17 00:00:00 2001
+From 20363801bd57755feb7ff76e6dd2103e6e946869 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.26.0
+2.26.1

--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@ -14,7 +14,7 @@
 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base-static
 pkgver=5.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('any')
 url='https://www.qt.io/'
@ -64,37 +64,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=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'c758e9ec290052a3ea029f40e5d5cfaadd2135ad7841366393449a4c71d84a88'
-            'a0280ed9dd31b2cdffa1c7ae25f9a6cb3a4164c76b7fa07c4e2eaa8cc01e6762'
-            '9a3c591e2645997a94d30687adfc08f1ea7f64597fef78c777ed7137071de02f'
-            '1d7fe2ef6be292e9ec84f313e4ba543f1b368a1ee0915f858d54615be93cf794'
-            '3099b7210a873ee12374d452fb98204d046a2d5c6b1a330d32d45ae59c95cd86'
-            'c2a8f4a7536ad0293bdab882d01e0055bc7d4a3e97794f7c304d01d1daa24bf7'
-            '3b7e90637b3a0671fac0f8607d613bf0f3f9a73cc62e43848049125c7a925a52'
-            '2e08efe5160c91899ac549303f888c5872e1d198068c5a00c3a34d7040f5410f'
-            '82764b7047b65a262f7c49305dee6579171a5e179fa85f8801d121e03937576e'
-            '27dd7df0721e8d4d3f4f4c30c8e9ca8793f50a04f983b3489ff1227aae996f43'
-            '4f0754277a14bdd8682b5d3701871f8901d2dd9f00ef8318bf6d62e9d4a26171'
-            'd4b3fb742c973119d1c98a34063fcc29861fa6325481a8baf5dfac13c32db597'
-            'd70ce95ddaa3dac7bdf273c3a8926df6b41771d75f17c68e205a1b9bb80a77e1'
-            '0366353ce1e4da4e800be55b457d649b0c3e6ba83a2d53dc8c6e3e08dd82637f'
-            '4632228567fd25ffb75de6750120c0ceea1d2c4ce2e91ef214a39b54ee7b56fc'
-            'ab79617e34dbc8bcefb63f0ff59a3efc5da2d313284aa3e690f8c6025a9cb090'
-            'b4f68710feda5c11dc2c3b4fdc755bb2186599046a8443c6f61ff9d369357193'
-            'a4656c1d3ec12ad50b2c92382775619d435e49a392bb08be5cbc8a654248f3dd'
-            '36e3520481ef8d58e7595195c0eb230df80034590c27622836a38199abf7721c'
-            '640ac515c0453def45cdaf2d5813d1ae95ce953014aeacb78cb1747fa2c0da3e'
-            '612b95a477b9956e61ac1557c0e885a7dd2ae0aa56ef69e29116cafcbc7b0d50'
-            '2bfb7e8400b0e14b5e8c14413d67b9fa437fe920fa9ffc458f769ea22b2bed29'
-            '26473b4a55ce4b764354ff54b40a6dcc6d93aea41b7175afeb1a030cb118f3a8'
-            '98058d1696ff05af14d10017062d697839736cf8cfef94ac77d6cefb6c46f311'
-            '30d2cf6c309c4922ebc4a5822aab76161950f7036666dc18489da22315ef214d'
-            '692c3e1679aa82c6aa395d75a06f02f0d1a0b05230197ef19fe4ef7c7b3b888e'
-            'c285e9900a63d67a01accd6d7a798c5f2476e90f3d8ea8ffb0f272d90d942141'
-            'fbd28eeed43e451240c52582f675e5f5ba069450ee20488bf993b33e76e8275c'
-            '1709f452c4986f6b7366412bc906b52e4a01d412e20d3fda561b7fa090ed8890'
-            '245af9755b5637200ea1d678e0ac1a493ed0fbcb9c25dc2a79c0a5e3c007a19a'
-            '810255e443f940b57e90f4934e4317c050d3edf3593cd0a30c1e2b5a35cf7f68')
+            '14affce3bf8d6a2d2682e0cc7113a62fe851a62fcd5a76539acfe1f4b0c9ea4b'
+            '96d750723b2e44fdb78520ebb369111391850554b55a4cb1c0a57299b97579fd'
+            '4daa7399d1b8523cdf1446e2e4e3cefeaf8a1b14a467f808c3fda9e8e8516965'
+            'ef4d333e7f0aa5bcfe1b4f67bf687f5ea2c9698189a0d001080783829c1b85bf'
+            '54fcf347fe0355306b7ba122ff461c1153919908f89b1306ea50f4f8cf8c69f0'
+            'e55dc7743472c72e58bf0ae780ca0a029670f075538a5c7c5658fe6742476985'
+            'a5f5a87fc80182aeff9ea463c675243b91da432e02d0ca1e8d3b6f9f77013e4b'
+            '1fbf437012eca9276178180a2cb15b6b0296553ca9304ae258b1cce6aed15bc0'
+            '9a1d2f0f2059beeb70236e2f7ecbb2ef15e50644cb6a909a125306f067b3293f'
+            '701bff16f7ad0809dbb61806c050d0742df10e125c24a841db8712e6146d6235'
+            'dfba051c3fec6a77bcd07ebcd4d5e077d7b6fc7ae5291d0680820ac0cc320f2d'
+            '8cc25ac98e8bff73fc980e4afc9e774569218145d2123808e14fe5d8649fe0d0'
+            '8c0709d32c38a226116126ecf4d7fc71944fe3d6a42b8b5a27351e824ed445eb'
+            'dfd12ab7e72b9721d16f902e97fe1c3379d20ae52633610c56d10bcb5e294395'
+            '66c4cf8d218ee5582d6cf8836ed9916502e6ac5d4b77c46ee122460bb98f515d'
+            'a5667634a5940620ca71cdc77c6e1ab656891c308d5053c25736e994ea4c78e0'
+            'd82a344682f1290dfbc174ccdf35bbdeb4cf9f5418d3bfc664491451bb7a8229'
+            'd10bbf540f58388557e5f39c447cff09ff1ddb733ea18f3d8678a308c478dbec'
+            '8691b0a628c04e624d8d98680cb54814a46cd9af67168155a1c46bc9ecd5eafe'
+            'a75a275232484eb616942731052552764348654b413225a334082635558def39'
+            '4b8ceafdf29b045bcc3633c3b2f5682f925b9c79a73c738336e8c795201cbca0'
+            '065ffac8cc7835f941fbbf355aa1ba63c1203c0491672ce7f99576198c0ee3eb'
+            '567f9e136382f7373fd898d7699acc198767d2d5fa93375391826125aa7f7196'
+            '389697028d0a704caffa06e47d70d9c2c3cd852616d5a4cad6e6482d5e3e7ff2'
+            '90898fd84a95b03298d1eaa136459cd65b50957593e1e02a0c02be660097ddb1'
+            'a4681e107f97cc802c1dc975c3118c492256e7baf398598061c7ae5ed3e1d65e'
+            'e22cb9b06d182145433f4bbf7200273a009d62676570f476268ab8db2c23e36b'
+            'eb409f1146c39f19d43fe71c103f40ec6c37d0760cae333f05146ca7e61b47b2'
+            '8ee993247e7240947e5e8a549407ebbda2fa9e73c8310b41caff7da767012a6c'
+            '03cb0da4cfe2315c4d8fc845e6a758f3ef6fc51883f993b3bf600653ab342579'
+            '745e15a29bea515c0d65ddad01851e06c8ece5f1f18a0df871f09d5db55057fb')

 _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
@ -163,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.26.0
+2.26.1

--- 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
@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.26.0
+2.26.1

--- a/Show More
+++ b/Show More