Update Qt packages to 5.12.1

devel/qt5/rebase-all-patches.sh

@@ -13,10 +13,6 @@ for r in "$QT_GIT_REPOS_DIR/qt"*; do
     [[ $repo == '5ct' || $repo == '5ct-code' || $repo == 'repotools' || $repo == 'webkit' ]] && continue
     pushd "$r" > /dev/null
     msg "Rebasing repository $repo ..."
-    if [[ $(git branch | grep -- "$new_version-mingw-w64" | wc -l) -ge 1 ]]; then
-        msg2 "Skipping $repo - branch $new_version-mingw-w64 already exists"
-        continue
-    fi
     "$scriptdir/rebase-patches.sh" "$@"
     popd > /dev/null
 done

devel/qt5/rebase-patches.sh

@@ -12,11 +12,19 @@ if ! [[ $1 ]] || ! [[ $2 ]]; then
 fi
 newversion="$1"
 oldversion="$2"
-oldbranchsuffix="$3"
+oldbranchsuffix="${3:-mingw-w64}"
 newbranchsuffix="${4:-mingw-w64}"
 
+# check whether branch for new version already exists
+newversionbranch=$newversion-$newbranchsuffix
+branch_count=$(git branch | grep -- "$newversionbranch" | wc -l)
+if [[ $branch_count -ge 1 ]]; then
+    msg2 "Branch for new version $newversionbranch already exists. Likely already rebased (otherwise, use continue-rebase-patches.sh)."
+    continue
+fi
+
 # determine branch from old version
-oldversionbranch="$oldversion-${oldbranchsuffix:-mingw-w64}"
+oldversionbranch=$oldversion-$oldbranchsuffix
 branch_count=$(git branch | grep -- "$oldversionbranch" | wc -l)
 if [[ $branch_count -lt 1 ]]; then
     msg2 "Branch for old version $oldversionbranch doesn't exist. Likely we just don't need any patches for this repo :-)"
@@ -44,6 +52,6 @@ fi
 
 # update Git checkout, create new branch with rebased commits, push to remote
 git remote update
-git checkout -b "$newversion-$newbranchsuffix" "origin/$newversion"
+git checkout -b "$newversionbranch" "origin/$newversion"
 git cherry-pick "v$oldversion..$oldversionbranch"
-git push -u $maybe_remote "$newversion-$newbranchsuffix"
+git push -u $maybe_remote "$newversionbranch"

devel/sync-variants.sh

@@ -28,7 +28,7 @@ if [[ ! $1 ]] || [[ ! $2 ]] || [[ ! $3 ]]; then
     echo 'Syncs different variants of a PKGBUILD'
     echo "Usage:   $0 path/to/variants master-variant variants-to-adjust"
     echo "example: $0 ~/pkgbuilds/qt5-base mingw-w64 mingw-w64-{static,angle,dynamic}"
-    echo "example: $0 ~/pkgbuilds/qt5-base android-aarch64 android-*"
+    echo "example: $0 ~/pkgbuilds/qt5 android-aarch64 android-*"
     exit -1
 fi
 path=$1
@@ -79,7 +79,7 @@ for variant_dir in "${variant_dirs[@]}"; do
     fi
 
     msg2 "Replace files"
-    if [ -z "$(ls -A "$variant_dir")" ]; then
+    if [ "$(ls -A "$variant_dir")" ]; then
         rm "$variant_dir/"* # clean existing files first (files might have been removed in master and we don't want any leftovers)
     fi
     cp "$master/"* "$variant_dir"

qt5-3d/mingw-w64/PKGBUILD

@@ -9,8 +9,8 @@
 
 _qt_module=qt3d
 pkgname="mingw-w64-qt5-3d"
-pkgver=5.12.0
+pkgver=5.12.1
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
 depends=('mingw-w64-qt5-declarative')
@@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom')
 url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('a12adc9c14ffa18ff5c4951efb41914d4840a0c2a88486eb8d39a4833e4631da')
+sha256sums=('ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \

qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch

@@ -1,4 +1,4 @@
-From 0cff734180ff88a27b16aee3f5974577a39d0cb7 Mon Sep 17 00:00:00 2001
+From c8373145859a4167b83772790879b3c453db5f83 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 17:17:46 +0200
 Subject: [PATCH 1/2] Don't require windows.h when using native Linux gcc
@@ -17,5 +17,5 @@ index 7f9a8d4..6f3548a 100644
  SOURCES = main.cpp
  
 -- 
-2.19.2
+2.20.1
 

qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch

@@ -1,4 +1,4 @@
-From 92e5888ab26ec60efeb1fe28ce3edbba35fec960 Mon Sep 17 00:00:00 2001
+From 6ab1661e2f6781ae219ba65f7981667ad4ed4043 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 17:21:08 +0200
 Subject: [PATCH 2/2] Handle win64 in dumpcpp and
@@ -52,5 +52,5 @@ index 4601aef..65eee94 100644
      }
  
 -- 
-2.19.2
+2.20.1
 

qt5-activeqt/mingw-w64/PKGBUILD

@@ -9,8 +9,8 @@
 
 _qt_module=qtactiveqt
 pkgname=mingw-w64-qt5-activeqt
-pkgver=5.12.0
+pkgver=5.12.1
-pkgrel=2
+pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
 depends=('mingw-w64-qt5-base')
@@ -24,8 +24,8 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch'
         '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
 sha256sums=('a22876b4243cb433042e7f4812974eac05935872f39cc880a3587bc3eae86d3e'
-            '2c6278acc994f57afd4cd93bd183b73bf744e504d7ee007d73e8fe1568d760f5'
+            '1b07005fbcccf531475b131f84b6a13bff3f7281e3eb35457e93d2fe7ba7c345'
-            'a14b931d373cce075318702ec513d829750f3ab2db73d6ed5433db4bd1f577ae')
+            'ea3a9fbb5bcc3d73832489342fde116347c981bd8668685aa69f88d6a2ceed0a')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \

qt5-base/apple-darwin/PKGBUILD

@@ -5,7 +5,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase
 
 pkgname=apple-darwin-qt5-base
-pkgver=5.12.0
+pkgver=5.12.1
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework (apple-darwin)'
 arch=('i686' 'x86_64')

qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch

@@ -1,7 +1,7 @@
-From ebb6744032ebe7ff6541ef1f1febe8c57a2a84c9 Mon Sep 17 00:00:00 2001
+From 2ac45582566cb492858de99cf06cabf2fa575e30 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
+Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with
  mingw-w64
 
 Adding a new, separate mkspec instead of patching the existing one

qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch

@@ -1,7 +1,7 @@
-From 23c62d9404fec91a2dbc4fd249c24ac414c95150 Mon Sep 17 00:00:00 2001
+From 1083693a799b03cde91c83ff25d890640c01d780 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---

qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch

@@ -1,7 +1,7 @@
-From 089a61fec96026f45584062423b2a09e757d654b Mon Sep 17 00:00:00 2001
+From 0be0cdb753a85725e603a02ada330cc9fd2c161e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/33] Use external ANGLE library
+Subject: [PATCH 03/34] Use external ANGLE library
 
 ---
  src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
@@ -66,7 +66,7 @@ index 8b2349ff2f..f5e43c6adc 100644
  HEADERS += qgl.h \
             qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index db06a6a2a3..25c00ed17b 100644
+index 7004d7e854..a0b0bd81db 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
 @@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32

qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch

@@ -1,7 +1,7 @@
-From f541e6f3d425f2abd495f3964ed5e895e7719588 Mon Sep 17 00:00:00 2001
+From 987045e209769c2b4f8f48046167b5ef9106dd70 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.

qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch

@@ -1,7 +1,7 @@
-From 64e78255f007bf4949c440e3f6fb0bc48c467824 Mon Sep 17 00:00:00 2001
+From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
+Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -10,10 +10,10 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
  3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index b7e591d2ab..5abf0624f4 100644
+index f824f12bce..07abba9e5f 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3189,7 +3189,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
  }
  
  QString
@@ -22,7 +22,7 @@ index b7e591d2ab..5abf0624f4 100644
  {
      QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
      if (ret.isEmpty()) {
-@@ -3214,7 +3214,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
      if(fixify) {
          if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
              ret.prepend(project->first("DESTDIR").toQString());
@@ -36,10 +36,10 @@ index b7e591d2ab..5abf0624f4 100644
      return ret;
  }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index b5c150e1cb..afb0e91381 100644
+index 0535017ff6..b2f8b961c0 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
-@@ -89,7 +89,7 @@ protected:
+@@ -92,7 +92,7 @@ protected:
      virtual void writeDefaultVariables(QTextStream &t);
  
      QString pkgConfigPrefix() const;
@@ -49,10 +49,10 @@ index b5c150e1cb..afb0e91381 100644
      void writePkgConfigFile();   // for pkg-config
  
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index e0d03ccc1c..37eee7fca3 100644
+index 6046e5791e..87157f31ae 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -747,7 +747,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -751,7 +751,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                  }
                  if(!ret.isEmpty())
                      ret += "\n\t";

qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch

@@ -1,7 +1,7 @@
-From 8d4415f5c848f4cb291282842a5fe7fbca509d59 Mon Sep 17 00:00:00 2001
+From fdec0d79a76384fcefd55c06722380a2eccbbe22 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references

qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch

@@ -1,7 +1,7 @@
-From cbcce4bff865989e893dfc8979730050517ee69e Mon Sep 17 00:00:00 2001
+From a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
 
 qmake generates the pkgconfig .pc files two times, once for the
 release build and once for the debug build (which we're not actually
@@ -15,10 +15,10 @@ files for the debug build an unique file name.
  1 file changed, 3 insertions(+)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 5abf0624f4..a7f1285c26 100644
+index 07abba9e5f..e640fb8079 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3203,6 +3203,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
          if (dot != -1)
              ret = ret.left(dot);
      }

qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch

@@ -1,7 +1,7 @@
-From 4907c25ba7070ad0f58b038f0d4b9de904b17961 Mon Sep 17 00:00:00 2001
+From 95710d93c0d010afaa8ac7433b99827346bc011b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 08/33] Fix linking against shared/static libpng
+Subject: [PATCH 08/34] Fix linking against shared/static libpng
 
 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
@@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 0332631ec8..dbb6f708b0 100644
+index 89934c8f1d..9124e3e77e 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -308,8 +308,10 @@
+@@ -385,8 +385,10 @@
                  { "type": "pkgConfig", "args": "libpng" },
                  { "libs": "-llibpng16", "condition": "config.msvc" },
                  { "libs": "-llibpng", "condition": "config.msvc" },

qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch

@@ -1,7 +1,7 @@
-From 02a7c8481cb1d6f760307f34c6be4cd888fdc9ed Mon Sep 17 00:00:00 2001
+From 5c645a6510d3ac66a845b695c5e30c76944f22a0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 09/33] Fix linking against static D-Bus
+Subject: [PATCH 09/34] Fix linking against static D-Bus
 
 ---
  configure.json             | 9 +++++++--
@@ -9,17 +9,18 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/configure.json b/configure.json
-index 522bd34e9b..17446b6c21 100644
+index 9fce6d039e..c673f9a5fc 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -170,17 +170,22 @@
+@@ -169,18 +169,23 @@
+         "dbus": {
              "label": "D-Bus >= 1.2",
              "test": {
-                 "include": "dbus/dbus.h",
 -                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);"
 +                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);",
 +                "qmake": "static: DEFINES += DBUS_STATIC_BUILD"
              },
+             "headers": "dbus/dbus.h",
              "sources": [
                  { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
 +                {

qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch

@@ -1,7 +1,7 @@
-From 6f001ca09fe5bb1aca85a3f532489b3aa412cd2a Mon Sep 17 00:00:00 2001
+From 75d943609ad0a9814656ce151a353fb391b5df33 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
-Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
+Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
 
 Required for a debug build of Qt because mingw-w64-dbus
 does not contain debug version
@@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 17446b6c21..5b37371a7b 100644
+index c673f9a5fc..15b0f21e58 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -182,7 +182,7 @@

qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch

@@ -1,32 +1,30 @@
-From e3e5bfb055f8f25db2c098b35d8376e956eed80e Mon Sep 17 00:00:00 2001
+From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 11/33] Fix linking against static freetype2
+Subject: [PATCH 11/34] Fix linking against static freetype2
 
 ---
- src/gui/configure.json | 9 ++++++---
+ src/gui/configure.json | 7 +++++--
- 1 file changed, 6 insertions(+), 3 deletions(-)
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index dbb6f708b0..a7ffa0f113 100644
+index 9124e3e77e..f3628f415d 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -163,9 +163,12 @@
+@@ -237,8 +237,11 @@
-                 ]
              },
+             "headers": "ft2build.h",
              "sources": [
 -                { "type": "pkgConfig", "args": "freetype2" },
 -                { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
--                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
 +                { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" },
 +                { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
 +                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
-+                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "features.shared && config.wasm" }
+                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
-             ]
+             ],
-         },
+             "use": [
-         "fontconfig": {
 -- 
 2.20.1
 

qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch

@@ -1,19 +1,19 @@
-From 7c369864f7ef939dd0bdbc805fe0951429e27405 Mon Sep 17 00:00:00 2001
+From bdfd1226b5fcf7ede805676a2bb4bb8fbe047d6a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 12/33] Fix linking against static harfbuzz
+Subject: [PATCH 12/34] Fix linking against static harfbuzz
 
 ---
  src/gui/configure.json | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index a7ffa0f113..796cd5aaa7 100644
+index f3628f415d..b12a0e8ff2 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -227,7 +227,11 @@
+@@ -304,7 +304,11 @@
-                 ]
              },
+             "headers": "harfbuzz/hb.h",
              "sources": [
 -                "-lharfbuzz"
 +                { "type": "pkgConfig", "args": "--static --libs harfbuzz", "condition": "!features.shared" },

qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch

@@ -1,7 +1,7 @@
-From cffd6d5675635e1d2d170f31dc4b70013437db7c Mon Sep 17 00:00:00 2001
+From 52634efb9b9b2f3de1a2941297c7670ec7d4bdfc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 13/33] Fix linking against static pcre
+Subject: [PATCH 13/34] Fix linking against static pcre
 
 Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
@@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
  1 file changed, 4 insertions(+)
 
 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 908e7ff0d6..e5786a10cf 100644
+index bdaa2d3243..90f8250c03 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
 @@ -53,6 +53,10 @@

qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch

@@ -1,23 +1,22 @@
-From 23624432b529e988504650293351d77b5f19beb9 Mon Sep 17 00:00:00 2001
+From 6d8c6ce62a3a418cc30a6e3016eaf38ff945697b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
+Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
 
 Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
- src/plugins/sqldrivers/configure.json | 3 +++
+ src/plugins/sqldrivers/configure.json | 2 ++
- 1 file changed, 3 insertions(+)
+ 1 file changed, 2 insertions(+)
 
 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 4802d3b04d..fac6be7301 100644
+index cd20eef1df..babd0465ce 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
-@@ -69,6 +69,9 @@
+@@ -67,6 +67,8 @@
-                 "main": "mysql_get_client_version();"
              },
+             "headers": "mysql.h",
              "sources": [
 +                { "libs": "-lmariadbclient -lssl -lcrypto -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
-+                { "libs": "-Wl,-Bdynamic -lmariadb -Wl,-Bstatic", "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 },

qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch

@@ -1,25 +1,24 @@
-From 63e0fdf86c9ceaa4da247f35e7127cbab6a35c03 Mon Sep 17 00:00:00 2001
+From 0c7b1782160144c9a0839f02efd365716816400d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
 
 ---
- src/plugins/sqldrivers/configure.json | 5 +++--
+ src/plugins/sqldrivers/configure.json | 4 ++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index fac6be7301..305aac405c 100644
+index babd0465ce..b4b3bdec6b 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
-@@ -91,9 +91,10 @@
+@@ -88,9 +88,9 @@
-                 ]
              },
+             "headers": "libpq-fe.h",
              "sources": [
 -                { "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", "condition": "config.win32 && !features.shared" },
++                { "type": "psqlEnv", "libs": "-lpq -lintl -lssl -lcrypto -lshell32 -lws2_32 -lsecur32 -liconv", "condition": "config.win32 && !features.shared" },
-+                { "type": "psqlEnv", "libs": "-Wl,-Bdynamic -lpq -Wl,-Bstatic", "condition": "config.win32 && !features.shared" },
 +                { "type": "psqlEnv", "libs": "-lpq", "condition": "config.win32 && features.shared" },
                  { "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" }
              ]

qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch

@@ -1,7 +1,7 @@
-From b9f8213ea416663467061840443547a3b3412f9f Mon Sep 17 00:00:00 2001
+From c37572ff090abe65285eacaedf7e7022af92aae6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 16/33] Rename qtmain to qt5main
+Subject: [PATCH 16/34] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -53,7 +53,7 @@ index ecb167bf18..7c9368c3b3 100644
                  QMAKE_LIBS += -L$$QT.core.libs
              CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
 diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
-index 4140ae48de..9ae73db74b 100644
+index 61e9f29d23..a1795bf265 100644
 --- a/src/winmain/winmain.pro
 +++ b/src/winmain/winmain.pro
 @@ -2,7 +2,7 @@

qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch

@@ -1,7 +1,7 @@
-From df4107f83f185cb4b621c128da8cc893fdf3745a Mon Sep 17 00:00:00 2001
+From 901d666dd3a5609f40b5fce75620b9016660b4c5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
-Subject: [PATCH 17/33] Build dynamic host libraries
+Subject: [PATCH 17/34] Build dynamic host libraries
 
 This came initially from Fedora, not sure whether
 it makes sense to keep it. Regular Arch package

qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch

@@ -1,7 +1,7 @@
-From 1ca68e2ef175b6838027dc64bd5e32ff3c6eff29 Mon Sep 17 00:00:00 2001
+From 8ae9fed6ff5f5bf2e4c1d031baa7c03282268b35 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 18/33] Enable rpath for build tools
+Subject: [PATCH 18/34] Enable rpath for build tools
 
 - Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib

qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch

@@ -1,22 +1,24 @@
-From 773170ab38b995464a3ee5430c7e7f8fdc84fd8d Mon Sep 17 00:00:00 2001
+From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 19/33] Use system zlib for build tools
+Subject: [PATCH 19/34] Use system zlib for build tools
 
 ---
- src/tools/bootstrap/bootstrap.pro | 2 +-
+ src/tools/bootstrap/bootstrap.pro | 4 +++-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index 83e44ff9a4..6b1db38486 100644
+index 83e44ff9a4..4734623936 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -135,7 +135,7 @@ macx {
+@@ -135,7 +135,9 @@ macx {
          ../../corelib/io/qstandardpaths_win.cpp
  }
  
 -!qtConfig(system-zlib)|cross_compile {
-+!qtConfig(system-zlib) {
++cross_compile {
++    LIBS += -lz
++} else:!qtConfig(system-zlib) {
      include(../../3rdparty/zlib.pri)
  } else {
      CONFIG += no_core_dep

qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch

@@ -1,14 +1,14 @@
-From a73bf9a8194a2fdd68b531b501327cb72e6e2d36 Mon Sep 17 00:00:00 2001
+From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 20/33] Use *.dll.a as import lib extension
+Subject: [PATCH 20/34] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 mingw-w64 specific mkspec
 ---
  mkspecs/features/create_cmake.prf      |  5 +++--
- qmake/generators/win32/winmakefile.cpp | 17 ++++++++++++-----
+ qmake/generators/win32/winmakefile.cpp | 15 +++++++++++----
- 2 files changed, 15 insertions(+), 7 deletions(-)
+ 2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
 index e67917cc96..2a94964b49 100644
@@ -27,29 +27,27 @@ index e67917cc96..2a94964b49 100644
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 37eee7fca3..59b394ca51 100644
+index 87157f31ae..4592fed7b2 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
+@@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
  bool
  Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
  {
 -    ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS");
 -    if (impexts.isEmpty())
 -        impexts = project->values("QMAKE_EXTENSION_STATICLIB");
--    QList<QMakeLocalFileName> dirs;
++    ProStringList impexts;
-+  ProStringList impexts;
++    if (project->isActiveConfig("staticlib")) {
-+  if (project->isActiveConfig("staticlib")) {
++      impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
-+    impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
++    } else {
-+  } else {
++      impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
-+    impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
++      impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
-+    impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
++    }
-+  }
+     QList<QMakeLocalFileName> dirs;
-+  QList<QMakeLocalFileName> dirs;
+     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-   static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+         dirs.append(QMakeLocalFileName(dlib.toQString()));
-                                          "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
+@@ -255,9 +259,12 @@ void Win32MakefileGenerator::fixTargetExt()
-   for (int i = 0; lflags[i]; i++) {
-@@ -253,9 +257,12 @@ void Win32MakefileGenerator::fixTargetExt()
      if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
          project->values("TARGET_EXT").append(".exe");
      } else if (project->isActiveConfig("shared")) {

qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch

@@ -1,7 +1,7 @@
-From e362589c0413c036ee6c960f26a6aa610a085e2c Mon Sep 17 00:00:00 2001
+From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 21/33] Merge shared and static library trees
+Subject: [PATCH 21/34] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
 ---
@@ -13,7 +13,7 @@ Allow installation of shared and static build in the same prefix
  5 files changed, 51 insertions(+), 6 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index 64ed6b9ed8..2cc54d15a2 100644
+index b3b3e27c44..3136889a2f 100644
 --- a/configure.pri
 +++ b/configure.pri
 @@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) {
@@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644
  
  !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index d16b3cf1be..2c4d6cd97e 100644
+index 5da82fdb5b..5b05aa9e2a 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -268,6 +268,23 @@ for(ever) {
+@@ -246,6 +246,23 @@ for(ever) {
              !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                  WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
          }
@@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a7f1285c26..879410afef 100644
+index e640fb8079..fc7f729ae6 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3206,6 +3206,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
      if (project->isActiveConfig("debug")) {
          ret += "d";
      }
@@ -114,7 +114,7 @@ index a7f1285c26..879410afef 100644
      ret += Option::pkgcfg_ext;
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
-@@ -3380,9 +3383,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile()
      t << endl;
  
      // requires

qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch

@@ -1,7 +1,7 @@
-From c7c3618a348b9cfc480f13bfb494dd6637035886 Mon Sep 17 00:00:00 2001
+From 7f561d87a70af23d5d2a0c89e08ba5744b2f9585 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
+Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules
 
 When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
@@ -251,10 +251,10 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 879410afef..2ff4c4f714 100644
+index fc7f729ae6..095b4d2720 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -1016,10 +1016,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
+@@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
              libs << "LIBS" << "QMAKE_LIBS";
          else
              libs << "LIBS" << "LIBS_PRIVATE" << "QMAKE_LIBS" << "QMAKE_LIBS_PRIVATE";

qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch

@@ -1,7 +1,7 @@
-From 7162658d8ae5a73ed35cd24287bae6c43be6cb93 Mon Sep 17 00:00:00 2001
+From c49f1674465685e03c0d95b869d6cea45dcf5447 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
-Subject: [PATCH 23/33] Allow usage of static version with CMake
+Subject: [PATCH 23/34] Allow usage of static version with CMake
 
 Allow selecting between dynamic and static Qt versions
 installed in the same prefix

qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch

@@ -1,7 +1,7 @@
-From 9dbcc3874c61328503a15641bea40e3d28c082e6 Mon Sep 17 00:00:00 2001
+From 5decd2ed0bdfafd01c119357c73fc91e470b9f61 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
-Subject: [PATCH 24/33] Adjust linker flags for static build with
+Subject: [PATCH 24/34] Adjust linker flags for static build with
  cmake/mingw-w64
 
 Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d

qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch

@@ -1,17 +1,17 @@
-From 6e5853cf115c82c9162811fad6d205e674676607 Mon Sep 17 00:00:00 2001
+From 9a0c4a937083e14ad32a8a25feb92333b5015dda Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 25/33] Use correct pkg-config --static flag
+Subject: [PATCH 25/34] Use correct pkg-config --static flag
 
 ---
  configure.pri | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.pri b/configure.pri
-index 2cc54d15a2..449fe4b9b8 100644
+index 3136889a2f..601629c047 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -329,6 +329,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) {
              qtLog("Found pkg-config from path: $$pkgConfig")
          }
      }

qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch

@@ -1,7 +1,7 @@
-From b7d5d4387f485ac954b6e3381f5bad3e3d8bf573 Mon Sep 17 00:00:00 2001
+From ad4a59bd142b2b3ab402ed8d0337ac972f77e76c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic
 
 * Otherwise the arguments aren't passed correctly leading to errors like
   ```

qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch

@@ -1,7 +1,7 @@
-From ecd411d7f3b7e845a0a5feadd3a79998a18dc097 Mon Sep 17 00:00:00 2001
+From a17249171793a58d2a0308879e96465e96c362f1 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 27/33] Ignore errors about missing feature static
+Subject: [PATCH 27/34] Ignore errors about missing feature static
 
 Not sure why this error occurs, let's hope for the best
 ---

qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch

@@ -1,33 +1,19 @@
-From e7e68d743e1aaf534374c5602bf6fc458b40dbd3 Mon Sep 17 00:00:00 2001
+From 94bf26c2b8ae87dc5add63ef4df8b765e4067651 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 28/33] Enable and fix use of iconv
+Subject: [PATCH 28/34] Enable and fix use of iconv
 
 Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
 ---
- config.tests/gnu-libiconv/gnu-libiconv.cpp | 2 +-
+ src/corelib/codecs/qiconvcodec.cpp | 7 +++----
- src/corelib/codecs/qiconvcodec.cpp         | 7 +++----
+ src/corelib/configure.json         | 6 +++---
- src/corelib/configure.json                 | 4 ++--
+ 2 files changed, 6 insertions(+), 7 deletions(-)
- 3 files changed, 6 insertions(+), 7 deletions(-)
 
-diff --git a/config.tests/gnu-libiconv/gnu-libiconv.cpp b/config.tests/gnu-libiconv/gnu-libiconv.cpp
-index fe4b87b923..be4236436f 100644
---- a/config.tests/gnu-libiconv/gnu-libiconv.cpp
-+++ b/config.tests/gnu-libiconv/gnu-libiconv.cpp
-@@ -43,7 +43,7 @@ int main(int, char **)
- {
-     iconv_t x = iconv_open("", "");
- 
--    const char *inp;
-+    char *inp;
-     char *outp;
-     size_t inbytes, outbytes;
-     iconv(x, &inp, &inbytes, &outp, &outbytes);
 diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp
-index 330eb7c038..88a782b863 100644
+index 9c39727946..cc14036b25 100644
 --- a/src/corelib/codecs/qiconvcodec.cpp
 +++ b/src/corelib/codecs/qiconvcodec.cpp
-@@ -49,7 +49,6 @@ QT_REQUIRE_CONFIG(iconv);
+@@ -47,7 +47,6 @@
  #include <errno.h>
  #include <locale.h>
  #include <stdio.h>
@@ -35,7 +21,7 @@ index 330eb7c038..88a782b863 100644
  
  // unistd.h is needed for the _XOPEN_UNIX macro
  #include <unistd.h>
-@@ -182,7 +181,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState
+@@ -180,7 +179,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState
      IconvState *state = *pstate;
      size_t inBytesLeft = len;
      // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
@@ -44,7 +30,7 @@ index 330eb7c038..88a782b863 100644
      // GNU doesn't disagree with POSIX :/
      const char *inBytes = chars;
  #else
-@@ -281,7 +280,7 @@ static bool setByteOrder(iconv_t cd)
+@@ -279,7 +278,7 @@ static bool setByteOrder(iconv_t cd)
      size_t outBytesLeft = sizeof buf;
      size_t inBytesLeft = sizeof bom;
  
@@ -53,7 +39,7 @@ index 330eb7c038..88a782b863 100644
      const char **inBytesPtr = const_cast<const char **>(&inBytes);
  #else
      char **inBytesPtr = &inBytes;
-@@ -303,7 +302,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
+@@ -301,7 +300,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
      char *outBytes;
      size_t inBytesLeft;
  
@@ -63,10 +49,19 @@ index 330eb7c038..88a782b863 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index 183eb3a13e..a4560d5a60 100644
+index a22a7459bd..b7ed2f7281 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
-@@ -532,9 +532,9 @@
+@@ -71,7 +71,7 @@
+             "test": {
+                 "main": [
+                     "iconv_t x = iconv_open(\"\", \"\");",
+-                    "const char *inp;",
++                    "char *inp;",
+                     "char *outp;",
+                     "size_t inbytes, outbytes;",
+                     "iconv(x, &inp, &inbytes, &outp, &outbytes);",
+@@ -615,9 +615,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",

qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch

@@ -1,7 +1,7 @@
-From 9764fb74d779be675d8cd6d1193bf3efb93ff2a7 Mon Sep 17 00:00:00 2001
+From 93dcee644f3059e381310bd0e4f905caeebfa05b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 29/33] Ignore failing pkg-config test
+Subject: [PATCH 29/34] Ignore failing pkg-config test
 
 Didn't investigate why it fails, let's hope for the best
 ---
@@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
  1 file changed, 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 5b37371a7b..ac98495157 100644
+index 15b0f21e58..46cc841148 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -646,7 +646,6 @@
+@@ -660,7 +660,6 @@
          "pkg-config": {
              "label": "Using pkg-config",
              "autoDetect": "!config.darwin && !config.win32",

qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch

@@ -1,7 +1,7 @@
-From c2951c79c8a228443daecfbc1683eee516412a01 Mon Sep 17 00:00:00 2001
+From e917a88d58047cdb3fb46c1b07fb78648bf74358 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies
 
 In particular, it messes resolving cyclic dependency between
 static freetype2 and harfbuzz
@@ -11,7 +11,7 @@ static freetype2 and harfbuzz
  2 files changed, 6 insertions(+)
 
 diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 50ec8db79e..50789b3b9c 100644
+index 4cbe06d9dc..47535f60d5 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
 @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
@@ -25,19 +25,19 @@ index 50ec8db79e..50789b3b9c 100644
      int libidx = 0, fwidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 59b394ca51..7788862142 100644
+index 4592fed7b2..b93d0df473 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
-     impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
+       impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
-     impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
+       impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
-   }
+     }
-+  if(project->isActiveConfig("staticlib")) {
++    if(project->isActiveConfig("staticlib")) {
-+    return false; // prevent qmake from messing static lib dependencies
++        return false; // prevent qmake from messing static lib dependencies
-+  }
++    }
-   QList<QMakeLocalFileName> dirs;
+     QList<QMakeLocalFileName> dirs;
-   static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-                                          "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
+         dirs.append(QMakeLocalFileName(dlib.toQString()));
 -- 
 2.20.1
 

qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch

@@ -1,7 +1,7 @@
-From b807729780fedcfd3848c7911ced8bd7913bb045 Mon Sep 17 00:00:00 2001
+From fe25b3abe19208154631b6315587fce9bacc4991 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
+Subject: [PATCH 31/34] Hardcode linker flags for platform plugins
 
 Otherwise incorrect order of libs leads to errors
 when building libqminimal.dll, libqoffscreen.dll
@@ -14,7 +14,7 @@ and libqwindows.dll
  4 files changed, 73 insertions(+), 18 deletions(-)
 
 diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro
-index 3bfd02bdc8..4732f89920 100644
+index 9764272632..7310958323 100644
 --- a/src/plugins/platforms/direct2d/direct2d.pro
 +++ b/src/plugins/platforms/direct2d/direct2d.pro
 @@ -1,12 +1,32 @@
@@ -53,8 +53,8 @@ index 3bfd02bdc8..4732f89920 100644
 +LIBS += -lQt5WindowsUIAutomationSupport
 +INCLUDEPATH += $$QT_SOURCE_TREE/include/Qt5WindowsUIAutomationSupport/$${QT_VERSION}
  
- LIBS += -ldwmapi -ld2d1 -ld3d11 -ldwrite -lversion -lgdi32
+ LIBS += -ldwmapi -lversion -lgdi32
- 
+ QMAKE_USE_PRIVATE += dwrite_1 d2d1_1 d3d11_1 dxgi1_2
 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
 index a1a2da547b..7ef91b574d 100644
 --- a/src/plugins/platforms/minimal/minimal.pro

qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch

@@ -1,7 +1,7 @@
-From d5cc5a64db0f04a4245febec2e4dae4dc1986d2a Mon Sep 17 00:00:00 2001
+From 1cd9a4e98c177d3b794f2c0549b6f74ddf0e6e65 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
-Subject: [PATCH 32/33] Fix linking against static plugins with qmake
+Subject: [PATCH 32/34] Fix linking against static plugins with qmake
 
 Required because qtConfig(static) does not work
 with 'Merge shared and static library trees'
@@ -11,7 +11,7 @@ approach
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 2c4d6cd97e..a15ab81899 100644
+index 5b05aa9e2a..2732c94797 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
 @@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d

qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch

@@ -1,7 +1,7 @@
-From de2c6c9f865840b96921298c45171e71a8825227 Mon Sep 17 00:00:00 2001
+From b26414fad10e9ff16f305b3484670260e07df70e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 May 2018 03:47:14 +0200
-Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
+Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -19,7 +19,7 @@ during RTL pass: ira
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
-index 23e5e499b2..12030eba08 100644
+index 6195c324e7..480af00ebc 100644
 --- a/src/corelib/global/qrandom.cpp
 +++ b/src/corelib/global/qrandom.cpp
 @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando

qt5-base/mingw-w64-angle/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch

@@ -0,0 +1,37 @@
+From 62ddbd09af7ddeb08d21ccbaf2c8724a12c52ef6 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 3 Feb 2019 14:34:42 +0100
+Subject: [PATCH 34/34] Prevent static build to prefer dynamic libraries
+
+The static build should not attempt to link against dynamic libraries
+in order to get a fully statically linked binary in the end.
+---
+ mkspecs/features/qt_configure.prf | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
+index c45439c3ef..7953cdd19e 100644
+--- a/mkspecs/features/qt_configure.prf
++++ b/mkspecs/features/qt_configure.prf
+@@ -541,12 +541,12 @@ defineTest(qtConfResolveLibs) {
+                 # Under Windows, we look only for static libraries, as even for DLLs
+                 # one actually links against a static import library.
+                 mingw {
+-                    lcan += \
+-                        # MinGW supports UNIX-style library naming in addition to
+-                        # the MSVC style.
+-                        lib$${lib}.dll.a lib$${lib}.a \
+-                        # Fun fact: prefix-less libraries are also supported.
+-                        $${lib}.dll.a $${lib}.a
++                    # prefer (import) libraries for dynamic linking unless we're doing a
++                    # static build where we solely rely on presence of static libraries
++                    shared {
++                        lcan += $${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_IMPORTLIB} $${lib}.$${QMAKE_EXTENSION_IMPORTLIB}
++                    }
++                    lcan += $${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB} $${lib}.$${QMAKE_EXTENSION_STATICLIB}
+                 }
+                 lcan += $${lib}.lib
+             }
+-- 
+2.20.1
+

qt5-base/mingw-w64-angle/PKGBUILD

@@ -36,8 +36,8 @@ isNoOpenGL() {
 }
 
 pkgname=mingw-w64-qt5-base-angle
-pkgver=5.12.0
+pkgver=5.12.1
-pkgrel=2
+pkgrel=1
 pkgdesc='A cross-platform application and UI framework (mingw-w64)'
 # The static variant doesn't contain any executables which need to be executed on the build machine
 isStatic && arch=('any') || arch=('i686' 'x86_64')
@@ -84,41 +84,43 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch'
         '0031-Hardcode-linker-flags-for-platform-plugins.patch'
         '0032-Fix-linking-against-static-plugins-with-qmake.patch'
-        '0033-Disable-hardware-randomizer-for-32-bit.patch')
+        '0033-Disable-hardware-randomizer-for-32-bit.patch'
-sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb'
+        '0034-Prevent-static-build-to-prefer-dynamic-libraries.patch')
-            '9ec51628c255573f7c243efa23957fb0eaae7051e2e8f14c80004b53113843dd'
+sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049'
-            '0d78f4826dd41c4d6ee7d095c8f35b3546655d375fca0ece7974ed0cfd61b4ec'
+            '4e1dbb878b77dbba96a9564ecbded6dbd74482b52e1cf4becaa1ce741c8cf489'
-            '44679f37ed58b22297f7666e798c8f099af665ceb0725edf94ca5250f56df60b'
+            'f54815ff2fede9dbdc0ade572305ff684940714ca65e76d25f5b15cd0cb0a3da'
-            'bed019caedb56d1e9949bf227c17f3c62cf3f929e2ac5960f989ebd09031f70a'
+            'c60e6cef5d0c95b6d034ade75fde3cf150e1570f5ca62d6b32d942abcb937f86'
-            '6591e1b6df919bd0054fc60c5cbef0ce9c5c99e7e792003af3337e6b58c17a5e'
+            '0a82cde28edae5abb8d624cea407db515c1d52e8963f07aa8430c1d1f810e54a'
-            'c70a8fe8243225d44532834eba25c849276131152791dd9c3f505ad3a07bd91e'
+            '39059ed786851c1cdf416c4d0a9a5b042edda83bddd03b5bfcbcae1eaf8f7694'
-            'ea17823807394adbffc74ef9a61613c7b134072ed081b370ecc9d0f1e0d61525'
+            '4ef83cf4d211c446a5715cfa422f130492ae18bfb5cb42db9ff6516ed7fb29f1'
-            'a19b79876793858af82c4f52fa3756d297059968b30b9e3a99c874ef5edd86d5'
+            '48ee96ffc01d5ab7c648f4aae6cee286992e4eb406e48718058092206f8ad2eb'
-            '93803937c9d3d79738bd9098cadbc652d92811356d33cbc5694fd86636ea2cd6'
+            '58f27f2359b3571aac44a3770a705692eed9e6fd24b6e6bf730e7aad5ee4a030'
-            '07e5c641133c796ec10cb2259deb05e2c73e79d6dca61306c57c26be941de357'
+            'cf6154d83655efbf30281c4f83d29feb252fd104849f8e2ad495da688e581314'
-            'e737d0aaf73aeed0926420632718469549f339ba9246330232b4e0a7c2590542'
+            'edf080092f4d158d2e42cedd50f80b3b5715ae47f740b16fa43132f1dc68cf9d'
-            '99538cd36fbf5b850125b1f887bca7d9f244c00b1b1647251dd46576da666aa4'
+            '1c3c46c26809e59e91732d2ff082a445dac4986294f400277272c2337d8c21f3'
-            '95b5da98388f36a10a811d9c11edb9ffecaaefeec55cd2d7dc33420410fcc691'
+            '3ee7b4f4ed6ea86794a5d119c7000033d0f61208150e37f35428e52611f7ae3f'
-            'b47c7760212833986820cce8face4eb3fe4a3a0f50dd89d9151fe59d771e18a3'
+            '1d18e225c4bda89fe024a47834a8b79d9c8e4d1ba884d7dc6b07a93bf0307a85'
-            '609dfac8f60be7cc425638d1f5671a4a22cd8985ee5f08571444e6acae823a74'
+            '2affe7ac03016cfd536f63d61c0f5bd42932fc3823b7f2dbabca9c2db5a53ae6'
-            'f58260547b4ed3a5f43fd4fc6b4b7716b9c4f8355ce00c89931e54763f88e5f9'
+            'd0a2e33d20c4d6063f7546fbc84d2f6a5a96955f998ba7af4320bc005fa2a722'
-            'e5bf5056b223f0fe6edd6326fc9a360428fdbfff22930090d5b5d192d50733ec'
+            '9941e9c883496bb3409a12ef3f73b6f3d76e106061381deb74380eafb1ac472f'
-            'f8dd5e4f49b342ce4c5df2c677ecc63ea8df2730dd2101181a7ed56ff6b9ecaa'
+            'f336402daf227aa529080ab31612a205c936438ecbfab3627252164d8903c1b1'
-            'e497ff375a28d1d87f7b6d04c099df65fdb54bb6a4eb9fe4c638a042731cab61'
+            '8cf716c22bf0fface6e3c015cd4d621425e3b20771b15ab03eeeeb59db248756'
-            'c9122faeabd32285c5c1ed58d34ee52ae2b429089eb2d34a1d0ee2f017c57de1'
+            '95f9847a1fe05ad78ae4a682208894d995becc0ca4f3463d39781e8a52543017'
-            '2d249396a381c3b6348258ebcc52afc8d1be0a3f48554952ff0632c674c7dfde'
+            '132fc790cfa528063fe95c3bc104826cb82105cd24e05ed77593115212987dc3'
-            'a384a727dce6c1b823eb43d16a139d49835c7b9772b39e8ad0ff53ca3a2d4f02'
+            '8ace42d2ec1b7a05a6bacf93f899775906c407f349efbbd2533b942fb474f200'
-            'd52dc5d9c0d7e58c08e42e84d8c566604137f95d036b324320f71b1fd34abeb8'
+            '8849864de4abf2dd70ffe2fe70aabb608c296eccdc41e6f4061645bd39f63c50'
-            '3eae353c8dde508f328cdbb245c93423b365a414b3007b5720abb0396d053830'
+            '60ca9adfe6ae46d6dc7b4874c3202b46bc57f6649a45fb5301e4e4b63e70aa5e'
-            '6a8f2a7a70f2f06ecbbfb7cae9f5728b7cdad19c9bd9496064c9440cf22df96d'
+            '47f83f04256afe1bd8701c31673e00e445b65840b5fe2bd132a98c8f292aa9c4'
-            'bdcdb320de3b6da2925ca1ad76edf14ace5b2a1a51fbfc7ae9c89574a57c146c'
+            '305b30fad80fba756bd3ad6c34c95030fc3927d52a3dc9b90d2705b390831734'
-            'e00e00695e9db071bea0c6f214d3561a58114b9211a8ffa94f09398bb2147b2a'
+            '91f37e9098e78881c1953c85e592e108be27dae08a83278f4a9885cb296a6871'
-            'bd0f5cfe2cf38218b12f979223b3286a6ae16fb17feb561695df0f155dd61a73'
+            '9ca5f2175d8679b7312d8cb718ddc648e161a6aae631b5d4c9e528594a020d1a'
-            'c41798441c49d3eb30d87fe5a2aae5d5a957e4694d76d1f6d11f8a926fd2c857'
+            '3a5619542cb549ba7cc2bf1f9b77d524e5f9aa78d1e8dea6cd75c4f09b6aabc9'
-            'aac08c720053c206845bf0ee54c4ef833d7f3481d32522c23ece7b790f89af7d'
+            'e30cf84af1ff7764cb0e0644a7bfbde920f463af9c24aab53abef9cf3410ceb3'
-            '301dfe13ab0dca5fc99f0a9ed9c62d145bf7e76ce1afe60adbbd0b7ec86d6ce3'
+            'fdd36ed82c5a8df7a0157b4ce9a3be16ec4c2b98cdf071a2be662603045da652'
-            'd90088ce7f2fe633a9b46a4cfd097044bffc6c8e03d9244f08b82328b0b83737'
+            '55b42d68ca7981ef777a7f081f840b1b80ada8c0dc9508092ec9fba151a88dfd'
-            '7f9393c25dd4a4cd1fec292a8dbf98708990719d9dca8ca7d00b96d78d61969f')
+            '06f98f6ce25da7010e7398111ee7b79f380b79a7ab125eba3ef6d051af92cf8a'
+            '5a097dc80dc07aa755e77c50a469c3c08bf5b562ad9b116dbbf891a072e7bdc2'
+            '66047e08db2282d69563b3081b847fa7c041c3c387ab00ca72ff481b91124925')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -165,10 +167,10 @@ prepare() {
   CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
   LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed}"
   sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
-         -e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|"\
+         -e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \
          -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
     mkspecs/common/gcc-base.conf
-  sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|" \
+  sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1|" \
     mkspecs/common/g++-unix.conf
 }
 
@@ -344,6 +346,11 @@ package() {
       # keep a couple pri files not found in base
       mv "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules/qt_plugin_"*.pri "${pkgdir}/usr/${_arch}"
 
+      # fix bad library order for static CMake builds caused by Qt5Gui.static.prl
+      sed -i -e "s|-lfreetype;|-lfreetype;-lharfbuzz;-lfreetype;-lbz2;|" \
+             -e "s| -lz;| |" \
+                "${pkgdir}/usr/${_arch}/lib/Qt5Gui.static.prl"
+
       # delete duplicate files that are in the base package
       rm -fR "${pkgdir}/usr/${_arch}/"{include,share}
       rm -fR "${pkgdir}/usr/${_arch}/lib/"{qt/bin,qt/mkspecs}

qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch

@@ -1,7 +1,7 @@
-From ebb6744032ebe7ff6541ef1f1febe8c57a2a84c9 Mon Sep 17 00:00:00 2001
+From 2ac45582566cb492858de99cf06cabf2fa575e30 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
+Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with
  mingw-w64
 
 Adding a new, separate mkspec instead of patching the existing one

qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch

@@ -1,7 +1,7 @@
-From 23c62d9404fec91a2dbc4fd249c24ac414c95150 Mon Sep 17 00:00:00 2001
+From 1083693a799b03cde91c83ff25d890640c01d780 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---

qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch

@@ -1,7 +1,7 @@
-From 089a61fec96026f45584062423b2a09e757d654b Mon Sep 17 00:00:00 2001
+From 0be0cdb753a85725e603a02ada330cc9fd2c161e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/33] Use external ANGLE library
+Subject: [PATCH 03/34] Use external ANGLE library
 
 ---
  src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
@@ -66,7 +66,7 @@ index 8b2349ff2f..f5e43c6adc 100644
  HEADERS += qgl.h \
             qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index db06a6a2a3..25c00ed17b 100644
+index 7004d7e854..a0b0bd81db 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
 @@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32

qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch

@@ -1,7 +1,7 @@
-From f541e6f3d425f2abd495f3964ed5e895e7719588 Mon Sep 17 00:00:00 2001
+From 987045e209769c2b4f8f48046167b5ef9106dd70 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.

qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch

@@ -1,7 +1,7 @@
-From 64e78255f007bf4949c440e3f6fb0bc48c467824 Mon Sep 17 00:00:00 2001
+From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
+Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -10,10 +10,10 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
  3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index b7e591d2ab..5abf0624f4 100644
+index f824f12bce..07abba9e5f 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3189,7 +3189,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
  }
  
  QString
@@ -22,7 +22,7 @@ index b7e591d2ab..5abf0624f4 100644
  {
      QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
      if (ret.isEmpty()) {
-@@ -3214,7 +3214,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
      if(fixify) {
          if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
              ret.prepend(project->first("DESTDIR").toQString());
@@ -36,10 +36,10 @@ index b7e591d2ab..5abf0624f4 100644
      return ret;
  }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index b5c150e1cb..afb0e91381 100644
+index 0535017ff6..b2f8b961c0 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
-@@ -89,7 +89,7 @@ protected:
+@@ -92,7 +92,7 @@ protected:
      virtual void writeDefaultVariables(QTextStream &t);
  
      QString pkgConfigPrefix() const;
@@ -49,10 +49,10 @@ index b5c150e1cb..afb0e91381 100644
      void writePkgConfigFile();   // for pkg-config
  
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index e0d03ccc1c..37eee7fca3 100644
+index 6046e5791e..87157f31ae 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -747,7 +747,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -751,7 +751,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                  }
                  if(!ret.isEmpty())
                      ret += "\n\t";

qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch

@@ -1,7 +1,7 @@
-From 8d4415f5c848f4cb291282842a5fe7fbca509d59 Mon Sep 17 00:00:00 2001
+From fdec0d79a76384fcefd55c06722380a2eccbbe22 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references

qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch

@@ -1,7 +1,7 @@
-From cbcce4bff865989e893dfc8979730050517ee69e Mon Sep 17 00:00:00 2001
+From a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
 
 qmake generates the pkgconfig .pc files two times, once for the
 release build and once for the debug build (which we're not actually
@@ -15,10 +15,10 @@ files for the debug build an unique file name.
  1 file changed, 3 insertions(+)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 5abf0624f4..a7f1285c26 100644
+index 07abba9e5f..e640fb8079 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3203,6 +3203,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
          if (dot != -1)
              ret = ret.left(dot);
      }

qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch

@@ -1,7 +1,7 @@
-From 4907c25ba7070ad0f58b038f0d4b9de904b17961 Mon Sep 17 00:00:00 2001
+From 95710d93c0d010afaa8ac7433b99827346bc011b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 08/33] Fix linking against shared/static libpng
+Subject: [PATCH 08/34] Fix linking against shared/static libpng
 
 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
@@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 0332631ec8..dbb6f708b0 100644
+index 89934c8f1d..9124e3e77e 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -308,8 +308,10 @@
+@@ -385,8 +385,10 @@
                  { "type": "pkgConfig", "args": "libpng" },
                  { "libs": "-llibpng16", "condition": "config.msvc" },
                  { "libs": "-llibpng", "condition": "config.msvc" },

qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch

@@ -1,7 +1,7 @@
-From 02a7c8481cb1d6f760307f34c6be4cd888fdc9ed Mon Sep 17 00:00:00 2001
+From 5c645a6510d3ac66a845b695c5e30c76944f22a0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 09/33] Fix linking against static D-Bus
+Subject: [PATCH 09/34] Fix linking against static D-Bus
 
 ---
  configure.json             | 9 +++++++--
@@ -9,17 +9,18 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/configure.json b/configure.json
-index 522bd34e9b..17446b6c21 100644
+index 9fce6d039e..c673f9a5fc 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -170,17 +170,22 @@
+@@ -169,18 +169,23 @@
+         "dbus": {
              "label": "D-Bus >= 1.2",
              "test": {
-                 "include": "dbus/dbus.h",
 -                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);"
 +                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);",
 +                "qmake": "static: DEFINES += DBUS_STATIC_BUILD"
              },
+             "headers": "dbus/dbus.h",
              "sources": [
                  { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
 +                {

qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch

@@ -1,7 +1,7 @@
-From 6f001ca09fe5bb1aca85a3f532489b3aa412cd2a Mon Sep 17 00:00:00 2001
+From 75d943609ad0a9814656ce151a353fb391b5df33 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
-Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
+Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
 
 Required for a debug build of Qt because mingw-w64-dbus
 does not contain debug version
@@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 17446b6c21..5b37371a7b 100644
+index c673f9a5fc..15b0f21e58 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -182,7 +182,7 @@

qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch

@@ -1,32 +1,30 @@
-From e3e5bfb055f8f25db2c098b35d8376e956eed80e Mon Sep 17 00:00:00 2001
+From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 11/33] Fix linking against static freetype2
+Subject: [PATCH 11/34] Fix linking against static freetype2
 
 ---
- src/gui/configure.json | 9 ++++++---
+ src/gui/configure.json | 7 +++++--
- 1 file changed, 6 insertions(+), 3 deletions(-)
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index dbb6f708b0..a7ffa0f113 100644
+index 9124e3e77e..f3628f415d 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -163,9 +163,12 @@
+@@ -237,8 +237,11 @@
-                 ]
              },
+             "headers": "ft2build.h",
              "sources": [
 -                { "type": "pkgConfig", "args": "freetype2" },
 -                { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
--                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
 +                { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" },
 +                { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
 +                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
-+                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "features.shared && config.wasm" }
+                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
-             ]
+             ],
-         },
+             "use": [
-         "fontconfig": {
 -- 
 2.20.1
 

qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch

@@ -1,19 +1,19 @@
-From 7c369864f7ef939dd0bdbc805fe0951429e27405 Mon Sep 17 00:00:00 2001
+From bdfd1226b5fcf7ede805676a2bb4bb8fbe047d6a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 12/33] Fix linking against static harfbuzz
+Subject: [PATCH 12/34] Fix linking against static harfbuzz
 
 ---
  src/gui/configure.json | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index a7ffa0f113..796cd5aaa7 100644
+index f3628f415d..b12a0e8ff2 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -227,7 +227,11 @@
+@@ -304,7 +304,11 @@
-                 ]
              },
+             "headers": "harfbuzz/hb.h",
              "sources": [
 -                "-lharfbuzz"
 +                { "type": "pkgConfig", "args": "--static --libs harfbuzz", "condition": "!features.shared" },

qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch

@@ -1,7 +1,7 @@
-From cffd6d5675635e1d2d170f31dc4b70013437db7c Mon Sep 17 00:00:00 2001
+From 52634efb9b9b2f3de1a2941297c7670ec7d4bdfc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 13/33] Fix linking against static pcre
+Subject: [PATCH 13/34] Fix linking against static pcre
 
 Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
@@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
  1 file changed, 4 insertions(+)
 
 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 908e7ff0d6..e5786a10cf 100644
+index bdaa2d3243..90f8250c03 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
 @@ -53,6 +53,10 @@

qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch

@@ -1,23 +1,22 @@
-From 23624432b529e988504650293351d77b5f19beb9 Mon Sep 17 00:00:00 2001
+From 6d8c6ce62a3a418cc30a6e3016eaf38ff945697b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
+Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
 
 Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
- src/plugins/sqldrivers/configure.json | 3 +++
+ src/plugins/sqldrivers/configure.json | 2 ++
- 1 file changed, 3 insertions(+)
+ 1 file changed, 2 insertions(+)
 
 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 4802d3b04d..fac6be7301 100644
+index cd20eef1df..babd0465ce 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
-@@ -69,6 +69,9 @@
+@@ -67,6 +67,8 @@
-                 "main": "mysql_get_client_version();"
              },
+             "headers": "mysql.h",
              "sources": [
 +                { "libs": "-lmariadbclient -lssl -lcrypto -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
-+                { "libs": "-Wl,-Bdynamic -lmariadb -Wl,-Bstatic", "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 },

qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch

@@ -1,25 +1,24 @@
-From 63e0fdf86c9ceaa4da247f35e7127cbab6a35c03 Mon Sep 17 00:00:00 2001
+From 0c7b1782160144c9a0839f02efd365716816400d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
 
 ---
- src/plugins/sqldrivers/configure.json | 5 +++--
+ src/plugins/sqldrivers/configure.json | 4 ++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index fac6be7301..305aac405c 100644
+index babd0465ce..b4b3bdec6b 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
-@@ -91,9 +91,10 @@
+@@ -88,9 +88,9 @@
-                 ]
              },
+             "headers": "libpq-fe.h",
              "sources": [
 -                { "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", "condition": "config.win32 && !features.shared" },
++                { "type": "psqlEnv", "libs": "-lpq -lintl -lssl -lcrypto -lshell32 -lws2_32 -lsecur32 -liconv", "condition": "config.win32 && !features.shared" },
-+                { "type": "psqlEnv", "libs": "-Wl,-Bdynamic -lpq -Wl,-Bstatic", "condition": "config.win32 && !features.shared" },
 +                { "type": "psqlEnv", "libs": "-lpq", "condition": "config.win32 && features.shared" },
                  { "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" }
              ]

qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch

@@ -1,7 +1,7 @@
-From b9f8213ea416663467061840443547a3b3412f9f Mon Sep 17 00:00:00 2001
+From c37572ff090abe65285eacaedf7e7022af92aae6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 16/33] Rename qtmain to qt5main
+Subject: [PATCH 16/34] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -53,7 +53,7 @@ index ecb167bf18..7c9368c3b3 100644
                  QMAKE_LIBS += -L$$QT.core.libs
              CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
 diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
-index 4140ae48de..9ae73db74b 100644
+index 61e9f29d23..a1795bf265 100644
 --- a/src/winmain/winmain.pro
 +++ b/src/winmain/winmain.pro
 @@ -2,7 +2,7 @@

qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch

@@ -1,7 +1,7 @@
-From df4107f83f185cb4b621c128da8cc893fdf3745a Mon Sep 17 00:00:00 2001
+From 901d666dd3a5609f40b5fce75620b9016660b4c5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
-Subject: [PATCH 17/33] Build dynamic host libraries
+Subject: [PATCH 17/34] Build dynamic host libraries
 
 This came initially from Fedora, not sure whether
 it makes sense to keep it. Regular Arch package

qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch

@@ -1,7 +1,7 @@
-From 1ca68e2ef175b6838027dc64bd5e32ff3c6eff29 Mon Sep 17 00:00:00 2001
+From 8ae9fed6ff5f5bf2e4c1d031baa7c03282268b35 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 18/33] Enable rpath for build tools
+Subject: [PATCH 18/34] Enable rpath for build tools
 
 - Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib

qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch

@@ -1,22 +1,24 @@
-From 773170ab38b995464a3ee5430c7e7f8fdc84fd8d Mon Sep 17 00:00:00 2001
+From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 19/33] Use system zlib for build tools
+Subject: [PATCH 19/34] Use system zlib for build tools
 
 ---
- src/tools/bootstrap/bootstrap.pro | 2 +-
+ src/tools/bootstrap/bootstrap.pro | 4 +++-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index 83e44ff9a4..6b1db38486 100644
+index 83e44ff9a4..4734623936 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -135,7 +135,7 @@ macx {
+@@ -135,7 +135,9 @@ macx {
          ../../corelib/io/qstandardpaths_win.cpp
  }
  
 -!qtConfig(system-zlib)|cross_compile {
-+!qtConfig(system-zlib) {
++cross_compile {
++    LIBS += -lz
++} else:!qtConfig(system-zlib) {
      include(../../3rdparty/zlib.pri)
  } else {
      CONFIG += no_core_dep

qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch

@@ -1,14 +1,14 @@
-From a73bf9a8194a2fdd68b531b501327cb72e6e2d36 Mon Sep 17 00:00:00 2001
+From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 20/33] Use *.dll.a as import lib extension
+Subject: [PATCH 20/34] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 mingw-w64 specific mkspec
 ---
  mkspecs/features/create_cmake.prf      |  5 +++--
- qmake/generators/win32/winmakefile.cpp | 17 ++++++++++++-----
+ qmake/generators/win32/winmakefile.cpp | 15 +++++++++++----
- 2 files changed, 15 insertions(+), 7 deletions(-)
+ 2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
 index e67917cc96..2a94964b49 100644
@@ -27,29 +27,27 @@ index e67917cc96..2a94964b49 100644
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 37eee7fca3..59b394ca51 100644
+index 87157f31ae..4592fed7b2 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
+@@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
  bool
  Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
  {
 -    ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS");
 -    if (impexts.isEmpty())
 -        impexts = project->values("QMAKE_EXTENSION_STATICLIB");
--    QList<QMakeLocalFileName> dirs;
++    ProStringList impexts;
-+  ProStringList impexts;
++    if (project->isActiveConfig("staticlib")) {
-+  if (project->isActiveConfig("staticlib")) {
++      impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
-+    impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
++    } else {
-+  } else {
++      impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
-+    impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
++      impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
-+    impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
++    }
-+  }
+     QList<QMakeLocalFileName> dirs;
-+  QList<QMakeLocalFileName> dirs;
+     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-   static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+         dirs.append(QMakeLocalFileName(dlib.toQString()));
-                                          "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
+@@ -255,9 +259,12 @@ void Win32MakefileGenerator::fixTargetExt()
-   for (int i = 0; lflags[i]; i++) {
-@@ -253,9 +257,12 @@ void Win32MakefileGenerator::fixTargetExt()
      if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
          project->values("TARGET_EXT").append(".exe");
      } else if (project->isActiveConfig("shared")) {

qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch

@@ -1,7 +1,7 @@
-From e362589c0413c036ee6c960f26a6aa610a085e2c Mon Sep 17 00:00:00 2001
+From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 21/33] Merge shared and static library trees
+Subject: [PATCH 21/34] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
 ---
@@ -13,7 +13,7 @@ Allow installation of shared and static build in the same prefix
  5 files changed, 51 insertions(+), 6 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index 64ed6b9ed8..2cc54d15a2 100644
+index b3b3e27c44..3136889a2f 100644
 --- a/configure.pri
 +++ b/configure.pri
 @@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) {
@@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644
  
  !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index d16b3cf1be..2c4d6cd97e 100644
+index 5da82fdb5b..5b05aa9e2a 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -268,6 +268,23 @@ for(ever) {
+@@ -246,6 +246,23 @@ for(ever) {
              !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                  WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
          }
@@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a7f1285c26..879410afef 100644
+index e640fb8079..fc7f729ae6 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3206,6 +3206,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
      if (project->isActiveConfig("debug")) {
          ret += "d";
      }
@@ -114,7 +114,7 @@ index a7f1285c26..879410afef 100644
      ret += Option::pkgcfg_ext;
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
-@@ -3380,9 +3383,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile()
      t << endl;
  
      // requires

qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch

@@ -1,7 +1,7 @@
-From c7c3618a348b9cfc480f13bfb494dd6637035886 Mon Sep 17 00:00:00 2001
+From 7f561d87a70af23d5d2a0c89e08ba5744b2f9585 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
+Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules
 
 When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
@@ -251,10 +251,10 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 879410afef..2ff4c4f714 100644
+index fc7f729ae6..095b4d2720 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -1016,10 +1016,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
+@@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
              libs << "LIBS" << "QMAKE_LIBS";
          else
              libs << "LIBS" << "LIBS_PRIVATE" << "QMAKE_LIBS" << "QMAKE_LIBS_PRIVATE";

qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch

@@ -1,7 +1,7 @@
-From 7162658d8ae5a73ed35cd24287bae6c43be6cb93 Mon Sep 17 00:00:00 2001
+From c49f1674465685e03c0d95b869d6cea45dcf5447 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
-Subject: [PATCH 23/33] Allow usage of static version with CMake
+Subject: [PATCH 23/34] Allow usage of static version with CMake
 
 Allow selecting between dynamic and static Qt versions
 installed in the same prefix

qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch

@@ -1,7 +1,7 @@
-From 9dbcc3874c61328503a15641bea40e3d28c082e6 Mon Sep 17 00:00:00 2001
+From 5decd2ed0bdfafd01c119357c73fc91e470b9f61 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
-Subject: [PATCH 24/33] Adjust linker flags for static build with
+Subject: [PATCH 24/34] Adjust linker flags for static build with
  cmake/mingw-w64
 
 Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d

qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch

@@ -1,17 +1,17 @@
-From 6e5853cf115c82c9162811fad6d205e674676607 Mon Sep 17 00:00:00 2001
+From 9a0c4a937083e14ad32a8a25feb92333b5015dda Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 25/33] Use correct pkg-config --static flag
+Subject: [PATCH 25/34] Use correct pkg-config --static flag
 
 ---
  configure.pri | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.pri b/configure.pri
-index 2cc54d15a2..449fe4b9b8 100644
+index 3136889a2f..601629c047 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -329,6 +329,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) {
              qtLog("Found pkg-config from path: $$pkgConfig")
          }
      }

qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch

@@ -1,7 +1,7 @@
-From b7d5d4387f485ac954b6e3381f5bad3e3d8bf573 Mon Sep 17 00:00:00 2001
+From ad4a59bd142b2b3ab402ed8d0337ac972f77e76c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic
 
 * Otherwise the arguments aren't passed correctly leading to errors like
   ```

qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch

@@ -1,7 +1,7 @@
-From ecd411d7f3b7e845a0a5feadd3a79998a18dc097 Mon Sep 17 00:00:00 2001
+From a17249171793a58d2a0308879e96465e96c362f1 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 27/33] Ignore errors about missing feature static
+Subject: [PATCH 27/34] Ignore errors about missing feature static
 
 Not sure why this error occurs, let's hope for the best
 ---

qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch

@@ -1,33 +1,19 @@
-From e7e68d743e1aaf534374c5602bf6fc458b40dbd3 Mon Sep 17 00:00:00 2001
+From 94bf26c2b8ae87dc5add63ef4df8b765e4067651 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 28/33] Enable and fix use of iconv
+Subject: [PATCH 28/34] Enable and fix use of iconv
 
 Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
 ---
- config.tests/gnu-libiconv/gnu-libiconv.cpp | 2 +-
+ src/corelib/codecs/qiconvcodec.cpp | 7 +++----
- src/corelib/codecs/qiconvcodec.cpp         | 7 +++----
+ src/corelib/configure.json         | 6 +++---
- src/corelib/configure.json                 | 4 ++--
+ 2 files changed, 6 insertions(+), 7 deletions(-)
- 3 files changed, 6 insertions(+), 7 deletions(-)
 
-diff --git a/config.tests/gnu-libiconv/gnu-libiconv.cpp b/config.tests/gnu-libiconv/gnu-libiconv.cpp
-index fe4b87b923..be4236436f 100644
---- a/config.tests/gnu-libiconv/gnu-libiconv.cpp
-+++ b/config.tests/gnu-libiconv/gnu-libiconv.cpp
-@@ -43,7 +43,7 @@ int main(int, char **)
- {
-     iconv_t x = iconv_open("", "");
- 
--    const char *inp;
-+    char *inp;
-     char *outp;
-     size_t inbytes, outbytes;
-     iconv(x, &inp, &inbytes, &outp, &outbytes);
 diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp
-index 330eb7c038..88a782b863 100644
+index 9c39727946..cc14036b25 100644
 --- a/src/corelib/codecs/qiconvcodec.cpp
 +++ b/src/corelib/codecs/qiconvcodec.cpp
-@@ -49,7 +49,6 @@ QT_REQUIRE_CONFIG(iconv);
+@@ -47,7 +47,6 @@
  #include <errno.h>
  #include <locale.h>
  #include <stdio.h>
@@ -35,7 +21,7 @@ index 330eb7c038..88a782b863 100644
  
  // unistd.h is needed for the _XOPEN_UNIX macro
  #include <unistd.h>
-@@ -182,7 +181,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState
+@@ -180,7 +179,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState
      IconvState *state = *pstate;
      size_t inBytesLeft = len;
      // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
@@ -44,7 +30,7 @@ index 330eb7c038..88a782b863 100644
      // GNU doesn't disagree with POSIX :/
      const char *inBytes = chars;
  #else
-@@ -281,7 +280,7 @@ static bool setByteOrder(iconv_t cd)
+@@ -279,7 +278,7 @@ static bool setByteOrder(iconv_t cd)
      size_t outBytesLeft = sizeof buf;
      size_t inBytesLeft = sizeof bom;
  
@@ -53,7 +39,7 @@ index 330eb7c038..88a782b863 100644
      const char **inBytesPtr = const_cast<const char **>(&inBytes);
  #else
      char **inBytesPtr = &inBytes;
-@@ -303,7 +302,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
+@@ -301,7 +300,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
      char *outBytes;
      size_t inBytesLeft;
  
@@ -63,10 +49,19 @@ index 330eb7c038..88a782b863 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index 183eb3a13e..a4560d5a60 100644
+index a22a7459bd..b7ed2f7281 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
-@@ -532,9 +532,9 @@
+@@ -71,7 +71,7 @@
+             "test": {
+                 "main": [
+                     "iconv_t x = iconv_open(\"\", \"\");",
+-                    "const char *inp;",
++                    "char *inp;",
+                     "char *outp;",
+                     "size_t inbytes, outbytes;",
+                     "iconv(x, &inp, &inbytes, &outp, &outbytes);",
+@@ -615,9 +615,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",

qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch

@@ -1,7 +1,7 @@
-From 9764fb74d779be675d8cd6d1193bf3efb93ff2a7 Mon Sep 17 00:00:00 2001
+From 93dcee644f3059e381310bd0e4f905caeebfa05b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 29/33] Ignore failing pkg-config test
+Subject: [PATCH 29/34] Ignore failing pkg-config test
 
 Didn't investigate why it fails, let's hope for the best
 ---
@@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
  1 file changed, 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 5b37371a7b..ac98495157 100644
+index 15b0f21e58..46cc841148 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -646,7 +646,6 @@
+@@ -660,7 +660,6 @@
          "pkg-config": {
              "label": "Using pkg-config",
              "autoDetect": "!config.darwin && !config.win32",

qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch

@@ -1,7 +1,7 @@
-From c2951c79c8a228443daecfbc1683eee516412a01 Mon Sep 17 00:00:00 2001
+From e917a88d58047cdb3fb46c1b07fb78648bf74358 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies
 
 In particular, it messes resolving cyclic dependency between
 static freetype2 and harfbuzz
@@ -11,7 +11,7 @@ static freetype2 and harfbuzz
  2 files changed, 6 insertions(+)
 
 diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 50ec8db79e..50789b3b9c 100644
+index 4cbe06d9dc..47535f60d5 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
 @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
@@ -25,19 +25,19 @@ index 50ec8db79e..50789b3b9c 100644
      int libidx = 0, fwidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 59b394ca51..7788862142 100644
+index 4592fed7b2..b93d0df473 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
-     impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
+       impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
-     impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
+       impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
-   }
+     }
-+  if(project->isActiveConfig("staticlib")) {
++    if(project->isActiveConfig("staticlib")) {
-+    return false; // prevent qmake from messing static lib dependencies
++        return false; // prevent qmake from messing static lib dependencies
-+  }
++    }
-   QList<QMakeLocalFileName> dirs;
+     QList<QMakeLocalFileName> dirs;
-   static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-                                          "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
+         dirs.append(QMakeLocalFileName(dlib.toQString()));
 -- 
 2.20.1
 

qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch

@@ -1,7 +1,7 @@
-From b807729780fedcfd3848c7911ced8bd7913bb045 Mon Sep 17 00:00:00 2001
+From fe25b3abe19208154631b6315587fce9bacc4991 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
+Subject: [PATCH 31/34] Hardcode linker flags for platform plugins
 
 Otherwise incorrect order of libs leads to errors
 when building libqminimal.dll, libqoffscreen.dll
@@ -14,7 +14,7 @@ and libqwindows.dll
  4 files changed, 73 insertions(+), 18 deletions(-)
 
 diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro
-index 3bfd02bdc8..4732f89920 100644
+index 9764272632..7310958323 100644
 --- a/src/plugins/platforms/direct2d/direct2d.pro
 +++ b/src/plugins/platforms/direct2d/direct2d.pro
 @@ -1,12 +1,32 @@
@@ -53,8 +53,8 @@ index 3bfd02bdc8..4732f89920 100644
 +LIBS += -lQt5WindowsUIAutomationSupport
 +INCLUDEPATH += $$QT_SOURCE_TREE/include/Qt5WindowsUIAutomationSupport/$${QT_VERSION}
  
- LIBS += -ldwmapi -ld2d1 -ld3d11 -ldwrite -lversion -lgdi32
+ LIBS += -ldwmapi -lversion -lgdi32
- 
+ QMAKE_USE_PRIVATE += dwrite_1 d2d1_1 d3d11_1 dxgi1_2
 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
 index a1a2da547b..7ef91b574d 100644
 --- a/src/plugins/platforms/minimal/minimal.pro

qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch

@@ -1,7 +1,7 @@
-From d5cc5a64db0f04a4245febec2e4dae4dc1986d2a Mon Sep 17 00:00:00 2001
+From 1cd9a4e98c177d3b794f2c0549b6f74ddf0e6e65 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
-Subject: [PATCH 32/33] Fix linking against static plugins with qmake
+Subject: [PATCH 32/34] Fix linking against static plugins with qmake
 
 Required because qtConfig(static) does not work
 with 'Merge shared and static library trees'
@@ -11,7 +11,7 @@ approach
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 2c4d6cd97e..a15ab81899 100644
+index 5b05aa9e2a..2732c94797 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
 @@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d

qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch

@@ -1,7 +1,7 @@
-From de2c6c9f865840b96921298c45171e71a8825227 Mon Sep 17 00:00:00 2001
+From b26414fad10e9ff16f305b3484670260e07df70e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 May 2018 03:47:14 +0200
-Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
+Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -19,7 +19,7 @@ during RTL pass: ira
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
-index 23e5e499b2..12030eba08 100644
+index 6195c324e7..480af00ebc 100644
 --- a/src/corelib/global/qrandom.cpp
 +++ b/src/corelib/global/qrandom.cpp
 @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando

qt5-base/mingw-w64-dynamic/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch

@@ -0,0 +1,37 @@
+From 62ddbd09af7ddeb08d21ccbaf2c8724a12c52ef6 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 3 Feb 2019 14:34:42 +0100
+Subject: [PATCH 34/34] Prevent static build to prefer dynamic libraries
+
+The static build should not attempt to link against dynamic libraries
+in order to get a fully statically linked binary in the end.
+---
+ mkspecs/features/qt_configure.prf | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
+index c45439c3ef..7953cdd19e 100644
+--- a/mkspecs/features/qt_configure.prf
++++ b/mkspecs/features/qt_configure.prf
+@@ -541,12 +541,12 @@ defineTest(qtConfResolveLibs) {
+                 # Under Windows, we look only for static libraries, as even for DLLs
+                 # one actually links against a static import library.
+                 mingw {
+-                    lcan += \
+-                        # MinGW supports UNIX-style library naming in addition to
+-                        # the MSVC style.
+-                        lib$${lib}.dll.a lib$${lib}.a \
+-                        # Fun fact: prefix-less libraries are also supported.
+-                        $${lib}.dll.a $${lib}.a
++                    # prefer (import) libraries for dynamic linking unless we're doing a
++                    # static build where we solely rely on presence of static libraries
++                    shared {
++                        lcan += $${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_IMPORTLIB} $${lib}.$${QMAKE_EXTENSION_IMPORTLIB}
++                    }
++                    lcan += $${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB} $${lib}.$${QMAKE_EXTENSION_STATICLIB}
+                 }
+                 lcan += $${lib}.lib
+             }
+-- 
+2.20.1
+

qt5-base/mingw-w64-dynamic/PKGBUILD

@@ -36,8 +36,8 @@ isNoOpenGL() {
 }
 
 pkgname=mingw-w64-qt5-base-dynamic
-pkgver=5.12.0
+pkgver=5.12.1
-pkgrel=2
+pkgrel=1
 pkgdesc='A cross-platform application and UI framework (mingw-w64)'
 # The static variant doesn't contain any executables which need to be executed on the build machine
 isStatic && arch=('any') || arch=('i686' 'x86_64')
@@ -84,41 +84,43 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch'
         '0031-Hardcode-linker-flags-for-platform-plugins.patch'
         '0032-Fix-linking-against-static-plugins-with-qmake.patch'
-        '0033-Disable-hardware-randomizer-for-32-bit.patch')
+        '0033-Disable-hardware-randomizer-for-32-bit.patch'
-sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb'
+        '0034-Prevent-static-build-to-prefer-dynamic-libraries.patch')
-            '9ec51628c255573f7c243efa23957fb0eaae7051e2e8f14c80004b53113843dd'
+sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049'
-            '0d78f4826dd41c4d6ee7d095c8f35b3546655d375fca0ece7974ed0cfd61b4ec'
+            '4e1dbb878b77dbba96a9564ecbded6dbd74482b52e1cf4becaa1ce741c8cf489'
-            '44679f37ed58b22297f7666e798c8f099af665ceb0725edf94ca5250f56df60b'
+            'f54815ff2fede9dbdc0ade572305ff684940714ca65e76d25f5b15cd0cb0a3da'
-            'bed019caedb56d1e9949bf227c17f3c62cf3f929e2ac5960f989ebd09031f70a'
+            'c60e6cef5d0c95b6d034ade75fde3cf150e1570f5ca62d6b32d942abcb937f86'
-            '6591e1b6df919bd0054fc60c5cbef0ce9c5c99e7e792003af3337e6b58c17a5e'
+            '0a82cde28edae5abb8d624cea407db515c1d52e8963f07aa8430c1d1f810e54a'
-            'c70a8fe8243225d44532834eba25c849276131152791dd9c3f505ad3a07bd91e'
+            '39059ed786851c1cdf416c4d0a9a5b042edda83bddd03b5bfcbcae1eaf8f7694'
-            'ea17823807394adbffc74ef9a61613c7b134072ed081b370ecc9d0f1e0d61525'
+            '4ef83cf4d211c446a5715cfa422f130492ae18bfb5cb42db9ff6516ed7fb29f1'
-            'a19b79876793858af82c4f52fa3756d297059968b30b9e3a99c874ef5edd86d5'
+            '48ee96ffc01d5ab7c648f4aae6cee286992e4eb406e48718058092206f8ad2eb'
-            '93803937c9d3d79738bd9098cadbc652d92811356d33cbc5694fd86636ea2cd6'
+            '58f27f2359b3571aac44a3770a705692eed9e6fd24b6e6bf730e7aad5ee4a030'
-            '07e5c641133c796ec10cb2259deb05e2c73e79d6dca61306c57c26be941de357'
+            'cf6154d83655efbf30281c4f83d29feb252fd104849f8e2ad495da688e581314'
-            'e737d0aaf73aeed0926420632718469549f339ba9246330232b4e0a7c2590542'
+            'edf080092f4d158d2e42cedd50f80b3b5715ae47f740b16fa43132f1dc68cf9d'
-            '99538cd36fbf5b850125b1f887bca7d9f244c00b1b1647251dd46576da666aa4'
+            '1c3c46c26809e59e91732d2ff082a445dac4986294f400277272c2337d8c21f3'
-            '95b5da98388f36a10a811d9c11edb9ffecaaefeec55cd2d7dc33420410fcc691'
+            '3ee7b4f4ed6ea86794a5d119c7000033d0f61208150e37f35428e52611f7ae3f'
-            'b47c7760212833986820cce8face4eb3fe4a3a0f50dd89d9151fe59d771e18a3'
+            '1d18e225c4bda89fe024a47834a8b79d9c8e4d1ba884d7dc6b07a93bf0307a85'
-            '609dfac8f60be7cc425638d1f5671a4a22cd8985ee5f08571444e6acae823a74'
+            '2affe7ac03016cfd536f63d61c0f5bd42932fc3823b7f2dbabca9c2db5a53ae6'
-            'f58260547b4ed3a5f43fd4fc6b4b7716b9c4f8355ce00c89931e54763f88e5f9'
+            'd0a2e33d20c4d6063f7546fbc84d2f6a5a96955f998ba7af4320bc005fa2a722'
-            'e5bf5056b223f0fe6edd6326fc9a360428fdbfff22930090d5b5d192d50733ec'
+            '9941e9c883496bb3409a12ef3f73b6f3d76e106061381deb74380eafb1ac472f'
-            'f8dd5e4f49b342ce4c5df2c677ecc63ea8df2730dd2101181a7ed56ff6b9ecaa'
+            'f336402daf227aa529080ab31612a205c936438ecbfab3627252164d8903c1b1'
-            'e497ff375a28d1d87f7b6d04c099df65fdb54bb6a4eb9fe4c638a042731cab61'
+            '8cf716c22bf0fface6e3c015cd4d621425e3b20771b15ab03eeeeb59db248756'
-            'c9122faeabd32285c5c1ed58d34ee52ae2b429089eb2d34a1d0ee2f017c57de1'
+            '95f9847a1fe05ad78ae4a682208894d995becc0ca4f3463d39781e8a52543017'
-            '2d249396a381c3b6348258ebcc52afc8d1be0a3f48554952ff0632c674c7dfde'
+            '132fc790cfa528063fe95c3bc104826cb82105cd24e05ed77593115212987dc3'
-            'a384a727dce6c1b823eb43d16a139d49835c7b9772b39e8ad0ff53ca3a2d4f02'
+            '8ace42d2ec1b7a05a6bacf93f899775906c407f349efbbd2533b942fb474f200'
-            'd52dc5d9c0d7e58c08e42e84d8c566604137f95d036b324320f71b1fd34abeb8'
+            '8849864de4abf2dd70ffe2fe70aabb608c296eccdc41e6f4061645bd39f63c50'
-            '3eae353c8dde508f328cdbb245c93423b365a414b3007b5720abb0396d053830'
+            '60ca9adfe6ae46d6dc7b4874c3202b46bc57f6649a45fb5301e4e4b63e70aa5e'
-            '6a8f2a7a70f2f06ecbbfb7cae9f5728b7cdad19c9bd9496064c9440cf22df96d'
+            '47f83f04256afe1bd8701c31673e00e445b65840b5fe2bd132a98c8f292aa9c4'
-            'bdcdb320de3b6da2925ca1ad76edf14ace5b2a1a51fbfc7ae9c89574a57c146c'
+            '305b30fad80fba756bd3ad6c34c95030fc3927d52a3dc9b90d2705b390831734'
-            'e00e00695e9db071bea0c6f214d3561a58114b9211a8ffa94f09398bb2147b2a'
+            '91f37e9098e78881c1953c85e592e108be27dae08a83278f4a9885cb296a6871'
-            'bd0f5cfe2cf38218b12f979223b3286a6ae16fb17feb561695df0f155dd61a73'
+            '9ca5f2175d8679b7312d8cb718ddc648e161a6aae631b5d4c9e528594a020d1a'
-            'c41798441c49d3eb30d87fe5a2aae5d5a957e4694d76d1f6d11f8a926fd2c857'
+            '3a5619542cb549ba7cc2bf1f9b77d524e5f9aa78d1e8dea6cd75c4f09b6aabc9'
-            'aac08c720053c206845bf0ee54c4ef833d7f3481d32522c23ece7b790f89af7d'
+            'e30cf84af1ff7764cb0e0644a7bfbde920f463af9c24aab53abef9cf3410ceb3'
-            '301dfe13ab0dca5fc99f0a9ed9c62d145bf7e76ce1afe60adbbd0b7ec86d6ce3'
+            'fdd36ed82c5a8df7a0157b4ce9a3be16ec4c2b98cdf071a2be662603045da652'
-            'd90088ce7f2fe633a9b46a4cfd097044bffc6c8e03d9244f08b82328b0b83737'
+            '55b42d68ca7981ef777a7f081f840b1b80ada8c0dc9508092ec9fba151a88dfd'
-            '7f9393c25dd4a4cd1fec292a8dbf98708990719d9dca8ca7d00b96d78d61969f')
+            '06f98f6ce25da7010e7398111ee7b79f380b79a7ab125eba3ef6d051af92cf8a'
+            '5a097dc80dc07aa755e77c50a469c3c08bf5b562ad9b116dbbf891a072e7bdc2'
+            '66047e08db2282d69563b3081b847fa7c041c3c387ab00ca72ff481b91124925')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -165,10 +167,10 @@ prepare() {
   CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
   LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed}"
   sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
-         -e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|"\
+         -e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \
          -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
     mkspecs/common/gcc-base.conf
-  sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|" \
+  sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1|" \
     mkspecs/common/g++-unix.conf
 }
 
@@ -344,6 +346,11 @@ package() {
       # keep a couple pri files not found in base
       mv "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules/qt_plugin_"*.pri "${pkgdir}/usr/${_arch}"
 
+      # fix bad library order for static CMake builds caused by Qt5Gui.static.prl
+      sed -i -e "s|-lfreetype;|-lfreetype;-lharfbuzz;-lfreetype;-lbz2;|" \
+             -e "s| -lz;| |" \
+                "${pkgdir}/usr/${_arch}/lib/Qt5Gui.static.prl"
+
       # delete duplicate files that are in the base package
       rm -fR "${pkgdir}/usr/${_arch}/"{include,share}
       rm -fR "${pkgdir}/usr/${_arch}/lib/"{qt/bin,qt/mkspecs}

qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch

@@ -1,7 +1,7 @@
-From ebb6744032ebe7ff6541ef1f1febe8c57a2a84c9 Mon Sep 17 00:00:00 2001
+From 2ac45582566cb492858de99cf06cabf2fa575e30 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
+Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with
  mingw-w64
 
 Adding a new, separate mkspec instead of patching the existing one

qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch

@@ -1,7 +1,7 @@
-From 23c62d9404fec91a2dbc4fd249c24ac414c95150 Mon Sep 17 00:00:00 2001
+From 1083693a799b03cde91c83ff25d890640c01d780 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---

qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch

@@ -1,7 +1,7 @@
-From 089a61fec96026f45584062423b2a09e757d654b Mon Sep 17 00:00:00 2001
+From 0be0cdb753a85725e603a02ada330cc9fd2c161e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/33] Use external ANGLE library
+Subject: [PATCH 03/34] Use external ANGLE library
 
 ---
  src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
@@ -66,7 +66,7 @@ index 8b2349ff2f..f5e43c6adc 100644
  HEADERS += qgl.h \
             qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index db06a6a2a3..25c00ed17b 100644
+index 7004d7e854..a0b0bd81db 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
 @@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32

qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch

@@ -1,7 +1,7 @@
-From f541e6f3d425f2abd495f3964ed5e895e7719588 Mon Sep 17 00:00:00 2001
+From 987045e209769c2b4f8f48046167b5ef9106dd70 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.

qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch

@@ -1,7 +1,7 @@
-From 64e78255f007bf4949c440e3f6fb0bc48c467824 Mon Sep 17 00:00:00 2001
+From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
+Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -10,10 +10,10 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
  3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index b7e591d2ab..5abf0624f4 100644
+index f824f12bce..07abba9e5f 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3189,7 +3189,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
  }
  
  QString
@@ -22,7 +22,7 @@ index b7e591d2ab..5abf0624f4 100644
  {
      QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
      if (ret.isEmpty()) {
-@@ -3214,7 +3214,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
      if(fixify) {
          if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
              ret.prepend(project->first("DESTDIR").toQString());
@@ -36,10 +36,10 @@ index b7e591d2ab..5abf0624f4 100644
      return ret;
  }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index b5c150e1cb..afb0e91381 100644
+index 0535017ff6..b2f8b961c0 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
-@@ -89,7 +89,7 @@ protected:
+@@ -92,7 +92,7 @@ protected:
      virtual void writeDefaultVariables(QTextStream &t);
  
      QString pkgConfigPrefix() const;
@@ -49,10 +49,10 @@ index b5c150e1cb..afb0e91381 100644
      void writePkgConfigFile();   // for pkg-config
  
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index e0d03ccc1c..37eee7fca3 100644
+index 6046e5791e..87157f31ae 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -747,7 +747,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -751,7 +751,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                  }
                  if(!ret.isEmpty())
                      ret += "\n\t";

qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch

@@ -1,7 +1,7 @@
-From 8d4415f5c848f4cb291282842a5fe7fbca509d59 Mon Sep 17 00:00:00 2001
+From fdec0d79a76384fcefd55c06722380a2eccbbe22 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references

qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch

@@ -1,7 +1,7 @@
-From cbcce4bff865989e893dfc8979730050517ee69e Mon Sep 17 00:00:00 2001
+From a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
 
 qmake generates the pkgconfig .pc files two times, once for the
 release build and once for the debug build (which we're not actually
@@ -15,10 +15,10 @@ files for the debug build an unique file name.
  1 file changed, 3 insertions(+)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 5abf0624f4..a7f1285c26 100644
+index 07abba9e5f..e640fb8079 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3203,6 +3203,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
          if (dot != -1)
              ret = ret.left(dot);
      }

qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch

@@ -1,7 +1,7 @@
-From 4907c25ba7070ad0f58b038f0d4b9de904b17961 Mon Sep 17 00:00:00 2001
+From 95710d93c0d010afaa8ac7433b99827346bc011b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 08/33] Fix linking against shared/static libpng
+Subject: [PATCH 08/34] Fix linking against shared/static libpng
 
 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
@@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 0332631ec8..dbb6f708b0 100644
+index 89934c8f1d..9124e3e77e 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -308,8 +308,10 @@
+@@ -385,8 +385,10 @@
                  { "type": "pkgConfig", "args": "libpng" },
                  { "libs": "-llibpng16", "condition": "config.msvc" },
                  { "libs": "-llibpng", "condition": "config.msvc" },

qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch

@@ -1,7 +1,7 @@
-From 02a7c8481cb1d6f760307f34c6be4cd888fdc9ed Mon Sep 17 00:00:00 2001
+From 5c645a6510d3ac66a845b695c5e30c76944f22a0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 09/33] Fix linking against static D-Bus
+Subject: [PATCH 09/34] Fix linking against static D-Bus
 
 ---
  configure.json             | 9 +++++++--
@@ -9,17 +9,18 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/configure.json b/configure.json
-index 522bd34e9b..17446b6c21 100644
+index 9fce6d039e..c673f9a5fc 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -170,17 +170,22 @@
+@@ -169,18 +169,23 @@
+         "dbus": {
              "label": "D-Bus >= 1.2",
              "test": {
-                 "include": "dbus/dbus.h",
 -                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);"
 +                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);",
 +                "qmake": "static: DEFINES += DBUS_STATIC_BUILD"
              },
+             "headers": "dbus/dbus.h",
              "sources": [
                  { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
 +                {

qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch

@@ -1,7 +1,7 @@
-From 6f001ca09fe5bb1aca85a3f532489b3aa412cd2a Mon Sep 17 00:00:00 2001
+From 75d943609ad0a9814656ce151a353fb391b5df33 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
-Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
+Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
 
 Required for a debug build of Qt because mingw-w64-dbus
 does not contain debug version
@@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 17446b6c21..5b37371a7b 100644
+index c673f9a5fc..15b0f21e58 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -182,7 +182,7 @@

qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch

@@ -1,32 +1,30 @@
-From e3e5bfb055f8f25db2c098b35d8376e956eed80e Mon Sep 17 00:00:00 2001
+From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 11/33] Fix linking against static freetype2
+Subject: [PATCH 11/34] Fix linking against static freetype2
 
 ---
- src/gui/configure.json | 9 ++++++---
+ src/gui/configure.json | 7 +++++--
- 1 file changed, 6 insertions(+), 3 deletions(-)
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index dbb6f708b0..a7ffa0f113 100644
+index 9124e3e77e..f3628f415d 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -163,9 +163,12 @@
+@@ -237,8 +237,11 @@
-                 ]
              },
+             "headers": "ft2build.h",
              "sources": [
 -                { "type": "pkgConfig", "args": "freetype2" },
 -                { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
--                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
 +                { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" },
 +                { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
 +                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
-+                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "features.shared && config.wasm" }
+                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
-             ]
+             ],
-         },
+             "use": [
-         "fontconfig": {
 -- 
 2.20.1
 

qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch

@@ -1,19 +1,19 @@
-From 7c369864f7ef939dd0bdbc805fe0951429e27405 Mon Sep 17 00:00:00 2001
+From bdfd1226b5fcf7ede805676a2bb4bb8fbe047d6a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 12/33] Fix linking against static harfbuzz
+Subject: [PATCH 12/34] Fix linking against static harfbuzz
 
 ---
  src/gui/configure.json | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index a7ffa0f113..796cd5aaa7 100644
+index f3628f415d..b12a0e8ff2 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -227,7 +227,11 @@
+@@ -304,7 +304,11 @@
-                 ]
              },
+             "headers": "harfbuzz/hb.h",
              "sources": [
 -                "-lharfbuzz"
 +                { "type": "pkgConfig", "args": "--static --libs harfbuzz", "condition": "!features.shared" },

qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch

@@ -1,7 +1,7 @@
-From cffd6d5675635e1d2d170f31dc4b70013437db7c Mon Sep 17 00:00:00 2001
+From 52634efb9b9b2f3de1a2941297c7670ec7d4bdfc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 13/33] Fix linking against static pcre
+Subject: [PATCH 13/34] Fix linking against static pcre
 
 Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
@@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
  1 file changed, 4 insertions(+)
 
 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 908e7ff0d6..e5786a10cf 100644
+index bdaa2d3243..90f8250c03 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
 @@ -53,6 +53,10 @@

qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch

@@ -1,23 +1,22 @@
-From 23624432b529e988504650293351d77b5f19beb9 Mon Sep 17 00:00:00 2001
+From 6d8c6ce62a3a418cc30a6e3016eaf38ff945697b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
+Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
 
 Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
- src/plugins/sqldrivers/configure.json | 3 +++
+ src/plugins/sqldrivers/configure.json | 2 ++
- 1 file changed, 3 insertions(+)
+ 1 file changed, 2 insertions(+)
 
 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 4802d3b04d..fac6be7301 100644
+index cd20eef1df..babd0465ce 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
-@@ -69,6 +69,9 @@
+@@ -67,6 +67,8 @@
-                 "main": "mysql_get_client_version();"
              },
+             "headers": "mysql.h",
              "sources": [
 +                { "libs": "-lmariadbclient -lssl -lcrypto -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
-+                { "libs": "-Wl,-Bdynamic -lmariadb -Wl,-Bstatic", "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 },

qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch

@@ -1,25 +1,24 @@
-From 63e0fdf86c9ceaa4da247f35e7127cbab6a35c03 Mon Sep 17 00:00:00 2001
+From 0c7b1782160144c9a0839f02efd365716816400d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
 
 ---
- src/plugins/sqldrivers/configure.json | 5 +++--
+ src/plugins/sqldrivers/configure.json | 4 ++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index fac6be7301..305aac405c 100644
+index babd0465ce..b4b3bdec6b 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
-@@ -91,9 +91,10 @@
+@@ -88,9 +88,9 @@
-                 ]
              },
+             "headers": "libpq-fe.h",
              "sources": [
 -                { "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", "condition": "config.win32 && !features.shared" },
++                { "type": "psqlEnv", "libs": "-lpq -lintl -lssl -lcrypto -lshell32 -lws2_32 -lsecur32 -liconv", "condition": "config.win32 && !features.shared" },
-+                { "type": "psqlEnv", "libs": "-Wl,-Bdynamic -lpq -Wl,-Bstatic", "condition": "config.win32 && !features.shared" },
 +                { "type": "psqlEnv", "libs": "-lpq", "condition": "config.win32 && features.shared" },
                  { "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" }
              ]

qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch

@@ -1,7 +1,7 @@
-From b9f8213ea416663467061840443547a3b3412f9f Mon Sep 17 00:00:00 2001
+From c37572ff090abe65285eacaedf7e7022af92aae6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 16/33] Rename qtmain to qt5main
+Subject: [PATCH 16/34] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -53,7 +53,7 @@ index ecb167bf18..7c9368c3b3 100644
                  QMAKE_LIBS += -L$$QT.core.libs
              CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
 diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
-index 4140ae48de..9ae73db74b 100644
+index 61e9f29d23..a1795bf265 100644
 --- a/src/winmain/winmain.pro
 +++ b/src/winmain/winmain.pro
 @@ -2,7 +2,7 @@

qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch

@@ -1,7 +1,7 @@
-From df4107f83f185cb4b621c128da8cc893fdf3745a Mon Sep 17 00:00:00 2001
+From 901d666dd3a5609f40b5fce75620b9016660b4c5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
-Subject: [PATCH 17/33] Build dynamic host libraries
+Subject: [PATCH 17/34] Build dynamic host libraries
 
 This came initially from Fedora, not sure whether
 it makes sense to keep it. Regular Arch package

qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch

@@ -1,7 +1,7 @@
-From 1ca68e2ef175b6838027dc64bd5e32ff3c6eff29 Mon Sep 17 00:00:00 2001
+From 8ae9fed6ff5f5bf2e4c1d031baa7c03282268b35 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 18/33] Enable rpath for build tools
+Subject: [PATCH 18/34] Enable rpath for build tools
 
 - Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib

qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch

@@ -1,22 +1,24 @@
-From 773170ab38b995464a3ee5430c7e7f8fdc84fd8d Mon Sep 17 00:00:00 2001
+From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 19/33] Use system zlib for build tools
+Subject: [PATCH 19/34] Use system zlib for build tools
 
 ---
- src/tools/bootstrap/bootstrap.pro | 2 +-
+ src/tools/bootstrap/bootstrap.pro | 4 +++-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index 83e44ff9a4..6b1db38486 100644
+index 83e44ff9a4..4734623936 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -135,7 +135,7 @@ macx {
+@@ -135,7 +135,9 @@ macx {
          ../../corelib/io/qstandardpaths_win.cpp
  }
  
 -!qtConfig(system-zlib)|cross_compile {
-+!qtConfig(system-zlib) {
++cross_compile {
++    LIBS += -lz
++} else:!qtConfig(system-zlib) {
      include(../../3rdparty/zlib.pri)
  } else {
      CONFIG += no_core_dep

qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch

@@ -1,14 +1,14 @@
-From a73bf9a8194a2fdd68b531b501327cb72e6e2d36 Mon Sep 17 00:00:00 2001
+From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 20/33] Use *.dll.a as import lib extension
+Subject: [PATCH 20/34] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 mingw-w64 specific mkspec
 ---
  mkspecs/features/create_cmake.prf      |  5 +++--
- qmake/generators/win32/winmakefile.cpp | 17 ++++++++++++-----
+ qmake/generators/win32/winmakefile.cpp | 15 +++++++++++----
- 2 files changed, 15 insertions(+), 7 deletions(-)
+ 2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
 index e67917cc96..2a94964b49 100644
@@ -27,29 +27,27 @@ index e67917cc96..2a94964b49 100644
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 37eee7fca3..59b394ca51 100644
+index 87157f31ae..4592fed7b2 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
+@@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
  bool
  Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
  {
 -    ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS");
 -    if (impexts.isEmpty())
 -        impexts = project->values("QMAKE_EXTENSION_STATICLIB");
--    QList<QMakeLocalFileName> dirs;
++    ProStringList impexts;
-+  ProStringList impexts;
++    if (project->isActiveConfig("staticlib")) {
-+  if (project->isActiveConfig("staticlib")) {
++      impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
-+    impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
++    } else {
-+  } else {
++      impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
-+    impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
++      impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
-+    impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
++    }
-+  }
+     QList<QMakeLocalFileName> dirs;
-+  QList<QMakeLocalFileName> dirs;
+     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-   static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+         dirs.append(QMakeLocalFileName(dlib.toQString()));
-                                          "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
+@@ -255,9 +259,12 @@ void Win32MakefileGenerator::fixTargetExt()
-   for (int i = 0; lflags[i]; i++) {
-@@ -253,9 +257,12 @@ void Win32MakefileGenerator::fixTargetExt()
      if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
          project->values("TARGET_EXT").append(".exe");
      } else if (project->isActiveConfig("shared")) {

qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch

@@ -1,7 +1,7 @@
-From e362589c0413c036ee6c960f26a6aa610a085e2c Mon Sep 17 00:00:00 2001
+From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 21/33] Merge shared and static library trees
+Subject: [PATCH 21/34] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
 ---
@@ -13,7 +13,7 @@ Allow installation of shared and static build in the same prefix
  5 files changed, 51 insertions(+), 6 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index 64ed6b9ed8..2cc54d15a2 100644
+index b3b3e27c44..3136889a2f 100644
 --- a/configure.pri
 +++ b/configure.pri
 @@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) {
@@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644
  
  !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index d16b3cf1be..2c4d6cd97e 100644
+index 5da82fdb5b..5b05aa9e2a 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -268,6 +268,23 @@ for(ever) {
+@@ -246,6 +246,23 @@ for(ever) {
              !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                  WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
          }
@@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a7f1285c26..879410afef 100644
+index e640fb8079..fc7f729ae6 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3206,6 +3206,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
      if (project->isActiveConfig("debug")) {
          ret += "d";
      }
@@ -114,7 +114,7 @@ index a7f1285c26..879410afef 100644
      ret += Option::pkgcfg_ext;
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
-@@ -3380,9 +3383,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile()
      t << endl;
  
      // requires

qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch

@@ -1,7 +1,7 @@
-From c7c3618a348b9cfc480f13bfb494dd6637035886 Mon Sep 17 00:00:00 2001
+From 7f561d87a70af23d5d2a0c89e08ba5744b2f9585 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
+Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules
 
 When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
@@ -251,10 +251,10 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 879410afef..2ff4c4f714 100644
+index fc7f729ae6..095b4d2720 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -1016,10 +1016,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
+@@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
              libs << "LIBS" << "QMAKE_LIBS";
          else
              libs << "LIBS" << "LIBS_PRIVATE" << "QMAKE_LIBS" << "QMAKE_LIBS_PRIVATE";