Update mingw-w64-qt5 packages to 5.9.0

devel/qt5/5.9.0/md5sums.txt

@@ -0,0 +1,78 @@
+d6d8760b647dfa72f55c98c6c0f114c2  qt3d-opensource-src-5.9.0.tar.xz
+22c193374ab9f75cc64eb3938c941ab6  qt3d-opensource-src-5.9.0.zip
+eda666aa4ad6a810215771e959a5aa7b  qtactiveqt-opensource-src-5.9.0.tar.xz
+59f3159a9548bc7fff9cf4c96146dd6f  qtactiveqt-opensource-src-5.9.0.zip
+2d2008e9e804607dedddcda3ccd2c065  qtandroidextras-opensource-src-5.9.0.tar.xz
+c9360f7d8906d05fda3ba001929a6f2b  qtandroidextras-opensource-src-5.9.0.zip
+d9984e18fb826fa3bb63457dc90ba14a  qtbase-opensource-src-5.9.0.tar.xz
+06ab64321274dd06e8f8fb80844581aa  qtbase-opensource-src-5.9.0.zip
+f289a8403e77921df7be6c200e55c137  qtcanvas3d-opensource-src-5.9.0.tar.xz
+a9454ade9ab432837b33713f1b167f31  qtcanvas3d-opensource-src-5.9.0.zip
+65654817eb18204a3f51069452d7f79f  qtcharts-opensource-src-5.9.0.tar.xz
+1a88d2dde45b4c669c8fafff414e4b74  qtcharts-opensource-src-5.9.0.zip
+49f607964b959fa6fd5ebc9f9d018bde  qtconnectivity-opensource-src-5.9.0.tar.xz
+4c1e4ac072ed520e9b9e0077c8d69ccf  qtconnectivity-opensource-src-5.9.0.zip
+eb7c067bb7fb53d7ad463c7d044bea97  qtdatavis3d-opensource-src-5.9.0.tar.xz
+60af2f34999588b9562dd171da92f721  qtdatavis3d-opensource-src-5.9.0.zip
+e51a86cc19241c27210776ddc5d1159d  qtdeclarative-opensource-src-5.9.0.tar.xz
+c02cafa9db7dd3c533d785371cdfc03a  qtdeclarative-opensource-src-5.9.0.zip
+9e7b9c5769ade1dd24ad94e74ffe83b6  qtdoc-opensource-src-5.9.0.tar.xz
+87c0608d71c843deaae5d6176fdf9315  qtdoc-opensource-src-5.9.0.zip
+b5d655b7314c3412bccafb3b54436bdd  qtgamepad-opensource-src-5.9.0.tar.xz
+f39d9bec79e50ba10433acd74f82bccc  qtgamepad-opensource-src-5.9.0.zip
+9ac848ad02b273b6a965bcd95819cff7  qtgraphicaleffects-opensource-src-5.9.0.tar.xz
+169a49f5540a4034b941d217cf68ed26  qtgraphicaleffects-opensource-src-5.9.0.zip
+0f579113cd7619c0392b0778c14b17e5  qtimageformats-opensource-src-5.9.0.tar.xz
+92b1cc1fe364e9f8772311699e62e957  qtimageformats-opensource-src-5.9.0.zip
+e894ea338be313cb580b1d6167bf4e7f  qtlocation-opensource-src-5.9.0.tar.xz
+3031c79088b0240c99aa7f92f823e1de  qtlocation-opensource-src-5.9.0.zip
+225e2b65d83f6dce65302d6af6756597  qtmacextras-opensource-src-5.9.0.tar.xz
+4e2e407564e189e5b4efcf13b3c715ef  qtmacextras-opensource-src-5.9.0.zip
+b22a93392cbf78b9946adbb0b474119e  qtmultimedia-opensource-src-5.9.0.tar.xz
+f27fe153c75d114353ba10205d7c22cc  qtmultimedia-opensource-src-5.9.0.zip
+68c1218dac0936486160d76832dcd672  qtnetworkauth-opensource-src-5.9.0.tar.xz
+67a9d8316a72b7f92358c04976863088  qtnetworkauth-opensource-src-5.9.0.zip
+6ebe6b7c44a2c11948ad4bf2b9aa26f1  qtpurchasing-opensource-src-5.9.0.tar.xz
+f78ff4db8f14fcd5283e985160213c58  qtpurchasing-opensource-src-5.9.0.zip
+b28a033c7c91ee9f6563ece0f53d8ee7  qtquickcontrols2-opensource-src-5.9.0.tar.xz
+6e2345354ba6e0f27037c0a4963e211e  qtquickcontrols2-opensource-src-5.9.0.zip
+0382a4cd64875feee4c3e1225c705b72  qtquickcontrols-opensource-src-5.9.0.tar.xz
+b7a351f51f1588deca077a365b34af85  qtquickcontrols-opensource-src-5.9.0.zip
+8e4bbd27525b0ebb50e3f1764a02c540  qtremoteobjects-opensource-src-5.9.0.tar.xz
+ae5f441c9360b90777fb505949f8d6f4  qtremoteobjects-opensource-src-5.9.0.zip
+da829216cafb543e056437acfca422e1  qtscript-opensource-src-5.9.0.tar.xz
+779dece15221dc9562f6f2b14faa7bf6  qtscript-opensource-src-5.9.0.zip
+ee33641a8874745b07990cfc764472db  qtscxml-opensource-src-5.9.0.tar.xz
+9e04761e713af99cac63288f9a14cd16  qtscxml-opensource-src-5.9.0.zip
+40c587ddf30a71fe8a3719202a322066  qtsensors-opensource-src-5.9.0.tar.xz
+ae99fd4a9163a32a8e74a5f01cb9f950  qtsensors-opensource-src-5.9.0.zip
+eb5f8e935565fbfcc5b5d85b5e11fe3d  qtserialbus-opensource-src-5.9.0.tar.xz
+c0600df1f33a680ca60afa586d9dfda4  qtserialbus-opensource-src-5.9.0.zip
+3a36b702035351bdbf1963a90fa4bafc  qtserialport-opensource-src-5.9.0.tar.xz
+72fd521984f0c313bf51e4ffcc6665c5  qtserialport-opensource-src-5.9.0.zip
+82d670e459a20212de7c09f49f6f0372  qtspeech-opensource-src-5.9.0.tar.xz
+366a7dbbe2f553be2f9b10bb304026d9  qtspeech-opensource-src-5.9.0.zip
+ea6f6334dfdc3ce8add835cf3fdd8e14  qtsvg-opensource-src-5.9.0.tar.xz
+77e8bae0686ab4c4f70c9942bd2f80b9  qtsvg-opensource-src-5.9.0.zip
+ff272ef2640414442efdb8c8ce1fe031  qttools-opensource-src-5.9.0.tar.xz
+ed28022591e1d4f5eb895420aefeea9c  qttools-opensource-src-5.9.0.zip
+a9f91209af6e351f8646055c45023707  qttranslations-opensource-src-5.9.0.tar.xz
+59d45a4fa201f33ab576831cdad54e37  qttranslations-opensource-src-5.9.0.zip
+524e88d0ba9104699869ca8f1f8d0180  qtvirtualkeyboard-opensource-src-5.9.0.tar.xz
+6f8eb37c28fffc48396be1e6f57011b2  qtvirtualkeyboard-opensource-src-5.9.0.zip
+eb0d671cdaf23fc71818561c259bb5ba  qtwayland-opensource-src-5.9.0.tar.xz
+88654f70256b0bce1cc76e4619fd4ede  qtwayland-opensource-src-5.9.0.zip
+7afea472594be4e9a6b62761c6773984  qtwebchannel-opensource-src-5.9.0.tar.xz
+68643add277991d26a0be4c5ae8a84c3  qtwebchannel-opensource-src-5.9.0.zip
+d7ca5049baf5ff69d69ee58d5da392d4  qtwebengine-opensource-src-5.9.0.tar.xz
+637ff87f3851de18153879c346158130  qtwebengine-opensource-src-5.9.0.zip
+33e7d65bd15659bcd3a3588b75538e22  qtwebsockets-opensource-src-5.9.0.tar.xz
+bbe555bdfb2247956e49ae21540cf106  qtwebsockets-opensource-src-5.9.0.zip
+05d7daed590ab21fb4a1b569cd0b1bc1  qtwebview-opensource-src-5.9.0.tar.xz
+f828376dd8aac36ae612b96bc4f24040  qtwebview-opensource-src-5.9.0.zip
+376f053936417ac839b7dd9d994de616  qtwinextras-opensource-src-5.9.0.tar.xz
+a313825303ea23c6e33eabaa6f6def29  qtwinextras-opensource-src-5.9.0.zip
+beb4bdfe83c5663d74d812e08bc80573  qtx11extras-opensource-src-5.9.0.tar.xz
+290fda08444e31127554504ea7350783  qtx11extras-opensource-src-5.9.0.zip
+ea152ab7f0555ad1d4727e9864a398f0  qtxmlpatterns-opensource-src-5.9.0.tar.xz
+27279674d865a2cb777b94927d2357f6  qtxmlpatterns-opensource-src-5.9.0.zip

devel/qt5/5.9.0/md5sums_community.txt

@@ -0,0 +1,4 @@
+9f54c27c79347531e7a23ce94ef4757f  qtwebkit-examples-opensource-src-5.9.0.tar.xz
+18be83897f18f49584115427047ccf80  qtwebkit-examples-opensource-src-5.9.0.zip
+1fc0ed873cc9326b823a8a83126714f5  qtwebkit-opensource-src-5.9.0.tar.xz
+f294cd74d5e6acd1f8ee7c2619cba9ce  qtwebkit-opensource-src-5.9.0.zip

devel/qt5/update-patches.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 
-# Copies patches from QTBASE_GIT_WORKING_DIR to default
-# variant of mingw-w64-qt5-base and outputs altered source and
+# Copies patches from QT_GIT_REPOS_DIR to default
+# variant of specified repo and outputs altered source and
 # md5sums arrays
 
 #set -euxo pipefail
@@ -9,7 +9,7 @@ set -e # abort on first error
 shopt -s nullglob
 
 if ! [[ $1 ]]; then
-    echo 'No Qt repo specified.'
+    echo 'No Qt repo specified - must be specified like eg. base or multimedia.'
     exit -1
 fi
 
@@ -18,6 +18,15 @@ repo="qt$1"
 dest="${DEFAULT_PKGBUILDS_DIR}/${pkg}/mingw-w64"
 wd="${QT_GIT_REPOS_DIR}/${repo}"
 
+if ! [[ -d $wd ]]; then
+    echo "\$QT_GIT_REPOS_DIR/$repo is no directory."
+    exit -2
+fi
+if ! [[ -d $dest ]]; then
+    echo "\$DEFAULT_PKGBUILDS_DIR/$pkg/mingw-w64 is no directory."
+    exit -3
+fi
+
 source "$dest/PKGBUILD"
 
 new_sources=()
@@ -26,7 +35,7 @@ file_index=0
 for source in "${source[@]}"; do
 	[ "${source: -6}" != .patch ] && \
 		new_sources+=("$source") \
-		new_md5sums+=("${md5sums[$file_index]}")
+		new_md5sums+=("${sha256sums[$file_index]}")
 	file_index=$((file_index + 1))
 done
 
@@ -41,13 +50,20 @@ done
 
 pushd "$wd" > /dev/null
 git checkout "${pkgver}-mingw-w64"
-git format-patch "${pkgver}" --output-directory "$dest"
+remote=
+for maybe_remote in 'martchus' 'upstream'; do
+	if git remote get-url $maybe_remote; then
+		remote=$maybe_remote
+		break
+	fi
+done
+git format-patch "${remote}/${pkgver}" --output-directory "$dest"
 popd > /dev/null
 
 new_patches=("$dest"/*.patch)
 for patch in "${new_patches[@]}"; do
 	new_sources+=("$patch")
-	sum=$(md5sum "$patch")
+	sum=$(sha256sum "$patch")
 	new_md5sums+=(${sum%% *})
 done
 
@@ -58,9 +74,9 @@ for source in "${new_sources[@]:1}"; do
 done
 echo ')'
 
-echo -n "md5sums=('${new_md5sums[0]}'"
+echo -n "sha256sums=('${new_md5sums[0]}'"
 for sum in "${new_md5sums[@]:1}"; do
 	echo
-	echo -n "         '${sum}'"
+	echo -n "            '${sum}'"
 done
 echo ')'

qt5-3d/mingw-w64/PKGBUILD

@@ -9,7 +9,7 @@
 
 _qt_module=qt3d
 pkgname="mingw-w64-qt5-3d"
-pkgver=5.8.0
+pkgver=5.9.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
@@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom')
 url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('048bc9762f1da4773384911122b116c4')
+sha256sums=('9efbef578afb31556a20baccf70137858b975c38cad60ca4d6b163bd35381ba9')
 
 _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

@@ -0,0 +1,21 @@
+From b3ea4c8e4cba65883b7c8f66bdc968ce14ba58a6 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
+
+---
+ src/tools/idc/idc.pro | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/tools/idc/idc.pro b/src/tools/idc/idc.pro
+index 1898ed5..524ee2e 100644
+--- a/src/tools/idc/idc.pro
++++ b/src/tools/idc/idc.pro
+@@ -1,4 +1,3 @@
+-option(host_build)
+ CONFIG += force_bootstrap
+ SOURCES = main.cpp
+ 
+-- 
+2.13.0
+

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

@@ -1,9 +1,22 @@
-diff -rupN qtactiveqt-opensource-src-5.4.1/src/activeqt/container/qaxbase.cpp qtactiveqt-opensource-src-5.4.1-new/src/activeqt/container/qaxbase.cpp
---- qtactiveqt-opensource-src-5.4.1/src/activeqt/container/qaxbase.cpp	2015-02-17 05:56:13.000000000 +0100
-+++ qtactiveqt-opensource-src-5.4.1-new/src/activeqt/container/qaxbase.cpp	2015-06-23 16:41:44.483979750 +0200
-@@ -2164,6 +2164,10 @@
-             QStringList versions = controls.childGroups();
-             foreach (const QString &version, versions) {
+From c8c5802c04b4fbd7fc34ba70af93851a35294741 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
+ MetaObjectGenerator::readClassInfo
+
+See https://bugreports.qt.io/browse/QTBUG-46827
+---
+ src/activeqt/container/qaxbase.cpp | 4 ++++
+ tools/dumpcpp/main.cpp             | 8 ++++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
+index 22aec57..64b2f47 100644
+--- a/src/activeqt/container/qaxbase.cpp
++++ b/src/activeqt/container/qaxbase.cpp
+@@ -2170,6 +2170,10 @@ void MetaObjectGenerator::readClassInfo()
+             const QStringList versions = controls.childGroups();
+             for (const QString &version : versions) {
                  tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
 +                if(tlfile.isEmpty())
 +                {
@@ -12,10 +25,11 @@ diff -rupN qtactiveqt-opensource-src-5.4.1/src/activeqt/container/qaxbase.cpp qt
                  if (!tlfile.isEmpty())
                      break;
              }
-diff -rupN qtactiveqt-opensource-src-5.4.1/tools/dumpcpp/main.cpp qtactiveqt-opensource-src-5.4.1-new/tools/dumpcpp/main.cpp
---- qtactiveqt-opensource-src-5.4.1/tools/dumpcpp/main.cpp	2015-02-17 05:56:13.000000000 +0100
-+++ qtactiveqt-opensource-src-5.4.1-new/tools/dumpcpp/main.cpp	2015-06-23 16:35:53.157273425 +0200
-@@ -1515,6 +1515,10 @@
+diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
+index 97915c1..ae41289 100644
+--- a/tools/dumpcpp/main.cpp
++++ b/tools/dumpcpp/main.cpp
+@@ -1539,6 +1539,10 @@ int main(int argc, char **argv)
              typeLib = settings.value(QLatin1Char('/') + codes.at(c) + QLatin1String("/0/win32/.")).toString();
              if (QFile::exists(typeLib))
                  break;
@@ -26,7 +40,7 @@ diff -rupN qtactiveqt-opensource-src-5.4.1/tools/dumpcpp/main.cpp qtactiveqt-ope
          }
  
          if (!typeLib.isEmpty())
-@@ -1577,6 +1581,10 @@
+@@ -1598,6 +1602,10 @@ int main(int argc, char **argv)
                                       + QLatin1String("/win32/.")).toString();
              if (QFile::exists(typeLib))
                  break;
@@ -37,3 +51,6 @@ diff -rupN qtactiveqt-opensource-src-5.4.1/tools/dumpcpp/main.cpp qtactiveqt-ope
          }
      }
  
+-- 
+2.13.0
+

qt5-activeqt/mingw-w64/PKGBUILD

@@ -9,7 +9,7 @@
 
 _qt_module=qtactiveqt
 pkgname=mingw-w64-qt5-activeqt
-pkgver=5.8.0
+pkgver=5.9.0
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
@@ -21,11 +21,11 @@ license=('GPL3' 'LGPL3' 'LGPL2.1' 'FDL' 'custom')
 url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
-        "qtactiveqt-fix-build.patch"
-        "qtactiveqt-win64.patch")
-md5sums=('d1c8ae9489b737957ba100bb27323eb5'
-         '7a7ba436452aa56613b3fbb15684e094'
-         '1264d0274586aec14f96a978b416b048')
+        '0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch'
+        '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
+sha256sums=('d7c7babf1510e0728e80a786fe9d83f6cb931813005d05c85873929207261635'
+            '32977d8a1e6cb8b6c4f4c44ac4c801ae7bc2c5ec70563f28e2cb3d01cd379b1f'
+            '0efddd784b939e0b78006dd7739b6889664dea0721289d56bc3c5dd7b39fd240')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
@@ -35,12 +35,11 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 prepare() {
   cd "${srcdir}/${_pkgfqn}"
-  # Don't try to build stuff which requires windows.h with the native Linux gcc
-  patch -p1 -i ../qtactiveqt-fix-build.patch
 
-  # dumpcpp and MetaObjectGenerator::readClassInfo do not handle win64
-  # https://bugreports.qt.io/browse/QTBUG-46827
-  patch -p1 -i ../qtactiveqt-win64.patch
+  # Apply patches; further descriptions can be found in patch files itself
+  for patch in "$srcdir/"*.patch; do
+    patch -p1 -i "$patch"
+  done
 }
 
 build() {

qt5-activeqt/mingw-w64/qt5-activeqt-fix-compilation.patch

@@ -1,15 +0,0 @@
---- src/activeqt/control/qaxserverbase.cpp.orig	2012-09-10 22:01:40.963557678 +0200
-+++ src/activeqt/control/qaxserverbase.cpp	2012-09-10 22:05:37.913161773 +0200
-@@ -4033,12 +4033,10 @@
- }
-
-
--#ifndef QT_STATIC // avoid conflict with symbol in static lib
- bool qt_sendSpontaneousEvent(QObject *o, QEvent *e)
- {
-     return QCoreApplication::sendSpontaneousEvent(o, e);
- }
--#endif
-
- /*
-     Tries to set the size of the control.

qt5-activeqt/mingw-w64/qtactiveqt-fix-build.patch

@@ -1,7 +0,0 @@
---- qtactiveqt-opensource-src-5.3.0/src/tools/idc/idc.pro.orig	2014-05-26 00:05:53.258370322 +0200
-+++ qtactiveqt-opensource-src-5.3.0/src/tools/idc/idc.pro	2014-05-26 00:06:18.131627963 +0200
-@@ -1,4 +1,3 @@
--option(host_build)
- CONFIG += force_bootstrap
- SOURCES = main.cpp
- 

qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch

@@ -1,7 +1,7 @@
-From eb3e8004e4cb74f021294e1e57dd268af001980e Mon Sep 17 00:00:00 2001
+From 9e46af21edffe2c27d2239ae2133c5a442cd7b43 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/30] Add profile for cross compilation with mingw-w64
+Subject: [PATCH 01/31] Add profile for cross compilation with mingw-w64
 
 ---
  mkspecs/mingw-w64-g++/qmake.conf      | 125 +++++++++++++++++++++++++++
@@ -12,7 +12,7 @@ Subject: [PATCH 01/30] Add profile for cross compilation with mingw-w64
 
 diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf
 new file mode 100644
-index 0000000000..6f21ae75d5
+index 0000000000..3908c1a7e2
 --- /dev/null
 +++ b/mkspecs/mingw-w64-g++/qmake.conf
 @@ -0,0 +1,125 @@
@@ -128,7 +128,7 @@ index 0000000000..6f21ae75d5
 +QMAKE_PKG_CONFIG        = $${CROSS_COMPILE}pkg-config
 +
 +QMAKE_LIBS              =
-+QMAKE_LIBS_CORE         = -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
++QMAKE_LIBS_CORE         = -lz -lpcre2-16 -lversion -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
 +QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
 +                          $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
 +                          $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
@@ -303,5 +303,5 @@ index 0000000000..c5a70b1445
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 0223c4145ff17cb79e720ed12b24819262aa5353 Mon Sep 17 00:00:00 2001
+From b8a768c9d6b67c09515e927344dc750880fe5150 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/30] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---
@@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required
  1 file changed, 2 deletions(-)
 
 diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
-index aad48571b3..46f44d8b91 100644
+index 0a5de2c9af..35798a2a28 100644
 --- a/src/gui/opengl/qopenglfunctions.h
 +++ b/src/gui/opengl/qopenglfunctions.h
 @@ -56,9 +56,7 @@
@@ -23,5 +23,5 @@ index aad48571b3..46f44d8b91 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 1ffc87d8805a92fb7666084c656bac46cd276599 Mon Sep 17 00:00:00 2001
+From 7a6384756287b07c0e3a6e18ed07414a7672feee Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/30] Use external ANGLE library
+Subject: [PATCH 03/31] Use external ANGLE library
 
 ---
  src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
@@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644
  
  _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
 diff --git a/src/gui/gui.pro b/src/gui/gui.pro
-index 5f8cbe2cbe..0ebf6b7281 100644
+index cfdb5e889b..4afb45e592 100644
 --- a/src/gui/gui.pro
 +++ b/src/gui/gui.pro
 @@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@@ -66,11 +66,11 @@ index 718a886809..89965709ed 100644
  HEADERS += qgl.h \
             qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index 20e0b81da9..b55847fc69 100644
+index 73677311f5..05a1dc2e6e 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
-@@ -2,6 +2,7 @@
- LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+ QT_FOR_CONFIG += gui
  
  qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32
 +qtConfig(angle):LIBS += -lGLESv2 -lEGL
@@ -78,10 +78,10 @@ index 20e0b81da9..b55847fc69 100644
  mingw: LIBS *= -luuid
  # For the dialog helpers:
 diff --git a/src/src.pro b/src/src.pro
-index 90d7e2b76c..92e89ea39f 100644
+index 43fc06f2e5..4188d4ea6b 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -160,10 +160,6 @@ qtConfig(gui) {
+@@ -175,10 +175,6 @@ qtConfig(gui) {
          SUBDIRS += src_3rdparty_harfbuzzng
          src_gui.depends += src_3rdparty_harfbuzzng
      }
@@ -93,5 +93,5 @@ index 90d7e2b76c..92e89ea39f 100644
          SUBDIRS += src_3rdparty_libpng
          src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 447092efb62e94bc69b3899093e1ee10af18d81b Mon Sep 17 00:00:00 2001
+From c815500b1cbe99d31d10fa416d391ebe9f6db56e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 04/30] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 04/31] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.
@@ -11,7 +11,7 @@ Hence the assembler option -mbig-obj is required.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
-index 1a1022b3a7..792bdf9e7a 100644
+index 4c778b184e..1dd1755d7f 100644
 --- a/src/gui/opengl/opengl.pri
 +++ b/src/gui/opengl/opengl.pri
 @@ -3,7 +3,8 @@
@@ -25,5 +25,5 @@ index 1a1022b3a7..792bdf9e7a 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 74be1cdb27c34b149b4b227a8c3107ca49cc254a Mon Sep 17 00:00:00 2001
+From ca3aca842c36f8d69320f5629071d29563b91081 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/30] Make sure *.pc files are installed correctly
+Subject: [PATCH 05/31] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -10,10 +10,10 @@ Subject: [PATCH 05/30] 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 4450e619b9..182fe79238 100644
+index c76708285a..fb886e00d2 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3150,7 +3150,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3152,7 +3152,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
  }
  
  QString
@@ -22,7 +22,7 @@ index 4450e619b9..182fe79238 100644
  {
      QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
      if (ret.isEmpty()) {
-@@ -3175,7 +3175,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3177,7 +3177,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
      if(fixify) {
          if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
              ret.prepend(project->first("DESTDIR").toQString());
@@ -36,7 +36,7 @@ index 4450e619b9..182fe79238 100644
      return ret;
  }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index 86fec748eb..cbe23d7e3a 100644
+index 4ced3bd121..f7cc3b9e9b 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
 @@ -89,7 +89,7 @@ protected:
@@ -49,10 +49,10 @@ index 86fec748eb..cbe23d7e3a 100644
      void writePkgConfigFile();   // for pkg-config
  
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 3c029c8004..caa000ea53 100644
+index 2013698c99..b6b8dda397 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -721,7 +721,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -724,7 +724,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                  }
                  if(!ret.isEmpty())
                      ret += "\n\t";
@@ -62,5 +62,5 @@ index 3c029c8004..caa000ea53 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From fee4dff74c2483c2f4a4d7299e062c366431fc53 Mon Sep 17 00:00:00 2001
+From a0b4f7192c90214a2950382679b259e143dfc4bc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/30] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/31] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references
@@ -24,5 +24,5 @@ index 8d5a9a7d0f..d2cf8d9afc 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 995313e0795df5500fd84350e80a3f88202b473d Mon Sep 17 00:00:00 2001
+From 6656828260372d7e2e6256fa85e37a830b58260c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/30] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/31] 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 182fe79238..a762443fe2 100644
+index fb886e00d2..55e25d596a 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3166,6 +3166,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
          if (dot != -1)
              ret = ret.left(dot);
      }
@@ -29,5 +29,5 @@ index 182fe79238..a762443fe2 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,26 +1,27 @@
-From f3a39738bcf7560f023bd280017aedaeb756e5c2 Mon Sep 17 00:00:00 2001
+From 4fb07cf7290b97694586f3f30489165f114ca439 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 08/30] Fix linking against shared/static libpng
+Subject: [PATCH 08/31] Fix linking against shared/static libpng
 
+Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
  src/gui/configure.json | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 1f5011617c..5006ff5a3a 100644
+index 73e59a7ad9..6dee7d18aa 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -161,7 +161,8 @@
+@@ -162,7 +162,8 @@
              "sources": [
                  { "type": "pkgConfig", "args": "libpng" },
                  { "libs": "-llibpng", "condition": "config.msvc" },
 -                { "libs": "-lpng", "condition": "!config.msvc" }
 +                { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" },
 +                { "libs": "-lpng", "condition": "!config.msvc && features.shared" }
-             ]
-         },
-         "mirclient": {
+             ],
+             "use": [
+                 { "lib": "zlib", "condition": "features.system-zlib" }
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 3379bc4d4d65124ec08aa8dade1b6b2a7b25f61e Mon Sep 17 00:00:00 2001
+From c481c20ed0c454b6e32fd37f6abf99c5bb118a83 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 09/30] Fix linking against static D-Bus
+Subject: [PATCH 09/31] Fix linking against static D-Bus
 
 ---
  config.tests/unix/dbus/dbus.cpp | 4 ++++
@@ -25,10 +25,10 @@ index 295c904400..80d3e9c044 100644
  #include <dbus/dbus.h>
  
 diff --git a/configure.json b/configure.json
-index f774291d22..12714da714 100644
+index 02d5f1a65e..7f005e99f5 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -158,12 +158,16 @@
+@@ -159,12 +159,16 @@
              "sources": [
                  { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
                  {
@@ -62,5 +62,5 @@ index cfc0e12046..65f1397cd6 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.12.2
+2.13.0
 

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

@@ -0,0 +1,29 @@
+From aaf4a548cf6fbe17f0ff11eb370cf7e27ab85221 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 2 Jun 2017 18:28:10 +0200
+Subject: [PATCH 10/31] 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
+
+Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
+---
+ configure.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.json b/configure.json
+index 7f005e99f5..27b1460f93 100644
+--- a/configure.json
++++ b/configure.json
+@@ -165,7 +165,7 @@
+                 {
+                     "libs": "",
+                     "builds": {
+-                        "debug": "-ldbus-1d",
++                        "debug": "-ldbus-1",
+                         "release": "-ldbus-1"
+                     },
+                     "condition": "config.win32 && features.shared"
+-- 
+2.13.0
+

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

@@ -1,17 +1,17 @@
-From 24c3bda7db1733545350436d8c2f489be5395650 Mon Sep 17 00:00:00 2001
+From 50aa5c34a1240f86092a90241fba27a332f9003c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 10/30] Fix linking against static freetype2
+Subject: [PATCH 11/31] Fix linking against static freetype2
 
 ---
  src/gui/configure.json | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 5006ff5a3a..6530357be9 100644
+index 6dee7d18aa..d6ed20e5c6 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -99,8 +99,11 @@
+@@ -100,8 +100,11 @@
              "label": "FreeType",
              "test": "unix/freetype",
              "sources": [
@@ -26,5 +26,5 @@ index 5006ff5a3a..6530357be9 100644
          },
          "fontconfig": {
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,17 @@
-From 52c34159dec8c829d1f2928d2c9a56bb7299fbff Mon Sep 17 00:00:00 2001
+From 9bea663dc73c714d606f5acc65a8f84129f1428e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 11/30] Fix linking against static harfbuzz
+Subject: [PATCH 12/31] 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 6530357be9..c5b9b1542a 100644
+index d6ed20e5c6..8937d38f63 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -125,7 +125,11 @@
+@@ -126,7 +126,11 @@
              "label": "HarfBuzz",
              "test": "unix/harfbuzz",
              "sources": [
@@ -25,5 +25,5 @@ index 6530357be9..c5b9b1542a 100644
          },
          "imf": {
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,27 +1,28 @@
-From e2c35b81ed48f46c2260ad9e59ff7f50b073e9d4 Mon Sep 17 00:00:00 2001
+From 6db4ce18fb06d080cd2384f1c4a8a2197a8b5434 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 12/30] Fix linking against static pcre
+Subject: [PATCH 13/31] Fix linking against static pcre
 
+Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
  src/corelib/tools/qregularexpression.cpp | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 4a30daa72c..3d7c811124 100644
+index 88b696f53a..afe444027e 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
-@@ -54,6 +54,10 @@
- #include <QtCore/qatomic.h>
+@@ -55,6 +55,10 @@
  #include <QtCore/qdatastream.h>
  
+ #define PCRE2_CODE_UNIT_WIDTH 16
 +#ifdef QT_STATIC
 +#define PCRE_STATIC
++#define PCRE2_STATIC
 +#endif
-+
- #include <pcre.h>
  
- QT_BEGIN_NAMESPACE
+ #include <pcre2.h>
+ 
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,26 +1,27 @@
-From 889ea99f62dd010c168cce6b18f0d49fb2a48203 Mon Sep 17 00:00:00 2001
+From ea1df506321d35a9f8a648ea98642b034b7ace48 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 13/30] Fix linking against shared/static MariaDB
+Subject: [PATCH 14/31] Fix linking against shared/static MariaDB
 
+Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
  src/sql/configure.json | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/src/sql/configure.json b/src/sql/configure.json
-index 96c82e84f9..fce948026f 100644
+index 49444c7e5f..d162d7bc09 100644
 --- a/src/sql/configure.json
 +++ b/src/sql/configure.json
-@@ -58,6 +58,9 @@
+@@ -57,6 +57,9 @@
              "label": "MySQL",
              "test": "unix/mysql",
              "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" },
-                 { "type": "mysqlConfig", "query": "--libs" },
-                 { "libs": "-lmysqlclient_r", "condition": "!config.win32" },
+                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
+                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
+                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,17 @@
-From 953ca26efa1cb2e86a958c52ce737ada0078e1a3 Mon Sep 17 00:00:00 2001
+From cb4fbac9533065928a6c839da4675c60cb7fe6c0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 14/30] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 15/31] Fix linking against shared/static PostgreSQL
 
 ---
  src/sql/configure.json | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/sql/configure.json b/src/sql/configure.json
-index fce948026f..f560c191fd 100644
+index d162d7bc09..0f86b23f22 100644
 --- a/src/sql/configure.json
 +++ b/src/sql/configure.json
-@@ -72,9 +72,10 @@
+@@ -73,9 +73,10 @@
              "label": "PostgreSQL",
              "test": "unix/psql",
              "sources": [
@@ -25,5 +25,5 @@ index fce948026f..f560c191fd 100644
              ]
          },
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From e81d865a144c5c12ea1b93922a8c27f676aad531 Mon Sep 17 00:00:00 2001
+From f0f623ebdc7e578047212feac62044e08aaf08cb Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 15/30] Rename qtmain to qt5main
+Subject: [PATCH 16/31] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -11,7 +11,7 @@ Prevents conflict with mingw-w64-qt4 package
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 1099e14b17..ed9b82fba9 100644
+index bb5083c925..146e83ae67 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -225,8 +225,8 @@ mac {
@@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
  
  CONFIG += static
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,20 @@
-From b91bb54e98627bd92ff740ed547d52febb3523d4 Mon Sep 17 00:00:00 2001
+From bd8345de18a4ad2bdcc17710c69c09ad2f81c83f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
-Subject: [PATCH 16/30] Build dynamic host libraries
+Subject: [PATCH 17/31] Build dynamic host libraries
 
-For better accordance with Arch Linux packaging
-standards
+This came initially from Fedora, not sure whether
+it makes sense to keep it. Regular Arch package
+uses static lib as intended by upstream.
+
+Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
 ---
  mkspecs/features/qt_module.prf              | 2 +-
  src/tools/bootstrap-dbus/bootstrap-dbus.pro | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 31d628596c..360c99ac73 100644
+index 36f632e8ca..2deec56866 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -24,7 +24,7 @@ requires(!$$skip)
@@ -34,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,11 +1,13 @@
-From 0e79722e8c8162f87b2b765932d3507de2f20a88 Mon Sep 17 00:00:00 2001
+From 905438dce78dd9fb08692b81bfbed4caa30fd23e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 17/30] Enable rpath for build tools
+Subject: [PATCH 18/31] Enable rpath for build tools
 
-- Required because library various tools depend on (libQt5Bootstrap.so) resides
+- Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib
 - Can't use regular lib dir because it would conflict with the native package
+
+Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7
 ---
  mkspecs/features/qt_app.prf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -31,5 +33,5 @@ index cb84ae0da8..8d9471ed0a 100644
  INSTALLS += target
  
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,17 @@
-From 510f64af3d51b140e18cbf026cbfd4990ba973d5 Mon Sep 17 00:00:00 2001
+From aa62a2156a564f8125d3dfdac08124673d123016 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 18/30] Use system zlib for build tools
+Subject: [PATCH 19/31] Use system zlib for build tools
 
 ---
  src/tools/bootstrap/bootstrap.pro | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index d51f9e98a4..2242b7c4f1 100644
+index 521dd5f0f2..eb8cb4770c 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -127,7 +127,7 @@ macx {
+@@ -129,7 +129,7 @@ macx {
          ../../corelib/io/qstandardpaths_win.cpp
  }
  
@@ -21,5 +21,5 @@ index d51f9e98a4..2242b7c4f1 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.12.2
+2.13.0
 

qt5-base/mingw-w64-angle/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch

@@ -1,7 +1,7 @@
-From 12e64d649d5a01b4f878778aa6c183ceb51b28e7 Mon Sep 17 00:00:00 2001
+From 7d3b433e7a103e2f26cf183e1d9910b4d33a97ec Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:20:25 +0200
-Subject: [PATCH 19/30] Disable determing default include and lib dirs at qmake
+Subject: [PATCH 20/31] Disable determing default include and lib dirs at qmake
  time when building with mingw-w64
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 19/30] Disable determing default include and lib dirs at qmake
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
-index 3f266dd2a4..258d374ee0 100644
+index 46a9c5707a..e82383f9ff 100644
 --- a/mkspecs/features/toolchain.prf
 +++ b/mkspecs/features/toolchain.prf
-@@ -13,7 +13,7 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build {
+@@ -21,7 +21,7 @@ isEmpty($${target_prefix}.INCDIRS) {
      #
      # Get default include and library paths from compiler
      #
@@ -22,5 +22,5 @@ index 3f266dd2a4..258d374ee0 100644
              cmd_prefix = "LC_ALL=C"
              cmd_suffix = "</dev/null >/dev/null"
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From cea6744e8b23c780033c4e5a2f51fdb0bd60153c Mon Sep 17 00:00:00 2001
+From 7ccfcf6a364c00f5ec0204b4614ae78dd2296c0e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 20/30] Use *.dll.a as import lib extension
+Subject: [PATCH 21/31] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 mingw-w64 specific mkspec
@@ -11,7 +11,7 @@ mingw-w64 specific mkspec
  2 files changed, 15 insertions(+), 7 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index ed9b82fba9..461a7fdff5 100644
+index 146e83ae67..15fc070008 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -236,8 +236,9 @@ mac {
@@ -27,7 +27,7 @@ index ed9b82fba9..461a7fdff5 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 caa000ea53..e6338546bb 100644
+index b6b8dda397..d9388e8518 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@@ -64,5 +64,5 @@ index caa000ea53..e6338546bb 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,9 +1,11 @@
-From 7d8372b48046631d93ea260649d29a023fe29b01 Mon Sep 17 00:00:00 2001
+From 842da3facc0a4e3269d391b57bd1207a796b8628 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 21/30] Merge shared and static library trees
+Subject: [PATCH 22/31] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
+
+Change-Id: Ie60ddbe967cb553d5d92d5a706398a1e7385344a
 ---
  configure.pri                     |  7 +++++++
  mkspecs/features/default_post.prf | 11 +++++++++++
@@ -13,13 +15,13 @@ Allow installation of shared and static build in the same prefix
  5 files changed, 47 insertions(+), 6 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index 19719736a9..0c4b8ebbf8 100644
+index be1b166080..9a5c6cb30d 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -555,3 +555,10 @@ QMAKE_POST_CONFIGURE += \
+@@ -1181,3 +1181,10 @@ defineTest(createConfigStatus) {
  
- # load and process input from configure.sh/.exe
- include($$shadowed($$PWD)/config.tests/configure.cfg)
+ QMAKE_POST_CONFIGURE += \
+     "createConfigStatus()"
 +
 +# merge shared and static library trees
 +contains(CONFIG, static) {
@@ -28,7 +30,7 @@ index 19719736a9..0c4b8ebbf8 100644
 +    QT_CONFIG -= shared
 +}
 diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
-index e7e9a5bd87..72305ad9b8 100644
+index d6caf870f7..7bff3d32ba 100644
 --- a/mkspecs/features/default_post.prf
 +++ b/mkspecs/features/default_post.prf
 @@ -1,5 +1,16 @@
@@ -49,10 +51,10 @@ index e7e9a5bd87..72305ad9b8 100644
  
  !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 98f794c485..1799622edd 100644
+index 3ccbbe7061..20b02d5ca9 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -152,6 +152,21 @@ for(ever) {
+@@ -255,6 +255,21 @@ for(ever) {
              !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                  WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
          }
@@ -97,10 +99,10 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a762443fe2..8ac3a0f647 100644
+index 55e25d596a..990d10a286 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3167,6 +3167,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3169,6 +3169,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
      if (project->isActiveConfig("debug")) {
          ret += "d";
      }
@@ -110,7 +112,7 @@ index a762443fe2..8ac3a0f647 100644
      ret += Option::pkgcfg_ext;
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
-@@ -3340,9 +3343,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3342,9 +3345,9 @@ MakefileGenerator::writePkgConfigFile()
      t << endl;
  
      // requires
@@ -124,5 +126,5 @@ index a762443fe2..8ac3a0f647 100644
  
      t << endl;
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,25 +1,27 @@
-From 1c1935b0d6e6685181880f6d591677ed49b0695e Mon Sep 17 00:00:00 2001
+From 884534d5a74833a3666e1d34a30a9ea600a92df4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 22/30] Allow usage of static version with CMake
+Subject: [PATCH 23/31] Allow usage of static version with CMake
 
 - Fix plugin detection and various details
 - Allow selecting between dynamic and static Qt versions
   installed in the same prefix
   - Use eg. find_package(Qt5Core) for dynamic version
   - and eg. find_package(StaticQt5Core) for static version
+
+Change-Id: Idf2d3ab8e3581910f59d9727ef6b48e105729463
 ---
  mkspecs/features/create_cmake.prf                  |  85 +++--
- .../features/data/cmake/Qt5BasicConfig.cmake.in    | 358 ++++++++++++++-------
+ .../features/data/cmake/Qt5BasicConfig.cmake.in    | 372 ++++++++++++++-------
  .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 +-
  qmake/generators/makefile.cpp                      |   7 +
- src/corelib/Qt5CoreConfigExtras.cmake.in           |  37 ++-
+ src/corelib/Qt5CoreConfigExtras.cmake.in           |  30 +-
  src/gui/Qt5GuiConfigExtras.cmake.in                |  12 +-
  src/testlib/Qt5TestConfigExtras.cmake.in           |   4 +
- 7 files changed, 372 insertions(+), 161 deletions(-)
+ 7 files changed, 372 insertions(+), 168 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 461a7fdff5..c4afc5251b 100644
+index 15fc070008..0914532f54 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -38,7 +38,8 @@ split_incpath {
@@ -222,7 +224,7 @@ index 461a7fdff5..c4afc5251b 100644
  # We are generating cmake files. Most developers of Qt are not aware of cmake,
  # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d2358cae4b..6365d0f9ff 100644
+index 4f342d67d7..908f7f59a7 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -35,15 +35,18 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
@@ -446,16 +448,20 @@ index d2358cae4b..6365d0f9ff 100644
  !!ENDIF // TEMPLATE != aux
      set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
  
-@@ -167,7 +225,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -166,10 +224,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+     endif()
  !!ENDIF
  
+-    set(Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
++    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
+ 
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED)
 -    if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
 +    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
          set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
      endif()
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -175,17 +233,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -177,17 +235,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
          set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
      endif()
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
@@ -477,7 +483,7 @@ index d2358cae4b..6365d0f9ff 100644
                  $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                  ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                  ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -193,28 +251,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -195,28 +253,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              )
          endif()
  
@@ -522,7 +528,7 @@ index d2358cae4b..6365d0f9ff 100644
  
  !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
      if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
-@@ -223,81 +285,179 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -225,28 +287,124 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ENDIF
  
  !!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -647,6 +653,36 @@ index d2358cae4b..6365d0f9ff 100644
 +        endforeach()
 +    endif()
  
+     set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
+-    foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
++    foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
+         if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
+             set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST FALSE)
+         endif()
+@@ -254,9 +412,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ 
+     if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST
+         AND NOT CMAKE_VERSION VERSION_LESS 3.0.0 )
+-        add_library(Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
+-        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
+-            INTERFACE_INCLUDE_DIRECTORIES ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
++        add_library($${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
++        set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
++            INTERFACE_INCLUDE_DIRECTORIES ${$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
+         )
+         set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
+         foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
+@@ -264,66 +422,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
+             endif()
+         endforeach()
+-        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
+-            INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
++        set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
++            INTERFACE_LINK_LIBRARIES $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
+         )
+     endif()
+ 
  !!IF !equals(TEMPLATE, aux)
  !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -727,7 +763,7 @@ index d2358cae4b..6365d0f9ff 100644
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
          \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -310,9 +470,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -336,9 +496,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -741,7 +777,7 @@ index d2358cae4b..6365d0f9ff 100644
  !!ENDIF // CMAKE_RELEASE_TYPE
  !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
  
-@@ -323,37 +485,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -349,37 +511,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      )
  !!ENDIF // TEMPLATE != aux
  
@@ -827,7 +863,7 @@ index 5baf0fdb10..54345e4117 100644
 -list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 8ac3a0f647..ed4a1f5c30 100644
+index 990d10a286..35cb7d927a 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@@ -845,7 +881,7 @@ index 8ac3a0f647..ed4a1f5c30 100644
  }
  
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 545b9a3d1e..fd5c947b5f 100644
+index 545b9a3d1e..42a3c557aa 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -1,4 +1,10 @@
@@ -932,17 +968,6 @@ index 545b9a3d1e..fd5c947b5f 100644
                  IMPORTED_LINK_INTERFACE_LIBRARIES_${_config}
                      $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain>
              )
-@@ -188,3 +194,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH)
- set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\")
- 
- _qt5_Core_check_file_exists(${_Qt5CTestMacros})
-+
-+!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
-+set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)
-+# INTERFACE_LINK_LIBRARIES is used to pass a linker flag '-static' and library ws2_32
-+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
-+unset(_isExe)
-+!!ENDIF
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
 index 2e32911a64..31567d7da2 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -994,5 +1019,5 @@ index 2a575958ae..8312c90fd1 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.12.2
+2.13.0
 

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

@@ -0,0 +1,29 @@
+From 1f6fc1094a08c20ac78cc75e6667693676d10907 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 2 Jun 2017 16:42:07 +0200
+Subject: [PATCH 24/31] Adjust linker flags for static build with
+ cmake/mingw-w64
+
+Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
+---
+ src/corelib/Qt5CoreConfigExtras.cmake.in | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
+index 42a3c557aa..fd5c947b5f 100644
+--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
+@@ -194,3 +194,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH)
+ set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\")
+ 
+ _qt5_Core_check_file_exists(${_Qt5CTestMacros})
++
++!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
++set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)
++# INTERFACE_LINK_LIBRARIES is used to pass a linker flag '-static' and library ws2_32
++set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
++unset(_isExe)
++!!ENDIF
+-- 
+2.13.0
+

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

@@ -1,17 +1,17 @@
-From 2d7fb7169cfeed0c95a703b58fa7ec2412ba5daf Mon Sep 17 00:00:00 2001
+From 8cfdb2fc2573a49866ab98ce66e4473f4512dfb9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 23/30] Use correct pkg-config --static flag
+Subject: [PATCH 25/31] Use correct pkg-config --static flag
 
 ---
  configure.pri | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.pri b/configure.pri
-index 0c4b8ebbf8..8afb893e88 100644
+index 9a5c6cb30d..f8b1e3a1ab 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -138,6 +138,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -311,6 +311,9 @@ defineTest(qtConfTest_detectPkgConfig) {
              qtLog("Found pkg-config from path: $$pkgConfig")
          }
      }
@@ -22,5 +22,5 @@ index 0c4b8ebbf8..8afb893e88 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 4c840dc66e4506e27cbc967e8b236f77132d8eeb Mon Sep 17 00:00:00 2001
+From 27d8249c25041e18ae3168a733d34208b42f436d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 24/30] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 26/31] Fix macro invoking moc, rcc and uic
 
 * Otherwise the arguments aren't passed correctly leading to errors like
   ```
@@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
-index 23909c9f3f..0fa0f187cd 100644
+index 489bc75511..c980f4220d 100644
 --- a/src/corelib/Qt5CoreMacros.cmake
 +++ b/src/corelib/Qt5CoreMacros.cmake
 @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
@@ -70,5 +70,5 @@ index f5e7b7f050..18d120f0c7 100644
            MAIN_DEPENDENCY ${infile} VERBATIM)
          list(APPEND ${outfiles} ${outfile})
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From d66dd7d23bc3586779e23297ae61cefe2c69e9fb Mon Sep 17 00:00:00 2001
+From 3d7baa02c957207beffa3e2d4b936a6a6c5cc19b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 25/30] Ignore errors about missing feature static
+Subject: [PATCH 27/31] Ignore errors about missing feature static
 
 Not sure why this error occurs, let's hope for the best
 ---
@@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
-index 3762c14f98..a58200a297 100644
+index 150d2b2cc3..d93d24cce5 100644
 --- a/mkspecs/features/qt_build_config.prf
 +++ b/mkspecs/features/qt_build_config.prf
-@@ -132,5 +132,5 @@ defineTest(qtConfig) {
+@@ -135,5 +135,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -21,10 +21,10 @@ index 3762c14f98..a58200a297 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 999cd18154..6bf08ea583 100644
+index c00fdb73f8..d4d5599433 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -349,5 +349,5 @@ defineTest(qtConfig) {
+@@ -351,5 +351,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -32,5 +32,5 @@ index 999cd18154..6bf08ea583 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From f1909b3049c85c990da430b5842edcd2060e7529 Mon Sep 17 00:00:00 2001
+From 63a1e37e442e61f9d65e340e6602ad732ad26bdf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 26/30] Enable and fix use of iconv
+Subject: [PATCH 28/31] Enable and fix use of iconv
 
 Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
 ---
@@ -24,10 +24,10 @@ index 1276311e08..993a12c7ee 100644
      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 e4fb359f2c..771b1fa9f2 100644
+index d6362b6fbc..4da4546a24 100644
 --- a/src/corelib/codecs/qiconvcodec.cpp
 +++ b/src/corelib/codecs/qiconvcodec.cpp
-@@ -50,7 +50,6 @@ QT_REQUIRE_CONFIG(iconv);
+@@ -49,7 +49,6 @@ QT_REQUIRE_CONFIG(iconv);
  #include <errno.h>
  #include <locale.h>
  #include <stdio.h>
@@ -35,7 +35,7 @@ index e4fb359f2c..771b1fa9f2 100644
  
  // unistd.h is needed for the _XOPEN_UNIX macro
  #include <unistd.h>
-@@ -183,7 +182,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState
+@@ -182,7 +181,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 +44,7 @@ index e4fb359f2c..771b1fa9f2 100644
      // GNU doesn't disagree with POSIX :/
      const char *inBytes = chars;
  #else
-@@ -282,7 +281,7 @@ static bool setByteOrder(iconv_t cd)
+@@ -281,7 +280,7 @@ static bool setByteOrder(iconv_t cd)
      size_t outBytesLeft = sizeof buf;
      size_t inBytesLeft = sizeof bom;
  
@@ -53,7 +53,7 @@ index e4fb359f2c..771b1fa9f2 100644
      const char **inBytesPtr = const_cast<const char **>(&inBytes);
  #else
      char **inBytesPtr = &inBytes;
-@@ -304,7 +303,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
+@@ -303,7 +302,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
      char *outBytes;
      size_t inBytesLeft;
  
@@ -63,10 +63,10 @@ index e4fb359f2c..771b1fa9f2 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index 0d1954c3a8..32bbe92f57 100644
+index c6c5c93ddb..62c75f37ab 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
-@@ -263,9 +263,9 @@
+@@ -256,9 +256,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",
@@ -79,5 +79,5 @@ index 0d1954c3a8..32bbe92f57 100644
          },
          "icu": {
 -- 
-2.12.2
+2.13.0
 

qt5-base/mingw-w64-angle/0028-Include-uiviewsettingsinterop.h-correctly.patch

@@ -1,25 +0,0 @@
-From 101d2b3b5317ca5fab2dfead3982c37fe9682e94 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Wed, 25 Jan 2017 23:41:16 +0100
-Subject: [PATCH 28/30] Include uiviewsettingsinterop.h correctly
-
----
- src/plugins/platforms/windows/qwin10helpers.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp
-index 977bbfd11b..12cccd124b 100644
---- a/src/plugins/platforms/windows/qwin10helpers.cpp
-+++ b/src/plugins/platforms/windows/qwin10helpers.cpp
-@@ -57,7 +57,7 @@
- #endif
- 
- #ifdef HAS_UI_VIEW_SETTINGS_INTEROP
--#  include <UIViewSettingsInterop.h>
-+#  include <uiviewsettingsinterop.h>
- #endif
- 
- #ifndef HAS_UI_VIEW_SETTINGS_INTEROP
--- 
-2.12.2
-

qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-libqwindows.dll.patch

@@ -1,45 +0,0 @@
-From bff29dca9fb69fd29dc4b741652429cbdfb4bf50 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 29/30] Hardcode linker flags for libqwindows.dll
-
-Otherwise incorrect order of libs leads to linker
-errors
----
- src/plugins/platforms/windows/windows.pro | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
-index 23168c10dc..e27cf1a248 100644
---- a/src/plugins/platforms/windows/windows.pro
-+++ b/src/plugins/platforms/windows/windows.pro
-@@ -1,11 +1,22 @@
- TARGET = qwindows
- 
- QT += \
--    core-private gui-private \
--    eventdispatcher_support-private accessibility_support-private \
--    fontdatabase_support-private theme_support-private
-+    core-private gui-private
- 
--LIBS += -lgdi32 -ldwmapi
-+# Fix linker error when building libqwindows.dll by specifying linker flags for
-+# required modules manually (otherwise order is messed)
-+LIBS += \
-+    -lQt5EventDispatcherSupport \
-+    -lQt5AccessibilitySupport \
-+    -lQt5FontDatabaseSupport \
-+    -lQt5ThemeSupport \
-+    -lfreetype -lole32 -lgdi32 -ldwmapi
-+# However, this workaround leads to the necessity of specifying include dirs manually
-+INCLUDEPATH += \
-+    $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.8.0 \
-+    $$QT_SOURCE_TREE/include/QtAccessibilitySupport/5.8.0 \
-+    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.8.0 \
-+    $$QT_SOURCE_TREE/include/QtThemeSupport/5.8.0
- 
- include(windows.pri)
- 
--- 
-2.12.2
-

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

@@ -1,7 +1,7 @@
-From 180c51b31bfb37355eb63d2ce7b375d242533c1e Mon Sep 17 00:00:00 2001
+From e738cb4ecf057ce65d86e861de11df919227d421 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 27/30] Ignore failing pkg-config test
+Subject: [PATCH 29/31] 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 12714da714..adc54e439c 100644
+index 27b1460f93..7fca07351e 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -472,7 +472,6 @@
+@@ -515,7 +515,6 @@
          "pkg-config": {
              "label": "Using pkg-config",
              "autoDetect": "!config.darwin && !config.win32",
@@ -21,5 +21,5 @@ index 12714da714..adc54e439c 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 8409e69154755c1f8a23fcf4321e76a36342c79e Mon Sep 17 00:00:00 2001
+From 9ef6d62307288a6a1656aee01835b4c368678e55 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 30/30] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 30/31] Prevent qmake from messing static lib dependencies
 
 In particular, it messes resolving cyclic dependency between
 static freetype2 and harfbuzz
@@ -11,10 +11,10 @@ static freetype2 and harfbuzz
  2 files changed, 6 insertions(+)
 
 diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 349dcd2f40..f6d3d1fa29 100644
+index 20318f120c..d113216f55 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
-@@ -394,6 +394,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
+@@ -410,6 +410,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
  bool
  UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
  {
@@ -25,7 +25,7 @@ index 349dcd2f40..f6d3d1fa29 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 e6338546bb..2407d26a5a 100644
+index d9388e8518..090c576bc6 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
@@ -39,5 +39,5 @@ index e6338546bb..2407d26a5a 100644
    static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
    for (int i = 0; lflags[i]; i++) {
 -- 
-2.12.2
+2.13.0
 

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

@@ -0,0 +1,101 @@
+From 7f5e0ffbc26a67ba4bc3c0868fdd492641846a23 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Wed, 25 Jan 2017 23:42:30 +0100
+Subject: [PATCH 31/31] Hardcode linker flags for platform plugins
+
+Otherwise incorrect order of libs leads to errors
+when building libqminimal.dll, libqoffscreen.dll
+and libqwindows.dll
+
+Change-Id: I594ddcc15599c63bb8ac5e998f59c4561a18eb26
+---
+ src/plugins/platforms/minimal/minimal.pro     | 15 +++++++++++++--
+ src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++++--
+ src/plugins/platforms/windows/windows.pro     | 19 +++++++++++++++----
+ 3 files changed, 40 insertions(+), 8 deletions(-)
+
+diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
+index 8cfb68824e..c3fd4c73f2 100644
+--- a/src/plugins/platforms/minimal/minimal.pro
++++ b/src/plugins/platforms/minimal/minimal.pro
+@@ -1,8 +1,19 @@
+ TARGET = qminimal
+ 
+ QT += \
+-    core-private gui-private \
+-    eventdispatcher_support-private fontdatabase_support-private
++    core-private gui-private
++
++# Fix linker error when building libqminimal.dll by specifying linker flags for
++# required modules manually (otherwise order is messed)
++LIBS += \
++    -lQt5EventDispatcherSupport \
++    -lQt5FontDatabaseSupport \
++    -lfreetype -lole32 -lgdi32 -luuid
++# However, this workaround leads to the necessity of specifying include dirs manually
++INCLUDEPATH += \
++    $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.9.0 \
++    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.9.0
++
+ 
+ DEFINES += QT_NO_FOREACH
+ 
+diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro
+index 6652cefd86..03c30f4a96 100644
+--- a/src/plugins/platforms/offscreen/offscreen.pro
++++ b/src/plugins/platforms/offscreen/offscreen.pro
+@@ -1,8 +1,18 @@
+ TARGET = qoffscreen
+ 
+ QT += \
+-    core-private gui-private \
+-    eventdispatcher_support-private fontdatabase_support-private
++    core-private gui-private
++
++# Fix linker error when building libqoffscreen.dll by specifying linker flags for
++# required modules manually (otherwise order is messed)
++LIBS += \
++    -lQt5EventDispatcherSupport \
++    -lQt5FontDatabaseSupport \
++    -lfreetype -lole32 -lgdi32 -luuid
++# However, this workaround leads to the necessity of specifying include dirs manually
++INCLUDEPATH += \
++    $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.9.0 \
++    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.9.0
+ 
+ DEFINES += QT_NO_FOREACH
+ 
+diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
+index 23168c10dc..07d0f16a88 100644
+--- a/src/plugins/platforms/windows/windows.pro
++++ b/src/plugins/platforms/windows/windows.pro
+@@ -1,11 +1,22 @@
+ TARGET = qwindows
+ 
+ QT += \
+-    core-private gui-private \
+-    eventdispatcher_support-private accessibility_support-private \
+-    fontdatabase_support-private theme_support-private
++    core-private gui-private
+ 
+-LIBS += -lgdi32 -ldwmapi
++# Fix linker error when building libqwindows.dll by specifying linker flags for
++# required modules manually (otherwise order is messed)
++LIBS += \
++    -lQt5EventDispatcherSupport \
++    -lQt5AccessibilitySupport \
++    -lQt5FontDatabaseSupport \
++    -lQt5ThemeSupport \
++    -lfreetype -lole32 -lgdi32 -ldwmapi
++# However, this workaround leads to the necessity of specifying include dirs manually
++INCLUDEPATH += \
++    $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.9.0 \
++    $$QT_SOURCE_TREE/include/QtAccessibilitySupport/5.9.0 \
++    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.9.0 \
++    $$QT_SOURCE_TREE/include/QtThemeSupport/5.9.0
+ 
+ include(windows.pri)
+ 
+-- 
+2.13.0
+

qt5-base/mingw-w64-angle/PKGBUILD

@@ -77,16 +77,16 @@ isNoOpenGL() {
 }
 
 pkgname=mingw-w64-qt5-base-angle
-pkgver=5.8.0
-pkgrel=3
+pkgver=5.9.0
+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')
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 depends=('mingw-w64-crt' 'mingw-w64-zlib' 'mingw-w64-libjpeg-turbo' 'mingw-w64-sqlite'
-         'mingw-w64-libpng' 'mingw-w64-openssl' 'mingw-w64-dbus' 'mingw-w64-harfbuzz'
-         'mingw-w64-pcre')
+         'mingw-w64-libpng' 'mingw-w64-openssl-1.0' 'mingw-w64-dbus' 'mingw-w64-harfbuzz'
+         'mingw-w64-pcre2')
 groups=('mingw-w64-qt5')
 optdepends=('mingw-w64-postgresql: PostgreSQL support' 'mingw-w64-mariadb-connector-c: MySQL support')
 makedepends=('mingw-w64-gcc' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-pkg-config')
@@ -102,61 +102,62 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
         '0007-Prevent-debug-library-names-in-pkg-config-files.patch'
         '0008-Fix-linking-against-shared-static-libpng.patch'
         '0009-Fix-linking-against-static-D-Bus.patch'
-        '0010-Fix-linking-against-static-freetype2.patch'
-        '0011-Fix-linking-against-static-harfbuzz.patch'
-        '0012-Fix-linking-against-static-pcre.patch'
-        '0013-Fix-linking-against-shared-static-MariaDB.patch'
-        '0014-Fix-linking-against-shared-static-PostgreSQL.patch'
-        '0015-Rename-qtmain-to-qt5main.patch'
-        '0016-Build-dynamic-host-libraries.patch'
-        '0017-Enable-rpath-for-build-tools.patch'
-        '0018-Use-system-zlib-for-build-tools.patch'
-        '0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch'
-        '0020-Use-.dll.a-as-import-lib-extension.patch'
-        '0021-Merge-shared-and-static-library-trees.patch'
-        '0022-Allow-usage-of-static-version-with-CMake.patch'
-        '0023-Use-correct-pkg-config-static-flag.patch'
-        '0024-Fix-macro-invoking-moc-rcc-and-uic.patch'
-        '0025-Ignore-errors-about-missing-feature-static.patch'
-        '0026-Enable-and-fix-use-of-iconv.patch'
-        '0027-Ignore-failing-pkg-config-test.patch'
-        '0028-Include-uiviewsettingsinterop.h-correctly.patch'
-        '0029-Hardcode-linker-flags-for-libqwindows.dll.patch'
-        '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch')
-md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
-         '4f725d3b11329b38e25fed9a1d1d279a'
-         '6ae90af85ee7212f2097b2e92b0e2c46'
-         'bdb2c93fa4e688274691ea8ec2b10907'
-         '1189a3a1d90a9dfb8b20b2fc92c74cf2'
-         'ca7340bab827ae3cb85aadafcb4be783'
-         '4b1d4a6f45e6ff63e478b77b0bc07138'
-         '76aa0757e329d49c2d243cf13ebfc991'
-         '1a4c3201cc8d2096588cdf939f6c4e3a'
-         '6e9bf21df1c032c2ded111949d6888fa'
-         '517e525e61777652cc9cc378f53aa75e'
-         'c67f73e3ae3f52df548aac14093406b8'
-         '86eee18e0c8dd0f94155eca48f175a0e'
-         'd58a065a408ee7c9831c80de91f5c8af'
-         'fc73e39c859b19ee98065305399ae2e2'
-         '2bc4f40aaac5e62b4e01c7dc1d8a381b'
-         '1f460216b0074e5deded85f5eb64c0db'
-         'e1658603a165f388bc260a70d39d6114'
-         '8eecb292d3ae281967d2f586f64b1959'
-         '3ae4ad36bb37cc0793b96c10b98603c0'
-         '1825be44a99982893849bf12c9c2edbf'
-         'a41c9d756c465adf98acedbdf81d3b74'
-         'c48cad72d59cc19a48193e5911c84c1c'
-         '5576070ff3b7263eb0ea61e8ab50017f'
-         '64f175bb799575f52d26a99924015895'
-         '450767e45637a132c457b59b365efd8c'
-         'd5526f9f6d0e315d5526ad1a7420f35a'
-         '67f0dcc84e59685dc38eb81097f5df23'
-         'f81f75d41c1a9b5421ff090625325405'
-         '25e7218e60b52eef70c6e9596d844c07'
-         '5952dd9939639d144f28acc768cff946')
+        '0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch'
+        '0011-Fix-linking-against-static-freetype2.patch'
+        '0012-Fix-linking-against-static-harfbuzz.patch'
+        '0013-Fix-linking-against-static-pcre.patch'
+        '0014-Fix-linking-against-shared-static-MariaDB.patch'
+        '0015-Fix-linking-against-shared-static-PostgreSQL.patch'
+        '0016-Rename-qtmain-to-qt5main.patch'
+        '0017-Build-dynamic-host-libraries.patch'
+        '0018-Enable-rpath-for-build-tools.patch'
+        '0019-Use-system-zlib-for-build-tools.patch'
+        '0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch'
+        '0021-Use-.dll.a-as-import-lib-extension.patch'
+        '0022-Merge-shared-and-static-library-trees.patch'
+        '0023-Allow-usage-of-static-version-with-CMake.patch'
+        '0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch'
+        '0025-Use-correct-pkg-config-static-flag.patch'
+        '0026-Fix-macro-invoking-moc-rcc-and-uic.patch'
+        '0027-Ignore-errors-about-missing-feature-static.patch'
+        '0028-Enable-and-fix-use-of-iconv.patch'
+        '0029-Ignore-failing-pkg-config-test.patch'
+        '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch'
+        '0031-Hardcode-linker-flags-for-platform-plugins.patch')
+sha256sums=('267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c'
+            'b4406bba39ee7c8cf74c3b8a98b936b46772ca1798ef6884b7b1574ece80fbdc'
+            '86cf470f1694abf6973f7b0f8e6cb75dd8a58e9335bab075b25229d26064adab'
+            '670b6cd7a6ee49f12ccf4121e997055daec887d080baf0269793b1d0243d1d89'
+            '878c08a1e9d0c8d639ddbdbc944ac8647ff204e9f078ddd9337737b2b929c2ed'
+            '38533dba16df99074e8c3f5d52bc15fabdbaffe0a56dbed79683c47f08342587'
+            '5ef3a569f4c53e848750ff655342e92a103abe78495905a5ef47afea9da8d1fb'
+            'd21ebc9465a19e01912ebccb365b4f7ecfd3a95787c1de2640f29bdbc161983c'
+            '0622a2e606d9edbea23d3a5724ea9d4ed3958e60296b85134176c3980d590a41'
+            '90f1347e5c41b9e447c0339715d19e0434a0b58c36fd8405e850190fe17369dc'
+            '6b6ebfdf598658172680e4e83d2c3de24dcbc93233b0f48d5ccbf760d8f59a5c'
+            '11ce05f79174440406d84b38023d81c1fa87034119360fa2f0bd3887429fa694'
+            'c30c558ea413c986aec2ffe86e34dd8e99f96cbc615e3963f711ec1628888114'
+            'b9fbfc213089e3b44ed888f4e628030e78dd84c8030ba7a2a9f79fbf31312934'
+            '94ebedf699ebc0a5c6fed307eecd3dfabf9f864c696f3cf17bd8462789c1fae2'
+            'df05b0f65dcafede1f83ce190895e6c6f4a22feecb1c5b1a0ba03f4948e56220'
+            '0acae3adb542d6ea0b405a947adf087826b4971df133b984d9166a9872e5cc98'
+            'bb825226ca1e97cb49c3ac3a0c03a7db9f3e1eca632628d344201fcf9816376d'
+            'e74fb8219bf599fbe5fbd1b08ff89d717089f1fa4d9e488a60e6097b212b7391'
+            'cf3f90b69feb98e42ede770828db4538a3dd31dd02b2b15f55ea1743db5868ad'
+            '813cd1c22e3211133337231e1df754b5560159eecf1cf3eef0408d335e186190'
+            'a0feb7b5a9747d6a88058360fc34f8ac8fb3cdeb2b343a5a2b28a88fdabb45b3'
+            '82f8f1eba6ac63c9a8749e20eb57fad80e92ddd5a58912a60a8c2fad9e83d6eb'
+            '34652aec17d7511815db59b438b0597e52b7f43c19d068e7e417325897a72254'
+            'dcfe2103ace81898960316dd691fae38d05b2b6a79dc0ae0f245ae402f1101a8'
+            '0682dcc62b44717fa850700cec183cd856ce7335f26884ab15d4d0e7d3543bfe'
+            'cecf5ff2916d95ffdbcf60ba3e18297a6107e17e9766a5e4d8b9ae748d99ba52'
+            '79bc920bb539fc68001b5def07eea3e45eb3d2c6aa3f2a949823236adf8e4633'
+            '80757f614fe02bfb85d00292d4f84c9f2ab2c39a512c21e956df135f3fbfdd81'
+            'cc46ffc3a2183539aba923fb256045464eaae37a666034172138f4689a5c9bd3'
+            'f0e63e022d1e52b82a7622828b568c57d1422f9726e116902cd2be81fec45da4'
+            '28b11e63f570891212073b3739a20489304d3c7205ae38471cbd6b15c651fabc')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
-#_architectures='x86_64-w64-mingw32 i686-w64-mingw32'
 
 isStatic && depends+=(${pkgname%-static})
 if isANGLE; then
@@ -220,6 +221,9 @@ build() {
   unset PKG_CONFIG_PATH
 
   for _arch in ${_architectures}; do
+    echo "INCLUDEPATH += /usr/${_arch}/include/openssl-1.0" >> src/network/network.pro
+    export OPENSSL_LIBS='-L/usr/${_arch}/lib/openssl-1.0 -lssl -lcrypto'
+
     # Phonon is disabled for now because we lack the directx headers
     # FIXME: check whether this is still the case
 

qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch

@@ -1,7 +1,7 @@
-From eb3e8004e4cb74f021294e1e57dd268af001980e Mon Sep 17 00:00:00 2001
+From 9e46af21edffe2c27d2239ae2133c5a442cd7b43 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/30] Add profile for cross compilation with mingw-w64
+Subject: [PATCH 01/31] Add profile for cross compilation with mingw-w64
 
 ---
  mkspecs/mingw-w64-g++/qmake.conf      | 125 +++++++++++++++++++++++++++
@@ -12,7 +12,7 @@ Subject: [PATCH 01/30] Add profile for cross compilation with mingw-w64
 
 diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf
 new file mode 100644
-index 0000000000..6f21ae75d5
+index 0000000000..3908c1a7e2
 --- /dev/null
 +++ b/mkspecs/mingw-w64-g++/qmake.conf
 @@ -0,0 +1,125 @@
@@ -128,7 +128,7 @@ index 0000000000..6f21ae75d5
 +QMAKE_PKG_CONFIG        = $${CROSS_COMPILE}pkg-config
 +
 +QMAKE_LIBS              =
-+QMAKE_LIBS_CORE         = -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
++QMAKE_LIBS_CORE         = -lz -lpcre2-16 -lversion -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
 +QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
 +                          $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
 +                          $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
@@ -303,5 +303,5 @@ index 0000000000..c5a70b1445
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 0223c4145ff17cb79e720ed12b24819262aa5353 Mon Sep 17 00:00:00 2001
+From b8a768c9d6b67c09515e927344dc750880fe5150 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/30] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---
@@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required
  1 file changed, 2 deletions(-)
 
 diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
-index aad48571b3..46f44d8b91 100644
+index 0a5de2c9af..35798a2a28 100644
 --- a/src/gui/opengl/qopenglfunctions.h
 +++ b/src/gui/opengl/qopenglfunctions.h
 @@ -56,9 +56,7 @@
@@ -23,5 +23,5 @@ index aad48571b3..46f44d8b91 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 1ffc87d8805a92fb7666084c656bac46cd276599 Mon Sep 17 00:00:00 2001
+From 7a6384756287b07c0e3a6e18ed07414a7672feee Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/30] Use external ANGLE library
+Subject: [PATCH 03/31] Use external ANGLE library
 
 ---
  src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
@@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644
  
  _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
 diff --git a/src/gui/gui.pro b/src/gui/gui.pro
-index 5f8cbe2cbe..0ebf6b7281 100644
+index cfdb5e889b..4afb45e592 100644
 --- a/src/gui/gui.pro
 +++ b/src/gui/gui.pro
 @@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@@ -66,11 +66,11 @@ index 718a886809..89965709ed 100644
  HEADERS += qgl.h \
             qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index 20e0b81da9..b55847fc69 100644
+index 73677311f5..05a1dc2e6e 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
-@@ -2,6 +2,7 @@
- LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+ QT_FOR_CONFIG += gui
  
  qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32
 +qtConfig(angle):LIBS += -lGLESv2 -lEGL
@@ -78,10 +78,10 @@ index 20e0b81da9..b55847fc69 100644
  mingw: LIBS *= -luuid
  # For the dialog helpers:
 diff --git a/src/src.pro b/src/src.pro
-index 90d7e2b76c..92e89ea39f 100644
+index 43fc06f2e5..4188d4ea6b 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -160,10 +160,6 @@ qtConfig(gui) {
+@@ -175,10 +175,6 @@ qtConfig(gui) {
          SUBDIRS += src_3rdparty_harfbuzzng
          src_gui.depends += src_3rdparty_harfbuzzng
      }
@@ -93,5 +93,5 @@ index 90d7e2b76c..92e89ea39f 100644
          SUBDIRS += src_3rdparty_libpng
          src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 447092efb62e94bc69b3899093e1ee10af18d81b Mon Sep 17 00:00:00 2001
+From c815500b1cbe99d31d10fa416d391ebe9f6db56e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 04/30] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 04/31] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.
@@ -11,7 +11,7 @@ Hence the assembler option -mbig-obj is required.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
-index 1a1022b3a7..792bdf9e7a 100644
+index 4c778b184e..1dd1755d7f 100644
 --- a/src/gui/opengl/opengl.pri
 +++ b/src/gui/opengl/opengl.pri
 @@ -3,7 +3,8 @@
@@ -25,5 +25,5 @@ index 1a1022b3a7..792bdf9e7a 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 74be1cdb27c34b149b4b227a8c3107ca49cc254a Mon Sep 17 00:00:00 2001
+From ca3aca842c36f8d69320f5629071d29563b91081 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/30] Make sure *.pc files are installed correctly
+Subject: [PATCH 05/31] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -10,10 +10,10 @@ Subject: [PATCH 05/30] 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 4450e619b9..182fe79238 100644
+index c76708285a..fb886e00d2 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3150,7 +3150,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3152,7 +3152,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
  }
  
  QString
@@ -22,7 +22,7 @@ index 4450e619b9..182fe79238 100644
  {
      QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
      if (ret.isEmpty()) {
-@@ -3175,7 +3175,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3177,7 +3177,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
      if(fixify) {
          if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
              ret.prepend(project->first("DESTDIR").toQString());
@@ -36,7 +36,7 @@ index 4450e619b9..182fe79238 100644
      return ret;
  }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index 86fec748eb..cbe23d7e3a 100644
+index 4ced3bd121..f7cc3b9e9b 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
 @@ -89,7 +89,7 @@ protected:
@@ -49,10 +49,10 @@ index 86fec748eb..cbe23d7e3a 100644
      void writePkgConfigFile();   // for pkg-config
  
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 3c029c8004..caa000ea53 100644
+index 2013698c99..b6b8dda397 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -721,7 +721,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -724,7 +724,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                  }
                  if(!ret.isEmpty())
                      ret += "\n\t";
@@ -62,5 +62,5 @@ index 3c029c8004..caa000ea53 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From fee4dff74c2483c2f4a4d7299e062c366431fc53 Mon Sep 17 00:00:00 2001
+From a0b4f7192c90214a2950382679b259e143dfc4bc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/30] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/31] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references
@@ -24,5 +24,5 @@ index 8d5a9a7d0f..d2cf8d9afc 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 995313e0795df5500fd84350e80a3f88202b473d Mon Sep 17 00:00:00 2001
+From 6656828260372d7e2e6256fa85e37a830b58260c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/30] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/31] 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 182fe79238..a762443fe2 100644
+index fb886e00d2..55e25d596a 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3166,6 +3166,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
          if (dot != -1)
              ret = ret.left(dot);
      }
@@ -29,5 +29,5 @@ index 182fe79238..a762443fe2 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,26 +1,27 @@
-From f3a39738bcf7560f023bd280017aedaeb756e5c2 Mon Sep 17 00:00:00 2001
+From 4fb07cf7290b97694586f3f30489165f114ca439 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 08/30] Fix linking against shared/static libpng
+Subject: [PATCH 08/31] Fix linking against shared/static libpng
 
+Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
  src/gui/configure.json | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 1f5011617c..5006ff5a3a 100644
+index 73e59a7ad9..6dee7d18aa 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -161,7 +161,8 @@
+@@ -162,7 +162,8 @@
              "sources": [
                  { "type": "pkgConfig", "args": "libpng" },
                  { "libs": "-llibpng", "condition": "config.msvc" },
 -                { "libs": "-lpng", "condition": "!config.msvc" }
 +                { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" },
 +                { "libs": "-lpng", "condition": "!config.msvc && features.shared" }
-             ]
-         },
-         "mirclient": {
+             ],
+             "use": [
+                 { "lib": "zlib", "condition": "features.system-zlib" }
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 3379bc4d4d65124ec08aa8dade1b6b2a7b25f61e Mon Sep 17 00:00:00 2001
+From c481c20ed0c454b6e32fd37f6abf99c5bb118a83 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 09/30] Fix linking against static D-Bus
+Subject: [PATCH 09/31] Fix linking against static D-Bus
 
 ---
  config.tests/unix/dbus/dbus.cpp | 4 ++++
@@ -25,10 +25,10 @@ index 295c904400..80d3e9c044 100644
  #include <dbus/dbus.h>
  
 diff --git a/configure.json b/configure.json
-index f774291d22..12714da714 100644
+index 02d5f1a65e..7f005e99f5 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -158,12 +158,16 @@
+@@ -159,12 +159,16 @@
              "sources": [
                  { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
                  {
@@ -62,5 +62,5 @@ index cfc0e12046..65f1397cd6 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.12.2
+2.13.0
 

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

@@ -0,0 +1,29 @@
+From aaf4a548cf6fbe17f0ff11eb370cf7e27ab85221 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 2 Jun 2017 18:28:10 +0200
+Subject: [PATCH 10/31] 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
+
+Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
+---
+ configure.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.json b/configure.json
+index 7f005e99f5..27b1460f93 100644
+--- a/configure.json
++++ b/configure.json
+@@ -165,7 +165,7 @@
+                 {
+                     "libs": "",
+                     "builds": {
+-                        "debug": "-ldbus-1d",
++                        "debug": "-ldbus-1",
+                         "release": "-ldbus-1"
+                     },
+                     "condition": "config.win32 && features.shared"
+-- 
+2.13.0
+

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

@@ -1,17 +1,17 @@
-From 24c3bda7db1733545350436d8c2f489be5395650 Mon Sep 17 00:00:00 2001
+From 50aa5c34a1240f86092a90241fba27a332f9003c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 10/30] Fix linking against static freetype2
+Subject: [PATCH 11/31] Fix linking against static freetype2
 
 ---
  src/gui/configure.json | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 5006ff5a3a..6530357be9 100644
+index 6dee7d18aa..d6ed20e5c6 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -99,8 +99,11 @@
+@@ -100,8 +100,11 @@
              "label": "FreeType",
              "test": "unix/freetype",
              "sources": [
@@ -26,5 +26,5 @@ index 5006ff5a3a..6530357be9 100644
          },
          "fontconfig": {
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,17 @@
-From 52c34159dec8c829d1f2928d2c9a56bb7299fbff Mon Sep 17 00:00:00 2001
+From 9bea663dc73c714d606f5acc65a8f84129f1428e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 11/30] Fix linking against static harfbuzz
+Subject: [PATCH 12/31] 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 6530357be9..c5b9b1542a 100644
+index d6ed20e5c6..8937d38f63 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -125,7 +125,11 @@
+@@ -126,7 +126,11 @@
              "label": "HarfBuzz",
              "test": "unix/harfbuzz",
              "sources": [
@@ -25,5 +25,5 @@ index 6530357be9..c5b9b1542a 100644
          },
          "imf": {
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,27 +1,28 @@
-From e2c35b81ed48f46c2260ad9e59ff7f50b073e9d4 Mon Sep 17 00:00:00 2001
+From 6db4ce18fb06d080cd2384f1c4a8a2197a8b5434 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 12/30] Fix linking against static pcre
+Subject: [PATCH 13/31] Fix linking against static pcre
 
+Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
  src/corelib/tools/qregularexpression.cpp | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 4a30daa72c..3d7c811124 100644
+index 88b696f53a..afe444027e 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
-@@ -54,6 +54,10 @@
- #include <QtCore/qatomic.h>
+@@ -55,6 +55,10 @@
  #include <QtCore/qdatastream.h>
  
+ #define PCRE2_CODE_UNIT_WIDTH 16
 +#ifdef QT_STATIC
 +#define PCRE_STATIC
++#define PCRE2_STATIC
 +#endif
-+
- #include <pcre.h>
  
- QT_BEGIN_NAMESPACE
+ #include <pcre2.h>
+ 
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,26 +1,27 @@
-From 889ea99f62dd010c168cce6b18f0d49fb2a48203 Mon Sep 17 00:00:00 2001
+From ea1df506321d35a9f8a648ea98642b034b7ace48 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 13/30] Fix linking against shared/static MariaDB
+Subject: [PATCH 14/31] Fix linking against shared/static MariaDB
 
+Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
  src/sql/configure.json | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/src/sql/configure.json b/src/sql/configure.json
-index 96c82e84f9..fce948026f 100644
+index 49444c7e5f..d162d7bc09 100644
 --- a/src/sql/configure.json
 +++ b/src/sql/configure.json
-@@ -58,6 +58,9 @@
+@@ -57,6 +57,9 @@
              "label": "MySQL",
              "test": "unix/mysql",
              "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" },
-                 { "type": "mysqlConfig", "query": "--libs" },
-                 { "libs": "-lmysqlclient_r", "condition": "!config.win32" },
+                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
+                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
+                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,17 @@
-From 953ca26efa1cb2e86a958c52ce737ada0078e1a3 Mon Sep 17 00:00:00 2001
+From cb4fbac9533065928a6c839da4675c60cb7fe6c0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 14/30] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 15/31] Fix linking against shared/static PostgreSQL
 
 ---
  src/sql/configure.json | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/sql/configure.json b/src/sql/configure.json
-index fce948026f..f560c191fd 100644
+index d162d7bc09..0f86b23f22 100644
 --- a/src/sql/configure.json
 +++ b/src/sql/configure.json
-@@ -72,9 +72,10 @@
+@@ -73,9 +73,10 @@
              "label": "PostgreSQL",
              "test": "unix/psql",
              "sources": [
@@ -25,5 +25,5 @@ index fce948026f..f560c191fd 100644
              ]
          },
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From e81d865a144c5c12ea1b93922a8c27f676aad531 Mon Sep 17 00:00:00 2001
+From f0f623ebdc7e578047212feac62044e08aaf08cb Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 15/30] Rename qtmain to qt5main
+Subject: [PATCH 16/31] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -11,7 +11,7 @@ Prevents conflict with mingw-w64-qt4 package
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 1099e14b17..ed9b82fba9 100644
+index bb5083c925..146e83ae67 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -225,8 +225,8 @@ mac {
@@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
  
  CONFIG += static
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,20 @@
-From b91bb54e98627bd92ff740ed547d52febb3523d4 Mon Sep 17 00:00:00 2001
+From bd8345de18a4ad2bdcc17710c69c09ad2f81c83f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
-Subject: [PATCH 16/30] Build dynamic host libraries
+Subject: [PATCH 17/31] Build dynamic host libraries
 
-For better accordance with Arch Linux packaging
-standards
+This came initially from Fedora, not sure whether
+it makes sense to keep it. Regular Arch package
+uses static lib as intended by upstream.
+
+Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
 ---
  mkspecs/features/qt_module.prf              | 2 +-
  src/tools/bootstrap-dbus/bootstrap-dbus.pro | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 31d628596c..360c99ac73 100644
+index 36f632e8ca..2deec56866 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -24,7 +24,7 @@ requires(!$$skip)
@@ -34,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,11 +1,13 @@
-From 0e79722e8c8162f87b2b765932d3507de2f20a88 Mon Sep 17 00:00:00 2001
+From 905438dce78dd9fb08692b81bfbed4caa30fd23e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 17/30] Enable rpath for build tools
+Subject: [PATCH 18/31] Enable rpath for build tools
 
-- Required because library various tools depend on (libQt5Bootstrap.so) resides
+- Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib
 - Can't use regular lib dir because it would conflict with the native package
+
+Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7
 ---
  mkspecs/features/qt_app.prf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -31,5 +33,5 @@ index cb84ae0da8..8d9471ed0a 100644
  INSTALLS += target
  
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,17 @@
-From 510f64af3d51b140e18cbf026cbfd4990ba973d5 Mon Sep 17 00:00:00 2001
+From aa62a2156a564f8125d3dfdac08124673d123016 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 18/30] Use system zlib for build tools
+Subject: [PATCH 19/31] Use system zlib for build tools
 
 ---
  src/tools/bootstrap/bootstrap.pro | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index d51f9e98a4..2242b7c4f1 100644
+index 521dd5f0f2..eb8cb4770c 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -127,7 +127,7 @@ macx {
+@@ -129,7 +129,7 @@ macx {
          ../../corelib/io/qstandardpaths_win.cpp
  }
  
@@ -21,5 +21,5 @@ index d51f9e98a4..2242b7c4f1 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.12.2
+2.13.0
 

qt5-base/mingw-w64-dynamic/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch

@@ -1,7 +1,7 @@
-From 12e64d649d5a01b4f878778aa6c183ceb51b28e7 Mon Sep 17 00:00:00 2001
+From 7d3b433e7a103e2f26cf183e1d9910b4d33a97ec Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:20:25 +0200
-Subject: [PATCH 19/30] Disable determing default include and lib dirs at qmake
+Subject: [PATCH 20/31] Disable determing default include and lib dirs at qmake
  time when building with mingw-w64
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 19/30] Disable determing default include and lib dirs at qmake
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
-index 3f266dd2a4..258d374ee0 100644
+index 46a9c5707a..e82383f9ff 100644
 --- a/mkspecs/features/toolchain.prf
 +++ b/mkspecs/features/toolchain.prf
-@@ -13,7 +13,7 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build {
+@@ -21,7 +21,7 @@ isEmpty($${target_prefix}.INCDIRS) {
      #
      # Get default include and library paths from compiler
      #
@@ -22,5 +22,5 @@ index 3f266dd2a4..258d374ee0 100644
              cmd_prefix = "LC_ALL=C"
              cmd_suffix = "</dev/null >/dev/null"
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From cea6744e8b23c780033c4e5a2f51fdb0bd60153c Mon Sep 17 00:00:00 2001
+From 7ccfcf6a364c00f5ec0204b4614ae78dd2296c0e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 20/30] Use *.dll.a as import lib extension
+Subject: [PATCH 21/31] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 mingw-w64 specific mkspec
@@ -11,7 +11,7 @@ mingw-w64 specific mkspec
  2 files changed, 15 insertions(+), 7 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index ed9b82fba9..461a7fdff5 100644
+index 146e83ae67..15fc070008 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -236,8 +236,9 @@ mac {
@@ -27,7 +27,7 @@ index ed9b82fba9..461a7fdff5 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 caa000ea53..e6338546bb 100644
+index b6b8dda397..d9388e8518 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@@ -64,5 +64,5 @@ index caa000ea53..e6338546bb 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,9 +1,11 @@
-From 7d8372b48046631d93ea260649d29a023fe29b01 Mon Sep 17 00:00:00 2001
+From 842da3facc0a4e3269d391b57bd1207a796b8628 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 21/30] Merge shared and static library trees
+Subject: [PATCH 22/31] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
+
+Change-Id: Ie60ddbe967cb553d5d92d5a706398a1e7385344a
 ---
  configure.pri                     |  7 +++++++
  mkspecs/features/default_post.prf | 11 +++++++++++
@@ -13,13 +15,13 @@ Allow installation of shared and static build in the same prefix
  5 files changed, 47 insertions(+), 6 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index 19719736a9..0c4b8ebbf8 100644
+index be1b166080..9a5c6cb30d 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -555,3 +555,10 @@ QMAKE_POST_CONFIGURE += \
+@@ -1181,3 +1181,10 @@ defineTest(createConfigStatus) {
  
- # load and process input from configure.sh/.exe
- include($$shadowed($$PWD)/config.tests/configure.cfg)
+ QMAKE_POST_CONFIGURE += \
+     "createConfigStatus()"
 +
 +# merge shared and static library trees
 +contains(CONFIG, static) {
@@ -28,7 +30,7 @@ index 19719736a9..0c4b8ebbf8 100644
 +    QT_CONFIG -= shared
 +}
 diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
-index e7e9a5bd87..72305ad9b8 100644
+index d6caf870f7..7bff3d32ba 100644
 --- a/mkspecs/features/default_post.prf
 +++ b/mkspecs/features/default_post.prf
 @@ -1,5 +1,16 @@
@@ -49,10 +51,10 @@ index e7e9a5bd87..72305ad9b8 100644
  
  !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 98f794c485..1799622edd 100644
+index 3ccbbe7061..20b02d5ca9 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -152,6 +152,21 @@ for(ever) {
+@@ -255,6 +255,21 @@ for(ever) {
              !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                  WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
          }
@@ -97,10 +99,10 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a762443fe2..8ac3a0f647 100644
+index 55e25d596a..990d10a286 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3167,6 +3167,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3169,6 +3169,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
      if (project->isActiveConfig("debug")) {
          ret += "d";
      }
@@ -110,7 +112,7 @@ index a762443fe2..8ac3a0f647 100644
      ret += Option::pkgcfg_ext;
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
-@@ -3340,9 +3343,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3342,9 +3345,9 @@ MakefileGenerator::writePkgConfigFile()
      t << endl;
  
      // requires
@@ -124,5 +126,5 @@ index a762443fe2..8ac3a0f647 100644
  
      t << endl;
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,25 +1,27 @@
-From 1c1935b0d6e6685181880f6d591677ed49b0695e Mon Sep 17 00:00:00 2001
+From 884534d5a74833a3666e1d34a30a9ea600a92df4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 22/30] Allow usage of static version with CMake
+Subject: [PATCH 23/31] Allow usage of static version with CMake
 
 - Fix plugin detection and various details
 - Allow selecting between dynamic and static Qt versions
   installed in the same prefix
   - Use eg. find_package(Qt5Core) for dynamic version
   - and eg. find_package(StaticQt5Core) for static version
+
+Change-Id: Idf2d3ab8e3581910f59d9727ef6b48e105729463
 ---
  mkspecs/features/create_cmake.prf                  |  85 +++--
- .../features/data/cmake/Qt5BasicConfig.cmake.in    | 358 ++++++++++++++-------
+ .../features/data/cmake/Qt5BasicConfig.cmake.in    | 372 ++++++++++++++-------
  .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 +-
  qmake/generators/makefile.cpp                      |   7 +
- src/corelib/Qt5CoreConfigExtras.cmake.in           |  37 ++-
+ src/corelib/Qt5CoreConfigExtras.cmake.in           |  30 +-
  src/gui/Qt5GuiConfigExtras.cmake.in                |  12 +-
  src/testlib/Qt5TestConfigExtras.cmake.in           |   4 +
- 7 files changed, 372 insertions(+), 161 deletions(-)
+ 7 files changed, 372 insertions(+), 168 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 461a7fdff5..c4afc5251b 100644
+index 15fc070008..0914532f54 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -38,7 +38,8 @@ split_incpath {
@@ -222,7 +224,7 @@ index 461a7fdff5..c4afc5251b 100644
  # We are generating cmake files. Most developers of Qt are not aware of cmake,
  # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d2358cae4b..6365d0f9ff 100644
+index 4f342d67d7..908f7f59a7 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -35,15 +35,18 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
@@ -446,16 +448,20 @@ index d2358cae4b..6365d0f9ff 100644
  !!ENDIF // TEMPLATE != aux
      set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
  
-@@ -167,7 +225,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -166,10 +224,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+     endif()
  !!ENDIF
  
+-    set(Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
++    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
+ 
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED)
 -    if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
 +    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
          set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
      endif()
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -175,17 +233,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -177,17 +235,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
          set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
      endif()
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
@@ -477,7 +483,7 @@ index d2358cae4b..6365d0f9ff 100644
                  $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                  ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                  ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -193,28 +251,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -195,28 +253,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              )
          endif()
  
@@ -522,7 +528,7 @@ index d2358cae4b..6365d0f9ff 100644
  
  !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
      if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
-@@ -223,81 +285,179 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -225,28 +287,124 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ENDIF
  
  !!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -647,6 +653,36 @@ index d2358cae4b..6365d0f9ff 100644
 +        endforeach()
 +    endif()
  
+     set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
+-    foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
++    foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
+         if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
+             set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST FALSE)
+         endif()
+@@ -254,9 +412,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ 
+     if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST
+         AND NOT CMAKE_VERSION VERSION_LESS 3.0.0 )
+-        add_library(Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
+-        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
+-            INTERFACE_INCLUDE_DIRECTORIES ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
++        add_library($${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
++        set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
++            INTERFACE_INCLUDE_DIRECTORIES ${$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
+         )
+         set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
+         foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
+@@ -264,66 +422,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
+             endif()
+         endforeach()
+-        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
+-            INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
++        set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
++            INTERFACE_LINK_LIBRARIES $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
+         )
+     endif()
+ 
  !!IF !equals(TEMPLATE, aux)
  !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -727,7 +763,7 @@ index d2358cae4b..6365d0f9ff 100644
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
          \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -310,9 +470,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -336,9 +496,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -741,7 +777,7 @@ index d2358cae4b..6365d0f9ff 100644
  !!ENDIF // CMAKE_RELEASE_TYPE
  !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
  
-@@ -323,37 +485,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -349,37 +511,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      )
  !!ENDIF // TEMPLATE != aux
  
@@ -827,7 +863,7 @@ index 5baf0fdb10..54345e4117 100644
 -list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 8ac3a0f647..ed4a1f5c30 100644
+index 990d10a286..35cb7d927a 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@@ -845,7 +881,7 @@ index 8ac3a0f647..ed4a1f5c30 100644
  }
  
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 545b9a3d1e..fd5c947b5f 100644
+index 545b9a3d1e..42a3c557aa 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -1,4 +1,10 @@
@@ -932,17 +968,6 @@ index 545b9a3d1e..fd5c947b5f 100644
                  IMPORTED_LINK_INTERFACE_LIBRARIES_${_config}
                      $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain>
              )
-@@ -188,3 +194,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH)
- set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\")
- 
- _qt5_Core_check_file_exists(${_Qt5CTestMacros})
-+
-+!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
-+set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)
-+# INTERFACE_LINK_LIBRARIES is used to pass a linker flag '-static' and library ws2_32
-+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
-+unset(_isExe)
-+!!ENDIF
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
 index 2e32911a64..31567d7da2 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -994,5 +1019,5 @@ index 2a575958ae..8312c90fd1 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.12.2
+2.13.0
 

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

@@ -0,0 +1,29 @@
+From 1f6fc1094a08c20ac78cc75e6667693676d10907 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 2 Jun 2017 16:42:07 +0200
+Subject: [PATCH 24/31] Adjust linker flags for static build with
+ cmake/mingw-w64
+
+Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
+---
+ src/corelib/Qt5CoreConfigExtras.cmake.in | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
+index 42a3c557aa..fd5c947b5f 100644
+--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
+@@ -194,3 +194,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH)
+ set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\")
+ 
+ _qt5_Core_check_file_exists(${_Qt5CTestMacros})
++
++!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
++set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)
++# INTERFACE_LINK_LIBRARIES is used to pass a linker flag '-static' and library ws2_32
++set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
++unset(_isExe)
++!!ENDIF
+-- 
+2.13.0
+

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

@@ -1,17 +1,17 @@
-From 2d7fb7169cfeed0c95a703b58fa7ec2412ba5daf Mon Sep 17 00:00:00 2001
+From 8cfdb2fc2573a49866ab98ce66e4473f4512dfb9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 23/30] Use correct pkg-config --static flag
+Subject: [PATCH 25/31] Use correct pkg-config --static flag
 
 ---
  configure.pri | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.pri b/configure.pri
-index 0c4b8ebbf8..8afb893e88 100644
+index 9a5c6cb30d..f8b1e3a1ab 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -138,6 +138,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -311,6 +311,9 @@ defineTest(qtConfTest_detectPkgConfig) {
              qtLog("Found pkg-config from path: $$pkgConfig")
          }
      }
@@ -22,5 +22,5 @@ index 0c4b8ebbf8..8afb893e88 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 4c840dc66e4506e27cbc967e8b236f77132d8eeb Mon Sep 17 00:00:00 2001
+From 27d8249c25041e18ae3168a733d34208b42f436d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 24/30] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 26/31] Fix macro invoking moc, rcc and uic
 
 * Otherwise the arguments aren't passed correctly leading to errors like
   ```
@@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
-index 23909c9f3f..0fa0f187cd 100644
+index 489bc75511..c980f4220d 100644
 --- a/src/corelib/Qt5CoreMacros.cmake
 +++ b/src/corelib/Qt5CoreMacros.cmake
 @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
@@ -70,5 +70,5 @@ index f5e7b7f050..18d120f0c7 100644
            MAIN_DEPENDENCY ${infile} VERBATIM)
          list(APPEND ${outfiles} ${outfile})
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From d66dd7d23bc3586779e23297ae61cefe2c69e9fb Mon Sep 17 00:00:00 2001
+From 3d7baa02c957207beffa3e2d4b936a6a6c5cc19b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 25/30] Ignore errors about missing feature static
+Subject: [PATCH 27/31] Ignore errors about missing feature static
 
 Not sure why this error occurs, let's hope for the best
 ---
@@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
-index 3762c14f98..a58200a297 100644
+index 150d2b2cc3..d93d24cce5 100644
 --- a/mkspecs/features/qt_build_config.prf
 +++ b/mkspecs/features/qt_build_config.prf
-@@ -132,5 +132,5 @@ defineTest(qtConfig) {
+@@ -135,5 +135,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -21,10 +21,10 @@ index 3762c14f98..a58200a297 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 999cd18154..6bf08ea583 100644
+index c00fdb73f8..d4d5599433 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -349,5 +349,5 @@ defineTest(qtConfig) {
+@@ -351,5 +351,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -32,5 +32,5 @@ index 999cd18154..6bf08ea583 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From f1909b3049c85c990da430b5842edcd2060e7529 Mon Sep 17 00:00:00 2001
+From 63a1e37e442e61f9d65e340e6602ad732ad26bdf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 26/30] Enable and fix use of iconv
+Subject: [PATCH 28/31] Enable and fix use of iconv
 
 Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
 ---
@@ -24,10 +24,10 @@ index 1276311e08..993a12c7ee 100644
      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 e4fb359f2c..771b1fa9f2 100644
+index d6362b6fbc..4da4546a24 100644
 --- a/src/corelib/codecs/qiconvcodec.cpp
 +++ b/src/corelib/codecs/qiconvcodec.cpp
-@@ -50,7 +50,6 @@ QT_REQUIRE_CONFIG(iconv);
+@@ -49,7 +49,6 @@ QT_REQUIRE_CONFIG(iconv);
  #include <errno.h>
  #include <locale.h>
  #include <stdio.h>
@@ -35,7 +35,7 @@ index e4fb359f2c..771b1fa9f2 100644
  
  // unistd.h is needed for the _XOPEN_UNIX macro
  #include <unistd.h>
-@@ -183,7 +182,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState
+@@ -182,7 +181,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 +44,7 @@ index e4fb359f2c..771b1fa9f2 100644
      // GNU doesn't disagree with POSIX :/
      const char *inBytes = chars;
  #else
-@@ -282,7 +281,7 @@ static bool setByteOrder(iconv_t cd)
+@@ -281,7 +280,7 @@ static bool setByteOrder(iconv_t cd)
      size_t outBytesLeft = sizeof buf;
      size_t inBytesLeft = sizeof bom;
  
@@ -53,7 +53,7 @@ index e4fb359f2c..771b1fa9f2 100644
      const char **inBytesPtr = const_cast<const char **>(&inBytes);
  #else
      char **inBytesPtr = &inBytes;
-@@ -304,7 +303,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
+@@ -303,7 +302,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
      char *outBytes;
      size_t inBytesLeft;
  
@@ -63,10 +63,10 @@ index e4fb359f2c..771b1fa9f2 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index 0d1954c3a8..32bbe92f57 100644
+index c6c5c93ddb..62c75f37ab 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
-@@ -263,9 +263,9 @@
+@@ -256,9 +256,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",
@@ -79,5 +79,5 @@ index 0d1954c3a8..32bbe92f57 100644
          },
          "icu": {
 -- 
-2.12.2
+2.13.0
 

qt5-base/mingw-w64-dynamic/0028-Include-uiviewsettingsinterop.h-correctly.patch

@@ -1,25 +0,0 @@
-From 101d2b3b5317ca5fab2dfead3982c37fe9682e94 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Wed, 25 Jan 2017 23:41:16 +0100
-Subject: [PATCH 28/30] Include uiviewsettingsinterop.h correctly
-
----
- src/plugins/platforms/windows/qwin10helpers.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp
-index 977bbfd11b..12cccd124b 100644
---- a/src/plugins/platforms/windows/qwin10helpers.cpp
-+++ b/src/plugins/platforms/windows/qwin10helpers.cpp
-@@ -57,7 +57,7 @@
- #endif
- 
- #ifdef HAS_UI_VIEW_SETTINGS_INTEROP
--#  include <UIViewSettingsInterop.h>
-+#  include <uiviewsettingsinterop.h>
- #endif
- 
- #ifndef HAS_UI_VIEW_SETTINGS_INTEROP
--- 
-2.12.2
-

qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-libqwindows.dll.patch

@@ -1,45 +0,0 @@
-From bff29dca9fb69fd29dc4b741652429cbdfb4bf50 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 29/30] Hardcode linker flags for libqwindows.dll
-
-Otherwise incorrect order of libs leads to linker
-errors
----
- src/plugins/platforms/windows/windows.pro | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
-index 23168c10dc..e27cf1a248 100644
---- a/src/plugins/platforms/windows/windows.pro
-+++ b/src/plugins/platforms/windows/windows.pro
-@@ -1,11 +1,22 @@
- TARGET = qwindows
- 
- QT += \
--    core-private gui-private \
--    eventdispatcher_support-private accessibility_support-private \
--    fontdatabase_support-private theme_support-private
-+    core-private gui-private
- 
--LIBS += -lgdi32 -ldwmapi
-+# Fix linker error when building libqwindows.dll by specifying linker flags for
-+# required modules manually (otherwise order is messed)
-+LIBS += \
-+    -lQt5EventDispatcherSupport \
-+    -lQt5AccessibilitySupport \
-+    -lQt5FontDatabaseSupport \
-+    -lQt5ThemeSupport \
-+    -lfreetype -lole32 -lgdi32 -ldwmapi
-+# However, this workaround leads to the necessity of specifying include dirs manually
-+INCLUDEPATH += \
-+    $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.8.0 \
-+    $$QT_SOURCE_TREE/include/QtAccessibilitySupport/5.8.0 \
-+    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.8.0 \
-+    $$QT_SOURCE_TREE/include/QtThemeSupport/5.8.0
- 
- include(windows.pri)
- 
--- 
-2.12.2
-

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

@@ -1,7 +1,7 @@
-From 180c51b31bfb37355eb63d2ce7b375d242533c1e Mon Sep 17 00:00:00 2001
+From e738cb4ecf057ce65d86e861de11df919227d421 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 27/30] Ignore failing pkg-config test
+Subject: [PATCH 29/31] 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 12714da714..adc54e439c 100644
+index 27b1460f93..7fca07351e 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -472,7 +472,6 @@
+@@ -515,7 +515,6 @@
          "pkg-config": {
              "label": "Using pkg-config",
              "autoDetect": "!config.darwin && !config.win32",
@@ -21,5 +21,5 @@ index 12714da714..adc54e439c 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 8409e69154755c1f8a23fcf4321e76a36342c79e Mon Sep 17 00:00:00 2001
+From 9ef6d62307288a6a1656aee01835b4c368678e55 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 30/30] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 30/31] Prevent qmake from messing static lib dependencies
 
 In particular, it messes resolving cyclic dependency between
 static freetype2 and harfbuzz
@@ -11,10 +11,10 @@ static freetype2 and harfbuzz
  2 files changed, 6 insertions(+)
 
 diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 349dcd2f40..f6d3d1fa29 100644
+index 20318f120c..d113216f55 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
-@@ -394,6 +394,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
+@@ -410,6 +410,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
  bool
  UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
  {
@@ -25,7 +25,7 @@ index 349dcd2f40..f6d3d1fa29 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 e6338546bb..2407d26a5a 100644
+index d9388e8518..090c576bc6 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
@@ -39,5 +39,5 @@ index e6338546bb..2407d26a5a 100644
    static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
    for (int i = 0; lflags[i]; i++) {
 -- 
-2.12.2
+2.13.0
 

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

@@ -0,0 +1,101 @@
+From 7f5e0ffbc26a67ba4bc3c0868fdd492641846a23 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Wed, 25 Jan 2017 23:42:30 +0100
+Subject: [PATCH 31/31] Hardcode linker flags for platform plugins
+
+Otherwise incorrect order of libs leads to errors
+when building libqminimal.dll, libqoffscreen.dll
+and libqwindows.dll
+
+Change-Id: I594ddcc15599c63bb8ac5e998f59c4561a18eb26
+---
+ src/plugins/platforms/minimal/minimal.pro     | 15 +++++++++++++--
+ src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++++--
+ src/plugins/platforms/windows/windows.pro     | 19 +++++++++++++++----
+ 3 files changed, 40 insertions(+), 8 deletions(-)
+
+diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
+index 8cfb68824e..c3fd4c73f2 100644
+--- a/src/plugins/platforms/minimal/minimal.pro
++++ b/src/plugins/platforms/minimal/minimal.pro
+@@ -1,8 +1,19 @@
+ TARGET = qminimal
+ 
+ QT += \
+-    core-private gui-private \
+-    eventdispatcher_support-private fontdatabase_support-private
++    core-private gui-private
++
++# Fix linker error when building libqminimal.dll by specifying linker flags for
++# required modules manually (otherwise order is messed)
++LIBS += \
++    -lQt5EventDispatcherSupport \
++    -lQt5FontDatabaseSupport \
++    -lfreetype -lole32 -lgdi32 -luuid
++# However, this workaround leads to the necessity of specifying include dirs manually
++INCLUDEPATH += \
++    $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.9.0 \
++    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.9.0
++
+ 
+ DEFINES += QT_NO_FOREACH
+ 
+diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro
+index 6652cefd86..03c30f4a96 100644
+--- a/src/plugins/platforms/offscreen/offscreen.pro
++++ b/src/plugins/platforms/offscreen/offscreen.pro
+@@ -1,8 +1,18 @@
+ TARGET = qoffscreen
+ 
+ QT += \
+-    core-private gui-private \
+-    eventdispatcher_support-private fontdatabase_support-private
++    core-private gui-private
++
++# Fix linker error when building libqoffscreen.dll by specifying linker flags for
++# required modules manually (otherwise order is messed)
++LIBS += \
++    -lQt5EventDispatcherSupport \
++    -lQt5FontDatabaseSupport \
++    -lfreetype -lole32 -lgdi32 -luuid
++# However, this workaround leads to the necessity of specifying include dirs manually
++INCLUDEPATH += \
++    $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.9.0 \
++    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.9.0
+ 
+ DEFINES += QT_NO_FOREACH
+ 
+diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
+index 23168c10dc..07d0f16a88 100644
+--- a/src/plugins/platforms/windows/windows.pro
++++ b/src/plugins/platforms/windows/windows.pro
+@@ -1,11 +1,22 @@
+ TARGET = qwindows
+ 
+ QT += \
+-    core-private gui-private \
+-    eventdispatcher_support-private accessibility_support-private \
+-    fontdatabase_support-private theme_support-private
++    core-private gui-private
+ 
+-LIBS += -lgdi32 -ldwmapi
++# Fix linker error when building libqwindows.dll by specifying linker flags for
++# required modules manually (otherwise order is messed)
++LIBS += \
++    -lQt5EventDispatcherSupport \
++    -lQt5AccessibilitySupport \
++    -lQt5FontDatabaseSupport \
++    -lQt5ThemeSupport \
++    -lfreetype -lole32 -lgdi32 -ldwmapi
++# However, this workaround leads to the necessity of specifying include dirs manually
++INCLUDEPATH += \
++    $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.9.0 \
++    $$QT_SOURCE_TREE/include/QtAccessibilitySupport/5.9.0 \
++    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.9.0 \
++    $$QT_SOURCE_TREE/include/QtThemeSupport/5.9.0
+ 
+ include(windows.pri)
+ 
+-- 
+2.13.0
+

qt5-base/mingw-w64-dynamic/PKGBUILD

@@ -77,16 +77,16 @@ isNoOpenGL() {
 }
 
 pkgname=mingw-w64-qt5-base-dynamic
-pkgver=5.8.0
-pkgrel=3
+pkgver=5.9.0
+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')
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 depends=('mingw-w64-crt' 'mingw-w64-zlib' 'mingw-w64-libjpeg-turbo' 'mingw-w64-sqlite'
-         'mingw-w64-libpng' 'mingw-w64-openssl' 'mingw-w64-dbus' 'mingw-w64-harfbuzz'
-         'mingw-w64-pcre')
+         'mingw-w64-libpng' 'mingw-w64-openssl-1.0' 'mingw-w64-dbus' 'mingw-w64-harfbuzz'
+         'mingw-w64-pcre2')
 groups=('mingw-w64-qt5')
 optdepends=('mingw-w64-postgresql: PostgreSQL support' 'mingw-w64-mariadb-connector-c: MySQL support')
 makedepends=('mingw-w64-gcc' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-pkg-config')
@@ -102,61 +102,62 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
         '0007-Prevent-debug-library-names-in-pkg-config-files.patch'
         '0008-Fix-linking-against-shared-static-libpng.patch'
         '0009-Fix-linking-against-static-D-Bus.patch'
-        '0010-Fix-linking-against-static-freetype2.patch'
-        '0011-Fix-linking-against-static-harfbuzz.patch'
-        '0012-Fix-linking-against-static-pcre.patch'
-        '0013-Fix-linking-against-shared-static-MariaDB.patch'
-        '0014-Fix-linking-against-shared-static-PostgreSQL.patch'
-        '0015-Rename-qtmain-to-qt5main.patch'
-        '0016-Build-dynamic-host-libraries.patch'
-        '0017-Enable-rpath-for-build-tools.patch'
-        '0018-Use-system-zlib-for-build-tools.patch'
-        '0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch'
-        '0020-Use-.dll.a-as-import-lib-extension.patch'
-        '0021-Merge-shared-and-static-library-trees.patch'
-        '0022-Allow-usage-of-static-version-with-CMake.patch'
-        '0023-Use-correct-pkg-config-static-flag.patch'
-        '0024-Fix-macro-invoking-moc-rcc-and-uic.patch'
-        '0025-Ignore-errors-about-missing-feature-static.patch'
-        '0026-Enable-and-fix-use-of-iconv.patch'
-        '0027-Ignore-failing-pkg-config-test.patch'
-        '0028-Include-uiviewsettingsinterop.h-correctly.patch'
-        '0029-Hardcode-linker-flags-for-libqwindows.dll.patch'
-        '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch')
-md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
-         '4f725d3b11329b38e25fed9a1d1d279a'
-         '6ae90af85ee7212f2097b2e92b0e2c46'
-         'bdb2c93fa4e688274691ea8ec2b10907'
-         '1189a3a1d90a9dfb8b20b2fc92c74cf2'
-         'ca7340bab827ae3cb85aadafcb4be783'
-         '4b1d4a6f45e6ff63e478b77b0bc07138'
-         '76aa0757e329d49c2d243cf13ebfc991'
-         '1a4c3201cc8d2096588cdf939f6c4e3a'
-         '6e9bf21df1c032c2ded111949d6888fa'
-         '517e525e61777652cc9cc378f53aa75e'
-         'c67f73e3ae3f52df548aac14093406b8'
-         '86eee18e0c8dd0f94155eca48f175a0e'
-         'd58a065a408ee7c9831c80de91f5c8af'
-         'fc73e39c859b19ee98065305399ae2e2'
-         '2bc4f40aaac5e62b4e01c7dc1d8a381b'
-         '1f460216b0074e5deded85f5eb64c0db'
-         'e1658603a165f388bc260a70d39d6114'
-         '8eecb292d3ae281967d2f586f64b1959'
-         '3ae4ad36bb37cc0793b96c10b98603c0'
-         '1825be44a99982893849bf12c9c2edbf'
-         'a41c9d756c465adf98acedbdf81d3b74'
-         'c48cad72d59cc19a48193e5911c84c1c'
-         '5576070ff3b7263eb0ea61e8ab50017f'
-         '64f175bb799575f52d26a99924015895'
-         '450767e45637a132c457b59b365efd8c'
-         'd5526f9f6d0e315d5526ad1a7420f35a'
-         '67f0dcc84e59685dc38eb81097f5df23'
-         'f81f75d41c1a9b5421ff090625325405'
-         '25e7218e60b52eef70c6e9596d844c07'
-         '5952dd9939639d144f28acc768cff946')
+        '0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch'
+        '0011-Fix-linking-against-static-freetype2.patch'
+        '0012-Fix-linking-against-static-harfbuzz.patch'
+        '0013-Fix-linking-against-static-pcre.patch'
+        '0014-Fix-linking-against-shared-static-MariaDB.patch'
+        '0015-Fix-linking-against-shared-static-PostgreSQL.patch'
+        '0016-Rename-qtmain-to-qt5main.patch'
+        '0017-Build-dynamic-host-libraries.patch'
+        '0018-Enable-rpath-for-build-tools.patch'
+        '0019-Use-system-zlib-for-build-tools.patch'
+        '0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch'
+        '0021-Use-.dll.a-as-import-lib-extension.patch'
+        '0022-Merge-shared-and-static-library-trees.patch'
+        '0023-Allow-usage-of-static-version-with-CMake.patch'
+        '0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch'
+        '0025-Use-correct-pkg-config-static-flag.patch'
+        '0026-Fix-macro-invoking-moc-rcc-and-uic.patch'
+        '0027-Ignore-errors-about-missing-feature-static.patch'
+        '0028-Enable-and-fix-use-of-iconv.patch'
+        '0029-Ignore-failing-pkg-config-test.patch'
+        '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch'
+        '0031-Hardcode-linker-flags-for-platform-plugins.patch')
+sha256sums=('267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c'
+            'b4406bba39ee7c8cf74c3b8a98b936b46772ca1798ef6884b7b1574ece80fbdc'
+            '86cf470f1694abf6973f7b0f8e6cb75dd8a58e9335bab075b25229d26064adab'
+            '670b6cd7a6ee49f12ccf4121e997055daec887d080baf0269793b1d0243d1d89'
+            '878c08a1e9d0c8d639ddbdbc944ac8647ff204e9f078ddd9337737b2b929c2ed'
+            '38533dba16df99074e8c3f5d52bc15fabdbaffe0a56dbed79683c47f08342587'
+            '5ef3a569f4c53e848750ff655342e92a103abe78495905a5ef47afea9da8d1fb'
+            'd21ebc9465a19e01912ebccb365b4f7ecfd3a95787c1de2640f29bdbc161983c'
+            '0622a2e606d9edbea23d3a5724ea9d4ed3958e60296b85134176c3980d590a41'
+            '90f1347e5c41b9e447c0339715d19e0434a0b58c36fd8405e850190fe17369dc'
+            '6b6ebfdf598658172680e4e83d2c3de24dcbc93233b0f48d5ccbf760d8f59a5c'
+            '11ce05f79174440406d84b38023d81c1fa87034119360fa2f0bd3887429fa694'
+            'c30c558ea413c986aec2ffe86e34dd8e99f96cbc615e3963f711ec1628888114'
+            'b9fbfc213089e3b44ed888f4e628030e78dd84c8030ba7a2a9f79fbf31312934'
+            '94ebedf699ebc0a5c6fed307eecd3dfabf9f864c696f3cf17bd8462789c1fae2'
+            'df05b0f65dcafede1f83ce190895e6c6f4a22feecb1c5b1a0ba03f4948e56220'
+            '0acae3adb542d6ea0b405a947adf087826b4971df133b984d9166a9872e5cc98'
+            'bb825226ca1e97cb49c3ac3a0c03a7db9f3e1eca632628d344201fcf9816376d'
+            'e74fb8219bf599fbe5fbd1b08ff89d717089f1fa4d9e488a60e6097b212b7391'
+            'cf3f90b69feb98e42ede770828db4538a3dd31dd02b2b15f55ea1743db5868ad'
+            '813cd1c22e3211133337231e1df754b5560159eecf1cf3eef0408d335e186190'
+            'a0feb7b5a9747d6a88058360fc34f8ac8fb3cdeb2b343a5a2b28a88fdabb45b3'
+            '82f8f1eba6ac63c9a8749e20eb57fad80e92ddd5a58912a60a8c2fad9e83d6eb'
+            '34652aec17d7511815db59b438b0597e52b7f43c19d068e7e417325897a72254'
+            'dcfe2103ace81898960316dd691fae38d05b2b6a79dc0ae0f245ae402f1101a8'
+            '0682dcc62b44717fa850700cec183cd856ce7335f26884ab15d4d0e7d3543bfe'
+            'cecf5ff2916d95ffdbcf60ba3e18297a6107e17e9766a5e4d8b9ae748d99ba52'
+            '79bc920bb539fc68001b5def07eea3e45eb3d2c6aa3f2a949823236adf8e4633'
+            '80757f614fe02bfb85d00292d4f84c9f2ab2c39a512c21e956df135f3fbfdd81'
+            'cc46ffc3a2183539aba923fb256045464eaae37a666034172138f4689a5c9bd3'
+            'f0e63e022d1e52b82a7622828b568c57d1422f9726e116902cd2be81fec45da4'
+            '28b11e63f570891212073b3739a20489304d3c7205ae38471cbd6b15c651fabc')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
-#_architectures='x86_64-w64-mingw32 i686-w64-mingw32'
 
 isStatic && depends+=(${pkgname%-static})
 if isANGLE; then
@@ -220,6 +221,9 @@ build() {
   unset PKG_CONFIG_PATH
 
   for _arch in ${_architectures}; do
+    echo "INCLUDEPATH += /usr/${_arch}/include/openssl-1.0" >> src/network/network.pro
+    export OPENSSL_LIBS='-L/usr/${_arch}/lib/openssl-1.0 -lssl -lcrypto'
+
     # Phonon is disabled for now because we lack the directx headers
     # FIXME: check whether this is still the case
 

qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch

@@ -1,7 +1,7 @@
-From eb3e8004e4cb74f021294e1e57dd268af001980e Mon Sep 17 00:00:00 2001
+From 9e46af21edffe2c27d2239ae2133c5a442cd7b43 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/30] Add profile for cross compilation with mingw-w64
+Subject: [PATCH 01/31] Add profile for cross compilation with mingw-w64
 
 ---
  mkspecs/mingw-w64-g++/qmake.conf      | 125 +++++++++++++++++++++++++++
@@ -12,7 +12,7 @@ Subject: [PATCH 01/30] Add profile for cross compilation with mingw-w64
 
 diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf
 new file mode 100644
-index 0000000000..6f21ae75d5
+index 0000000000..3908c1a7e2
 --- /dev/null
 +++ b/mkspecs/mingw-w64-g++/qmake.conf
 @@ -0,0 +1,125 @@
@@ -128,7 +128,7 @@ index 0000000000..6f21ae75d5
 +QMAKE_PKG_CONFIG        = $${CROSS_COMPILE}pkg-config
 +
 +QMAKE_LIBS              =
-+QMAKE_LIBS_CORE         = -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
++QMAKE_LIBS_CORE         = -lz -lpcre2-16 -lversion -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
 +QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
 +                          $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
 +                          $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
@@ -303,5 +303,5 @@ index 0000000000..c5a70b1445
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 0223c4145ff17cb79e720ed12b24819262aa5353 Mon Sep 17 00:00:00 2001
+From b8a768c9d6b67c09515e927344dc750880fe5150 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/30] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---
@@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required
  1 file changed, 2 deletions(-)
 
 diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
-index aad48571b3..46f44d8b91 100644
+index 0a5de2c9af..35798a2a28 100644
 --- a/src/gui/opengl/qopenglfunctions.h
 +++ b/src/gui/opengl/qopenglfunctions.h
 @@ -56,9 +56,7 @@
@@ -23,5 +23,5 @@ index aad48571b3..46f44d8b91 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 1ffc87d8805a92fb7666084c656bac46cd276599 Mon Sep 17 00:00:00 2001
+From 7a6384756287b07c0e3a6e18ed07414a7672feee Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/30] Use external ANGLE library
+Subject: [PATCH 03/31] Use external ANGLE library
 
 ---
  src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
@@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644
  
  _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
 diff --git a/src/gui/gui.pro b/src/gui/gui.pro
-index 5f8cbe2cbe..0ebf6b7281 100644
+index cfdb5e889b..4afb45e592 100644
 --- a/src/gui/gui.pro
 +++ b/src/gui/gui.pro
 @@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@@ -66,11 +66,11 @@ index 718a886809..89965709ed 100644
  HEADERS += qgl.h \
             qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index 20e0b81da9..b55847fc69 100644
+index 73677311f5..05a1dc2e6e 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
-@@ -2,6 +2,7 @@
- LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+ QT_FOR_CONFIG += gui
  
  qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32
 +qtConfig(angle):LIBS += -lGLESv2 -lEGL
@@ -78,10 +78,10 @@ index 20e0b81da9..b55847fc69 100644
  mingw: LIBS *= -luuid
  # For the dialog helpers:
 diff --git a/src/src.pro b/src/src.pro
-index 90d7e2b76c..92e89ea39f 100644
+index 43fc06f2e5..4188d4ea6b 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -160,10 +160,6 @@ qtConfig(gui) {
+@@ -175,10 +175,6 @@ qtConfig(gui) {
          SUBDIRS += src_3rdparty_harfbuzzng
          src_gui.depends += src_3rdparty_harfbuzzng
      }
@@ -93,5 +93,5 @@ index 90d7e2b76c..92e89ea39f 100644
          SUBDIRS += src_3rdparty_libpng
          src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 447092efb62e94bc69b3899093e1ee10af18d81b Mon Sep 17 00:00:00 2001
+From c815500b1cbe99d31d10fa416d391ebe9f6db56e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 04/30] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 04/31] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.
@@ -11,7 +11,7 @@ Hence the assembler option -mbig-obj is required.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
-index 1a1022b3a7..792bdf9e7a 100644
+index 4c778b184e..1dd1755d7f 100644
 --- a/src/gui/opengl/opengl.pri
 +++ b/src/gui/opengl/opengl.pri
 @@ -3,7 +3,8 @@
@@ -25,5 +25,5 @@ index 1a1022b3a7..792bdf9e7a 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 74be1cdb27c34b149b4b227a8c3107ca49cc254a Mon Sep 17 00:00:00 2001
+From ca3aca842c36f8d69320f5629071d29563b91081 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/30] Make sure *.pc files are installed correctly
+Subject: [PATCH 05/31] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -10,10 +10,10 @@ Subject: [PATCH 05/30] 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 4450e619b9..182fe79238 100644
+index c76708285a..fb886e00d2 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3150,7 +3150,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3152,7 +3152,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
  }
  
  QString
@@ -22,7 +22,7 @@ index 4450e619b9..182fe79238 100644
  {
      QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
      if (ret.isEmpty()) {
-@@ -3175,7 +3175,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3177,7 +3177,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
      if(fixify) {
          if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
              ret.prepend(project->first("DESTDIR").toQString());
@@ -36,7 +36,7 @@ index 4450e619b9..182fe79238 100644
      return ret;
  }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index 86fec748eb..cbe23d7e3a 100644
+index 4ced3bd121..f7cc3b9e9b 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
 @@ -89,7 +89,7 @@ protected:
@@ -49,10 +49,10 @@ index 86fec748eb..cbe23d7e3a 100644
      void writePkgConfigFile();   // for pkg-config
  
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 3c029c8004..caa000ea53 100644
+index 2013698c99..b6b8dda397 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -721,7 +721,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -724,7 +724,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                  }
                  if(!ret.isEmpty())
                      ret += "\n\t";
@@ -62,5 +62,5 @@ index 3c029c8004..caa000ea53 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From fee4dff74c2483c2f4a4d7299e062c366431fc53 Mon Sep 17 00:00:00 2001
+From a0b4f7192c90214a2950382679b259e143dfc4bc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/30] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/31] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references
@@ -24,5 +24,5 @@ index 8d5a9a7d0f..d2cf8d9afc 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 995313e0795df5500fd84350e80a3f88202b473d Mon Sep 17 00:00:00 2001
+From 6656828260372d7e2e6256fa85e37a830b58260c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/30] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/31] 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 182fe79238..a762443fe2 100644
+index fb886e00d2..55e25d596a 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3166,6 +3166,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
          if (dot != -1)
              ret = ret.left(dot);
      }
@@ -29,5 +29,5 @@ index 182fe79238..a762443fe2 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,26 +1,27 @@
-From f3a39738bcf7560f023bd280017aedaeb756e5c2 Mon Sep 17 00:00:00 2001
+From 4fb07cf7290b97694586f3f30489165f114ca439 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 08/30] Fix linking against shared/static libpng
+Subject: [PATCH 08/31] Fix linking against shared/static libpng
 
+Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
  src/gui/configure.json | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 1f5011617c..5006ff5a3a 100644
+index 73e59a7ad9..6dee7d18aa 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -161,7 +161,8 @@
+@@ -162,7 +162,8 @@
              "sources": [
                  { "type": "pkgConfig", "args": "libpng" },
                  { "libs": "-llibpng", "condition": "config.msvc" },
 -                { "libs": "-lpng", "condition": "!config.msvc" }
 +                { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" },
 +                { "libs": "-lpng", "condition": "!config.msvc && features.shared" }
-             ]
-         },
-         "mirclient": {
+             ],
+             "use": [
+                 { "lib": "zlib", "condition": "features.system-zlib" }
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From 3379bc4d4d65124ec08aa8dade1b6b2a7b25f61e Mon Sep 17 00:00:00 2001
+From c481c20ed0c454b6e32fd37f6abf99c5bb118a83 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 09/30] Fix linking against static D-Bus
+Subject: [PATCH 09/31] Fix linking against static D-Bus
 
 ---
  config.tests/unix/dbus/dbus.cpp | 4 ++++
@@ -25,10 +25,10 @@ index 295c904400..80d3e9c044 100644
  #include <dbus/dbus.h>
  
 diff --git a/configure.json b/configure.json
-index f774291d22..12714da714 100644
+index 02d5f1a65e..7f005e99f5 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -158,12 +158,16 @@
+@@ -159,12 +159,16 @@
              "sources": [
                  { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
                  {
@@ -62,5 +62,5 @@ index cfc0e12046..65f1397cd6 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.12.2
+2.13.0
 

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

@@ -0,0 +1,29 @@
+From aaf4a548cf6fbe17f0ff11eb370cf7e27ab85221 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 2 Jun 2017 18:28:10 +0200
+Subject: [PATCH 10/31] 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
+
+Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
+---
+ configure.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.json b/configure.json
+index 7f005e99f5..27b1460f93 100644
+--- a/configure.json
++++ b/configure.json
+@@ -165,7 +165,7 @@
+                 {
+                     "libs": "",
+                     "builds": {
+-                        "debug": "-ldbus-1d",
++                        "debug": "-ldbus-1",
+                         "release": "-ldbus-1"
+                     },
+                     "condition": "config.win32 && features.shared"
+-- 
+2.13.0
+

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

@@ -1,17 +1,17 @@
-From 24c3bda7db1733545350436d8c2f489be5395650 Mon Sep 17 00:00:00 2001
+From 50aa5c34a1240f86092a90241fba27a332f9003c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 10/30] Fix linking against static freetype2
+Subject: [PATCH 11/31] Fix linking against static freetype2
 
 ---
  src/gui/configure.json | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 5006ff5a3a..6530357be9 100644
+index 6dee7d18aa..d6ed20e5c6 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -99,8 +99,11 @@
+@@ -100,8 +100,11 @@
              "label": "FreeType",
              "test": "unix/freetype",
              "sources": [
@@ -26,5 +26,5 @@ index 5006ff5a3a..6530357be9 100644
          },
          "fontconfig": {
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,17 @@
-From 52c34159dec8c829d1f2928d2c9a56bb7299fbff Mon Sep 17 00:00:00 2001
+From 9bea663dc73c714d606f5acc65a8f84129f1428e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 11/30] Fix linking against static harfbuzz
+Subject: [PATCH 12/31] 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 6530357be9..c5b9b1542a 100644
+index d6ed20e5c6..8937d38f63 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -125,7 +125,11 @@
+@@ -126,7 +126,11 @@
              "label": "HarfBuzz",
              "test": "unix/harfbuzz",
              "sources": [
@@ -25,5 +25,5 @@ index 6530357be9..c5b9b1542a 100644
          },
          "imf": {
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,27 +1,28 @@
-From e2c35b81ed48f46c2260ad9e59ff7f50b073e9d4 Mon Sep 17 00:00:00 2001
+From 6db4ce18fb06d080cd2384f1c4a8a2197a8b5434 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 12/30] Fix linking against static pcre
+Subject: [PATCH 13/31] Fix linking against static pcre
 
+Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
  src/corelib/tools/qregularexpression.cpp | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 4a30daa72c..3d7c811124 100644
+index 88b696f53a..afe444027e 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
-@@ -54,6 +54,10 @@
- #include <QtCore/qatomic.h>
+@@ -55,6 +55,10 @@
  #include <QtCore/qdatastream.h>
  
+ #define PCRE2_CODE_UNIT_WIDTH 16
 +#ifdef QT_STATIC
 +#define PCRE_STATIC
++#define PCRE2_STATIC
 +#endif
-+
- #include <pcre.h>
  
- QT_BEGIN_NAMESPACE
+ #include <pcre2.h>
+ 
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,26 +1,27 @@
-From 889ea99f62dd010c168cce6b18f0d49fb2a48203 Mon Sep 17 00:00:00 2001
+From ea1df506321d35a9f8a648ea98642b034b7ace48 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 13/30] Fix linking against shared/static MariaDB
+Subject: [PATCH 14/31] Fix linking against shared/static MariaDB
 
+Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
  src/sql/configure.json | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/src/sql/configure.json b/src/sql/configure.json
-index 96c82e84f9..fce948026f 100644
+index 49444c7e5f..d162d7bc09 100644
 --- a/src/sql/configure.json
 +++ b/src/sql/configure.json
-@@ -58,6 +58,9 @@
+@@ -57,6 +57,9 @@
              "label": "MySQL",
              "test": "unix/mysql",
              "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" },
-                 { "type": "mysqlConfig", "query": "--libs" },
-                 { "libs": "-lmysqlclient_r", "condition": "!config.win32" },
+                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
+                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
+                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,17 @@
-From 953ca26efa1cb2e86a958c52ce737ada0078e1a3 Mon Sep 17 00:00:00 2001
+From cb4fbac9533065928a6c839da4675c60cb7fe6c0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 14/30] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 15/31] Fix linking against shared/static PostgreSQL
 
 ---
  src/sql/configure.json | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/sql/configure.json b/src/sql/configure.json
-index fce948026f..f560c191fd 100644
+index d162d7bc09..0f86b23f22 100644
 --- a/src/sql/configure.json
 +++ b/src/sql/configure.json
-@@ -72,9 +72,10 @@
+@@ -73,9 +73,10 @@
              "label": "PostgreSQL",
              "test": "unix/psql",
              "sources": [
@@ -25,5 +25,5 @@ index fce948026f..f560c191fd 100644
              ]
          },
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From e81d865a144c5c12ea1b93922a8c27f676aad531 Mon Sep 17 00:00:00 2001
+From f0f623ebdc7e578047212feac62044e08aaf08cb Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 15/30] Rename qtmain to qt5main
+Subject: [PATCH 16/31] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -11,7 +11,7 @@ Prevents conflict with mingw-w64-qt4 package
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 1099e14b17..ed9b82fba9 100644
+index bb5083c925..146e83ae67 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -225,8 +225,8 @@ mac {
@@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
  
  CONFIG += static
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,20 @@
-From b91bb54e98627bd92ff740ed547d52febb3523d4 Mon Sep 17 00:00:00 2001
+From bd8345de18a4ad2bdcc17710c69c09ad2f81c83f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
-Subject: [PATCH 16/30] Build dynamic host libraries
+Subject: [PATCH 17/31] Build dynamic host libraries
 
-For better accordance with Arch Linux packaging
-standards
+This came initially from Fedora, not sure whether
+it makes sense to keep it. Regular Arch package
+uses static lib as intended by upstream.
+
+Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
 ---
  mkspecs/features/qt_module.prf              | 2 +-
  src/tools/bootstrap-dbus/bootstrap-dbus.pro | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 31d628596c..360c99ac73 100644
+index 36f632e8ca..2deec56866 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -24,7 +24,7 @@ requires(!$$skip)
@@ -34,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,11 +1,13 @@
-From 0e79722e8c8162f87b2b765932d3507de2f20a88 Mon Sep 17 00:00:00 2001
+From 905438dce78dd9fb08692b81bfbed4caa30fd23e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 17/30] Enable rpath for build tools
+Subject: [PATCH 18/31] Enable rpath for build tools
 
-- Required because library various tools depend on (libQt5Bootstrap.so) resides
+- Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib
 - Can't use regular lib dir because it would conflict with the native package
+
+Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7
 ---
  mkspecs/features/qt_app.prf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -31,5 +33,5 @@ index cb84ae0da8..8d9471ed0a 100644
  INSTALLS += target
  
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,17 +1,17 @@
-From 510f64af3d51b140e18cbf026cbfd4990ba973d5 Mon Sep 17 00:00:00 2001
+From aa62a2156a564f8125d3dfdac08124673d123016 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 18/30] Use system zlib for build tools
+Subject: [PATCH 19/31] Use system zlib for build tools
 
 ---
  src/tools/bootstrap/bootstrap.pro | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index d51f9e98a4..2242b7c4f1 100644
+index 521dd5f0f2..eb8cb4770c 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -127,7 +127,7 @@ macx {
+@@ -129,7 +129,7 @@ macx {
          ../../corelib/io/qstandardpaths_win.cpp
  }
  
@@ -21,5 +21,5 @@ index d51f9e98a4..2242b7c4f1 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.12.2
+2.13.0
 

qt5-base/mingw-w64-static/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch

@@ -1,7 +1,7 @@
-From 12e64d649d5a01b4f878778aa6c183ceb51b28e7 Mon Sep 17 00:00:00 2001
+From 7d3b433e7a103e2f26cf183e1d9910b4d33a97ec Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:20:25 +0200
-Subject: [PATCH 19/30] Disable determing default include and lib dirs at qmake
+Subject: [PATCH 20/31] Disable determing default include and lib dirs at qmake
  time when building with mingw-w64
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 19/30] Disable determing default include and lib dirs at qmake
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
-index 3f266dd2a4..258d374ee0 100644
+index 46a9c5707a..e82383f9ff 100644
 --- a/mkspecs/features/toolchain.prf
 +++ b/mkspecs/features/toolchain.prf
-@@ -13,7 +13,7 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build {
+@@ -21,7 +21,7 @@ isEmpty($${target_prefix}.INCDIRS) {
      #
      # Get default include and library paths from compiler
      #
@@ -22,5 +22,5 @@ index 3f266dd2a4..258d374ee0 100644
              cmd_prefix = "LC_ALL=C"
              cmd_suffix = "</dev/null >/dev/null"
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,7 +1,7 @@
-From cea6744e8b23c780033c4e5a2f51fdb0bd60153c Mon Sep 17 00:00:00 2001
+From 7ccfcf6a364c00f5ec0204b4614ae78dd2296c0e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 20/30] Use *.dll.a as import lib extension
+Subject: [PATCH 21/31] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 mingw-w64 specific mkspec
@@ -11,7 +11,7 @@ mingw-w64 specific mkspec
  2 files changed, 15 insertions(+), 7 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index ed9b82fba9..461a7fdff5 100644
+index 146e83ae67..15fc070008 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -236,8 +236,9 @@ mac {
@@ -27,7 +27,7 @@ index ed9b82fba9..461a7fdff5 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 caa000ea53..e6338546bb 100644
+index b6b8dda397..d9388e8518 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@@ -64,5 +64,5 @@ index caa000ea53..e6338546bb 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,9 +1,11 @@
-From 7d8372b48046631d93ea260649d29a023fe29b01 Mon Sep 17 00:00:00 2001
+From 842da3facc0a4e3269d391b57bd1207a796b8628 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 21/30] Merge shared and static library trees
+Subject: [PATCH 22/31] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
+
+Change-Id: Ie60ddbe967cb553d5d92d5a706398a1e7385344a
 ---
  configure.pri                     |  7 +++++++
  mkspecs/features/default_post.prf | 11 +++++++++++
@@ -13,13 +15,13 @@ Allow installation of shared and static build in the same prefix
  5 files changed, 47 insertions(+), 6 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index 19719736a9..0c4b8ebbf8 100644
+index be1b166080..9a5c6cb30d 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -555,3 +555,10 @@ QMAKE_POST_CONFIGURE += \
+@@ -1181,3 +1181,10 @@ defineTest(createConfigStatus) {
  
- # load and process input from configure.sh/.exe
- include($$shadowed($$PWD)/config.tests/configure.cfg)
+ QMAKE_POST_CONFIGURE += \
+     "createConfigStatus()"
 +
 +# merge shared and static library trees
 +contains(CONFIG, static) {
@@ -28,7 +30,7 @@ index 19719736a9..0c4b8ebbf8 100644
 +    QT_CONFIG -= shared
 +}
 diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
-index e7e9a5bd87..72305ad9b8 100644
+index d6caf870f7..7bff3d32ba 100644
 --- a/mkspecs/features/default_post.prf
 +++ b/mkspecs/features/default_post.prf
 @@ -1,5 +1,16 @@
@@ -49,10 +51,10 @@ index e7e9a5bd87..72305ad9b8 100644
  
  !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 98f794c485..1799622edd 100644
+index 3ccbbe7061..20b02d5ca9 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -152,6 +152,21 @@ for(ever) {
+@@ -255,6 +255,21 @@ for(ever) {
              !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                  WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
          }
@@ -97,10 +99,10 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a762443fe2..8ac3a0f647 100644
+index 55e25d596a..990d10a286 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3167,6 +3167,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3169,6 +3169,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
      if (project->isActiveConfig("debug")) {
          ret += "d";
      }
@@ -110,7 +112,7 @@ index a762443fe2..8ac3a0f647 100644
      ret += Option::pkgcfg_ext;
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
-@@ -3340,9 +3343,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3342,9 +3345,9 @@ MakefileGenerator::writePkgConfigFile()
      t << endl;
  
      // requires
@@ -124,5 +126,5 @@ index a762443fe2..8ac3a0f647 100644
  
      t << endl;
 -- 
-2.12.2
+2.13.0
 

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

@@ -1,25 +1,27 @@
-From 1c1935b0d6e6685181880f6d591677ed49b0695e Mon Sep 17 00:00:00 2001
+From 884534d5a74833a3666e1d34a30a9ea600a92df4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 22/30] Allow usage of static version with CMake
+Subject: [PATCH 23/31] Allow usage of static version with CMake
 
 - Fix plugin detection and various details
 - Allow selecting between dynamic and static Qt versions
   installed in the same prefix
   - Use eg. find_package(Qt5Core) for dynamic version
   - and eg. find_package(StaticQt5Core) for static version
+
+Change-Id: Idf2d3ab8e3581910f59d9727ef6b48e105729463
 ---
  mkspecs/features/create_cmake.prf                  |  85 +++--
- .../features/data/cmake/Qt5BasicConfig.cmake.in    | 358 ++++++++++++++-------
+ .../features/data/cmake/Qt5BasicConfig.cmake.in    | 372 ++++++++++++++-------
  .../features/data/cmake/Qt5PluginTarget.cmake.in   |  30 +-
  qmake/generators/makefile.cpp                      |   7 +
- src/corelib/Qt5CoreConfigExtras.cmake.in           |  37 ++-
+ src/corelib/Qt5CoreConfigExtras.cmake.in           |  30 +-
  src/gui/Qt5GuiConfigExtras.cmake.in                |  12 +-
  src/testlib/Qt5TestConfigExtras.cmake.in           |   4 +
- 7 files changed, 372 insertions(+), 161 deletions(-)
+ 7 files changed, 372 insertions(+), 168 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 461a7fdff5..c4afc5251b 100644
+index 15fc070008..0914532f54 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -38,7 +38,8 @@ split_incpath {
@@ -222,7 +224,7 @@ index 461a7fdff5..c4afc5251b 100644
  # We are generating cmake files. Most developers of Qt are not aware of cmake,
  # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d2358cae4b..6365d0f9ff 100644
+index 4f342d67d7..908f7f59a7 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -35,15 +35,18 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
@@ -446,16 +448,20 @@ index d2358cae4b..6365d0f9ff 100644
  !!ENDIF // TEMPLATE != aux
      set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
  
-@@ -167,7 +225,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -166,10 +224,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+     endif()
  !!ENDIF
  
+-    set(Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
++    set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
+ 
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED)
 -    if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
 +    if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
          set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
      endif()
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -175,17 +233,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -177,17 +235,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
          set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
      endif()
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
@@ -477,7 +483,7 @@ index d2358cae4b..6365d0f9ff 100644
                  $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                  ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                  ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -193,28 +251,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -195,28 +253,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              )
          endif()
  
@@ -522,7 +528,7 @@ index d2358cae4b..6365d0f9ff 100644
  
  !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
      if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
-@@ -223,81 +285,179 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -225,28 +287,124 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ENDIF
  
  !!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -647,6 +653,36 @@ index d2358cae4b..6365d0f9ff 100644
 +        endforeach()
 +    endif()
  
+     set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
+-    foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
++    foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
+         if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
+             set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST FALSE)
+         endif()
+@@ -254,9 +412,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ 
+     if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST
+         AND NOT CMAKE_VERSION VERSION_LESS 3.0.0 )
+-        add_library(Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
+-        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
+-            INTERFACE_INCLUDE_DIRECTORIES ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
++        add_library($${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
++        set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
++            INTERFACE_INCLUDE_DIRECTORIES ${$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
+         )
+         set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
+         foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
+@@ -264,66 +422,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
+             endif()
+         endforeach()
+-        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
+-            INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
++        set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
++            INTERFACE_LINK_LIBRARIES $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
+         )
+     endif()
+ 
  !!IF !equals(TEMPLATE, aux)
  !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -727,7 +763,7 @@ index d2358cae4b..6365d0f9ff 100644
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
          \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -310,9 +470,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -336,9 +496,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -741,7 +777,7 @@ index d2358cae4b..6365d0f9ff 100644
  !!ENDIF // CMAKE_RELEASE_TYPE
  !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
  
-@@ -323,37 +485,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -349,37 +511,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      )
  !!ENDIF // TEMPLATE != aux
  
@@ -827,7 +863,7 @@ index 5baf0fdb10..54345e4117 100644
 -list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 8ac3a0f647..ed4a1f5c30 100644
+index 990d10a286..35cb7d927a 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@@ -845,7 +881,7 @@ index 8ac3a0f647..ed4a1f5c30 100644
  }
  
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 545b9a3d1e..fd5c947b5f 100644
+index 545b9a3d1e..42a3c557aa 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -1,4 +1,10 @@
@@ -932,17 +968,6 @@ index 545b9a3d1e..fd5c947b5f 100644
                  IMPORTED_LINK_INTERFACE_LIBRARIES_${_config}
                      $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain>
              )
-@@ -188,3 +194,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH)
- set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\")
- 
- _qt5_Core_check_file_exists(${_Qt5CTestMacros})
-+
-+!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
-+set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)
-+# INTERFACE_LINK_LIBRARIES is used to pass a linker flag '-static' and library ws2_32
-+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
-+unset(_isExe)
-+!!ENDIF
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
 index 2e32911a64..31567d7da2 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -994,5 +1019,5 @@ index 2a575958ae..8312c90fd1 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.12.2
+2.13.0