From 5695ac7572faed971258f87286a1e535b06aca63 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 8 Dec 2017 19:49:53 +0100
Subject: [PATCH] Update Qt packages to 5.10.0

---
 devel/qt5/update-patches.sh                   |  1 +
 qt5-3d/mingw-w64/PKGBUILD                     |  8 +-
 ...indows.h-when-using-native-Linux-gcc.patch |  6 +-
 ...dumpcpp-and-MetaObjectGenerator-read.patch |  8 +-
 qt5-activeqt/mingw-w64/PKGBUILD               | 12 +--
 qt5-base/apple-darwin/PKGBUILD                |  8 +-
 ...for-cross-compilation-with-mingw-w64.patch | 10 +-
 ...is-defined-when-using-dynamic-OpenGL.patch |  6 +-
 .../0003-Use-external-ANGLE-library.patch     | 14 +--
 ...tions-assemler-error-in-OpenGL-facto.patch |  6 +-
 ...re-.pc-files-are-installed-correctly.patch |  8 +-
 ...add-resource-files-to-LIBS-parameter.patch | 10 +-
 ...ug-library-names-in-pkg-config-files.patch |  8 +-
 ...linking-against-shared-static-libpng.patch | 10 +-
 ...009-Fix-linking-against-static-D-Bus.patch |  8 +-
 ...o-use-debug-version-of-D-Bus-library.patch |  8 +-
 ...Fix-linking-against-static-freetype2.patch | 10 +-
 ...-Fix-linking-against-static-harfbuzz.patch | 10 +-
 ...0013-Fix-linking-against-static-pcre.patch |  8 +-
 ...inking-against-shared-static-MariaDB.patch |  6 +-
 ...ing-against-shared-static-PostgreSQL.patch |  6 +-
 .../0016-Rename-qtmain-to-qt5main.patch       |  6 +-
 .../0017-Build-dynamic-host-libraries.patch   |  8 +-
 .../0018-Enable-rpath-for-build-tools.patch   |  6 +-
 ...0019-Use-system-zlib-for-build-tools.patch | 10 +-
 ...g-default-include-and-lib-dirs-at-qm.patch | 14 +--
 ...1-Use-.dll.a-as-import-lib-extension.patch |  6 +-
 ...erge-shared-and-static-library-trees.patch |  8 +-
 ...s-of-static-libraries-in-CMake-modul.patch |  8 +-
 ...w-usage-of-static-version-with-CMake.patch |  6 +-
 ...ags-for-static-build-with-cmake-ming.patch |  6 +-
 ...6-Use-correct-pkg-config-static-flag.patch |  6 +-
 ...7-Fix-macro-invoking-moc-rcc-and-uic.patch |  6 +-
 ...-errors-about-missing-feature-static.patch | 14 +--
 .../0029-Enable-and-fix-use-of-iconv.patch    | 10 +-
 .../0030-Ignore-failing-pkg-config-test.patch | 10 +-
 ...from-messing-static-lib-dependencies.patch |  6 +-
 ...de-linker-flags-for-platform-plugins.patch | 43 +++++----
 ...ng-against-static-plugins-with-qmake.patch |  6 +-
 .../0034-Don-t-use-the-statx-syscall.patch    | 27 ++++++
 qt5-base/mingw-w64-angle/PKGBUILD             | 91 ++++++++++---------
 ...for-cross-compilation-with-mingw-w64.patch | 10 +-
 ...is-defined-when-using-dynamic-OpenGL.patch |  6 +-
 .../0003-Use-external-ANGLE-library.patch     | 14 +--
 ...tions-assemler-error-in-OpenGL-facto.patch |  6 +-
 ...re-.pc-files-are-installed-correctly.patch |  8 +-
 ...add-resource-files-to-LIBS-parameter.patch | 10 +-
 ...ug-library-names-in-pkg-config-files.patch |  8 +-
 ...linking-against-shared-static-libpng.patch | 10 +-
 ...009-Fix-linking-against-static-D-Bus.patch |  8 +-
 ...o-use-debug-version-of-D-Bus-library.patch |  8 +-
 ...Fix-linking-against-static-freetype2.patch | 10 +-
 ...-Fix-linking-against-static-harfbuzz.patch | 10 +-
 ...0013-Fix-linking-against-static-pcre.patch |  8 +-
 ...inking-against-shared-static-MariaDB.patch |  6 +-
 ...ing-against-shared-static-PostgreSQL.patch |  6 +-
 .../0016-Rename-qtmain-to-qt5main.patch       |  6 +-
 .../0017-Build-dynamic-host-libraries.patch   |  8 +-
 .../0018-Enable-rpath-for-build-tools.patch   |  6 +-
 ...0019-Use-system-zlib-for-build-tools.patch | 10 +-
 ...g-default-include-and-lib-dirs-at-qm.patch | 14 +--
 ...1-Use-.dll.a-as-import-lib-extension.patch |  6 +-
 ...erge-shared-and-static-library-trees.patch |  8 +-
 ...s-of-static-libraries-in-CMake-modul.patch |  8 +-
 ...w-usage-of-static-version-with-CMake.patch |  6 +-
 ...ags-for-static-build-with-cmake-ming.patch |  6 +-
 ...6-Use-correct-pkg-config-static-flag.patch |  6 +-
 ...7-Fix-macro-invoking-moc-rcc-and-uic.patch |  6 +-
 ...-errors-about-missing-feature-static.patch | 14 +--
 .../0029-Enable-and-fix-use-of-iconv.patch    | 10 +-
 .../0030-Ignore-failing-pkg-config-test.patch | 10 +-
 ...from-messing-static-lib-dependencies.patch |  6 +-
 ...de-linker-flags-for-platform-plugins.patch | 43 +++++----
 ...ng-against-static-plugins-with-qmake.patch |  6 +-
 .../0034-Don-t-use-the-statx-syscall.patch    | 27 ++++++
 qt5-base/mingw-w64-dynamic/PKGBUILD           | 91 ++++++++++---------
 ...for-cross-compilation-with-mingw-w64.patch | 10 +-
 ...is-defined-when-using-dynamic-OpenGL.patch |  6 +-
 .../0003-Use-external-ANGLE-library.patch     | 14 +--
 ...tions-assemler-error-in-OpenGL-facto.patch |  6 +-
 ...re-.pc-files-are-installed-correctly.patch |  8 +-
 ...add-resource-files-to-LIBS-parameter.patch | 10 +-
 ...ug-library-names-in-pkg-config-files.patch |  8 +-
 ...linking-against-shared-static-libpng.patch | 10 +-
 ...009-Fix-linking-against-static-D-Bus.patch |  8 +-
 ...o-use-debug-version-of-D-Bus-library.patch |  8 +-
 ...Fix-linking-against-static-freetype2.patch | 10 +-
 ...-Fix-linking-against-static-harfbuzz.patch | 10 +-
 ...0013-Fix-linking-against-static-pcre.patch |  8 +-
 ...inking-against-shared-static-MariaDB.patch |  6 +-
 ...ing-against-shared-static-PostgreSQL.patch |  6 +-
 .../0016-Rename-qtmain-to-qt5main.patch       |  6 +-
 .../0017-Build-dynamic-host-libraries.patch   |  8 +-
 .../0018-Enable-rpath-for-build-tools.patch   |  6 +-
 ...0019-Use-system-zlib-for-build-tools.patch | 10 +-
 ...g-default-include-and-lib-dirs-at-qm.patch | 14 +--
 ...1-Use-.dll.a-as-import-lib-extension.patch |  6 +-
 ...erge-shared-and-static-library-trees.patch |  8 +-
 ...s-of-static-libraries-in-CMake-modul.patch |  8 +-
 ...w-usage-of-static-version-with-CMake.patch |  6 +-
 ...ags-for-static-build-with-cmake-ming.patch |  6 +-
 ...6-Use-correct-pkg-config-static-flag.patch |  6 +-
 ...7-Fix-macro-invoking-moc-rcc-and-uic.patch |  6 +-
 ...-errors-about-missing-feature-static.patch | 14 +--
 .../0029-Enable-and-fix-use-of-iconv.patch    | 10 +-
 .../0030-Ignore-failing-pkg-config-test.patch | 10 +-
 ...from-messing-static-lib-dependencies.patch |  6 +-
 ...de-linker-flags-for-platform-plugins.patch | 43 +++++----
 ...ng-against-static-plugins-with-qmake.patch |  6 +-
 .../0034-Don-t-use-the-statx-syscall.patch    | 27 ++++++
 qt5-base/mingw-w64-static/PKGBUILD            | 91 ++++++++++---------
 qt5-base/mingw-w64-test/PKGBUILD              |  2 +-
 ...for-cross-compilation-with-mingw-w64.patch | 10 +-
 ...is-defined-when-using-dynamic-OpenGL.patch |  6 +-
 .../0003-Use-external-ANGLE-library.patch     | 14 +--
 ...tions-assemler-error-in-OpenGL-facto.patch |  6 +-
 ...re-.pc-files-are-installed-correctly.patch |  8 +-
 ...add-resource-files-to-LIBS-parameter.patch | 10 +-
 ...ug-library-names-in-pkg-config-files.patch |  8 +-
 ...linking-against-shared-static-libpng.patch | 10 +-
 ...009-Fix-linking-against-static-D-Bus.patch |  8 +-
 ...o-use-debug-version-of-D-Bus-library.patch |  8 +-
 ...Fix-linking-against-static-freetype2.patch | 10 +-
 ...-Fix-linking-against-static-harfbuzz.patch | 10 +-
 ...0013-Fix-linking-against-static-pcre.patch |  8 +-
 ...inking-against-shared-static-MariaDB.patch |  6 +-
 ...ing-against-shared-static-PostgreSQL.patch |  6 +-
 .../0016-Rename-qtmain-to-qt5main.patch       |  6 +-
 .../0017-Build-dynamic-host-libraries.patch   |  8 +-
 .../0018-Enable-rpath-for-build-tools.patch   |  6 +-
 ...0019-Use-system-zlib-for-build-tools.patch | 10 +-
 ...g-default-include-and-lib-dirs-at-qm.patch | 14 +--
 ...1-Use-.dll.a-as-import-lib-extension.patch |  6 +-
 ...erge-shared-and-static-library-trees.patch |  8 +-
 ...s-of-static-libraries-in-CMake-modul.patch |  8 +-
 ...w-usage-of-static-version-with-CMake.patch |  6 +-
 ...ags-for-static-build-with-cmake-ming.patch |  6 +-
 ...6-Use-correct-pkg-config-static-flag.patch |  6 +-
 ...7-Fix-macro-invoking-moc-rcc-and-uic.patch |  6 +-
 ...-errors-about-missing-feature-static.patch | 14 +--
 .../0029-Enable-and-fix-use-of-iconv.patch    | 10 +-
 .../0030-Ignore-failing-pkg-config-test.patch | 10 +-
 ...from-messing-static-lib-dependencies.patch |  6 +-
 ...de-linker-flags-for-platform-plugins.patch | 43 +++++----
 ...ng-against-static-plugins-with-qmake.patch |  6 +-
 .../0034-Don-t-use-the-statx-syscall.patch    | 27 ++++++
 qt5-base/mingw-w64/PKGBUILD                   | 91 ++++++++++---------
 qt5-canvas3d/mingw-w64/PKGBUILD               |  8 +-
 qt5-charts/mingw-w64/PKGBUILD                 |  8 +-
 qt5-connectivity/mingw-w64/PKGBUILD           |  8 +-
 qt5-datavis3d/mingw-w64/PKGBUILD              |  8 +-
 qt5-declarative/apple-darwin/PKGBUILD         |  8 +-
 ...uild-QML-dev-tools-as-shared-library.patch |  4 +-
 ...2-Ensure-static-plugins-are-exported.patch |  4 +-
 ...g-QML-parser-symbols-on-static-build.patch |  4 +-
 qt5-declarative/mingw-w64/PKGBUILD            | 14 +--
 qt5-gamepad/mingw-w64/PKGBUILD                |  8 +-
 qt5-graphicaleffects/mingw-w64/PKGBUILD       |  8 +-
 qt5-imageformats/apple-darwin/PKGBUILD        |  6 +-
 qt5-imageformats/mingw-w64/PKGBUILD           |  8 +-
 ...c-3rdparty-libs-are-linked-correctly.patch |  6 +-
 ...rce-use-of-ANGLE-in-Mapbox-GL-plugin.patch | 34 -------
 qt5-location/mingw-w64/PKGBUILD               | 24 ++---
 ...s-to-prevent-conflict-with-vsnprintf.patch |  4 +-
 .../mingw-w64/0002-Fix-build-with-ANGLE.patch |  8 +-
 qt5-multimedia/mingw-w64/PKGBUILD             | 12 +--
 qt5-networkauth/mingw-w64/PKGBUILD            | 68 ++++++++++++++
 qt5-quick1/mingw-w64/PKGBUILD                 |  4 +-
 qt5-quickcontrols/mingw-w64/PKGBUILD          |  8 +-
 qt5-quickcontrols2/mingw-w64/PKGBUILD         |  8 +-
 qt5-remoteobjects/mingw-w64/PKGBUILD          | 77 ++++++++++++++++
 qt5-script/mingw-w64/PKGBUILD                 |  8 +-
 qt5-scxml/mingw-w64/PKGBUILD                  |  8 +-
 qt5-sensors/mingw-w64/PKGBUILD                |  8 +-
 qt5-serialport/mingw-w64/PKGBUILD             |  8 +-
 qt5-speech/mingw-w64/PKGBUILD                 | 71 +++++++++++++++
 qt5-svg/apple-darwin/PKGBUILD                 |  8 +-
 qt5-svg/mingw-w64/PKGBUILD                    |  8 +-
 qt5-tools/apple-darwin/PKGBUILD               |  8 +-
 .../mingw-w64/0001-Fix-linguist-macro.patch   |  4 +-
 ...qhelpconverter-against-static-bearer.patch |  4 +-
 qt5-tools/mingw-w64/PKGBUILD                  | 16 ++--
 qt5-translations/apple-darwin/PKGBUILD        |  8 +-
 qt5-translations/mingw-w64/PKGBUILD           |  8 +-
 qt5-virtualkeyboard/mingw-w64/PKGBUILD        |  8 +-
 qt5-webchannel/mingw-w64/PKGBUILD             |  8 +-
 qt5-webengine/mingw-w64-git/PKGBUILD          |  2 +-
 qt5-webengine/mingw-w64/PKGBUILD              |  6 +-
 qt5-webkit/mingw-w64/PKGBUILD                 |  4 +-
 qt5-websockets/mingw-w64/PKGBUILD             |  8 +-
 qt5-webview/default/PKGBUILD                  |  4 +-
 qt5-webview/git/PKGBUILD                      |  2 +-
 qt5-webview/mingw-w64-git/PKGBUILD            |  2 +-
 qt5-winextras/mingw-w64/PKGBUILD              |  8 +-
 qt5-xmlpatterns/mingw-w64/PKGBUILD            |  8 +-
 195 files changed, 1335 insertions(+), 986 deletions(-)
 create mode 100644 qt5-base/mingw-w64-angle/0034-Don-t-use-the-statx-syscall.patch
 create mode 100644 qt5-base/mingw-w64-dynamic/0034-Don-t-use-the-statx-syscall.patch
 create mode 100644 qt5-base/mingw-w64-static/0034-Don-t-use-the-statx-syscall.patch
 create mode 100644 qt5-base/mingw-w64/0034-Don-t-use-the-statx-syscall.patch
 delete mode 100644 qt5-location/mingw-w64/0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch
 create mode 100644 qt5-networkauth/mingw-w64/PKGBUILD
 create mode 100644 qt5-remoteobjects/mingw-w64/PKGBUILD
 create mode 100644 qt5-speech/mingw-w64/PKGBUILD
 mode change 100644 => 100755 qt5-tools/mingw-w64/PKGBUILD

diff --git a/devel/qt5/update-patches.sh b/devel/qt5/update-patches.sh
index be75755a..a9d5e3f1 100755
--- a/devel/qt5/update-patches.sh
+++ b/devel/qt5/update-patches.sh
@@ -65,6 +65,7 @@ done
 # preserve first src line to keep variables unevaluated
 newsrc=$(grep 'source=(' "$dest/PKGBUILD")
 [[ $newsrc ]] || newsrc="source=(${new_sources[0]}"
+[ "${newsrc: -1:1}" == ')' ] && newsrc="${newsrc: 0:-1}" # truncate trailing )
 for source in "${new_sources[@]:1}"; do
     newsrc+="\n        '${source##*/}'"
 done
diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD
index a3b37326..509e2ecc 100644
--- a/qt5-3d/mingw-w64/PKGBUILD
+++ b/qt5-3d/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qt3d
 pkgname="mingw-w64-qt5-3d"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
@@ -19,9 +19,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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")
-sha256sums=('c955a92fe2f3f2f03493ae0e9d973ebe1c4b1e037b58f18092fa2040f5b50783')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('12457e7227c793274329371c60b9028ab3e44db837e875e2c460367c1dbd34ab')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch b/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch
index 8606e140..64d686ef 100644
--- a/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch
+++ b/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch
@@ -1,4 +1,4 @@
-From 82a268b89f2c68be1ce2d10eb89634bd3bff9715 Mon Sep 17 00:00:00 2001
+From 5e50bfc8c4dbc276ee4ec189794584f7b8bdf2a2 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
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Don't require windows.h when using native Linux gcc
  1 file changed, 1 deletion(-)
 
 diff --git a/src/tools/idc/idc.pro b/src/tools/idc/idc.pro
-index 1898ed5..524ee2e 100644
+index 7f9a8d4..6f3548a 100644
 --- a/src/tools/idc/idc.pro
 +++ b/src/tools/idc/idc.pro
 @@ -1,4 +1,3 @@
@@ -17,5 +17,5 @@ index 1898ed5..524ee2e 100644
  SOURCES = main.cpp
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
index e82bc22f..0d76c7a0 100644
--- a/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
+++ b/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
@@ -1,4 +1,4 @@
-From ba803e4196000080e8e5b5abce811e54318eb08e Mon Sep 17 00:00:00 2001
+From 986644a25ba7d02fb0044b1cb163329e2b8f4e89 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
@@ -11,10 +11,10 @@ See https://bugreports.qt.io/browse/QTBUG-46827
  2 files changed, 12 insertions(+)
 
 diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
-index cd564d3..f3c55b1 100644
+index aa66398..087b83c 100644
 --- a/src/activeqt/container/qaxbase.cpp
 +++ b/src/activeqt/container/qaxbase.cpp
-@@ -2170,6 +2170,10 @@ void MetaObjectGenerator::readClassInfo()
+@@ -2180,6 +2180,10 @@ void MetaObjectGenerator::readClassInfo()
              const QStringList versions = controls.childGroups();
              for (const QString &version : versions) {
                  tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
@@ -52,5 +52,5 @@ index 1f0cca8..d26bd78 100644
      }
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD
index 8e98c5b4..7d31fc24 100644
--- a/qt5-activeqt/mingw-w64/PKGBUILD
+++ b/qt5-activeqt/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtactiveqt
 pkgname=mingw-w64-qt5-activeqt
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
@@ -19,13 +19,13 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch'
         '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
-sha256sums=('60458d1972075b7196122b01d0ef7929cef49cc3f0683f8e46cd3a65b44de5cf'
-            '7e2f0bd1803d8c6d4ba3618a7ee02d3887f192ef9d3f6ab31d7f5468b515e3c0'
-            'b781aa5f1bccc9be056ba15f1ff3e557cd19b48ad212a37a529dc414844f3af1')
+sha256sums=('f9d74034ffe6e54278f1720d4c8c678f80882b9fffa3b698bd212f0a4b5cd674'
+            '7e099a0aaa459d25eea88105179237653571ac0a2498c987ab9bdccaf118722b'
+            'e65bdeeaf11f2e905145ff3aac81a735f5d2f3c68cf5ba69f1ee36ef4b25e50f')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-base/apple-darwin/PKGBUILD b/qt5-base/apple-darwin/PKGBUILD
index f14143dd..6829d607 100644
--- a/qt5-base/apple-darwin/PKGBUILD
+++ b/qt5-base/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase
 
 pkgname=apple-darwin-qt5-base
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework (apple-darwin)'
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ groups=('apple-darwin-qt5')
 optdepends=()
 makedepends=('clang')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
-_pkgfqn="qtbase-opensource-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+_pkgfqn="qtbase-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Enable-cross-compilation-with-osxcross.patch'
         '0002-Allow-overriding-stdlib-under-MacOS.patch'
         '0003-Remove-error-handling-for-Xcode-detection.patch'
@@ -26,7 +26,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
         '0006-Pull-dependencies-of-static-libraries-in-CMake-modul.patch'
         '0007-Fix-finding-gl.h-when-cross-compiling-with-osxcross.patch'
         '0008-Prevent-error-when-qmlimportscanner-not-available.patch')
-sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
+sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
             'f5b474fc11f929c8e1563136c6b53d09c9e405ebf5a7940a63dc13f00d3e2bbd'
             'a51749efb16b81f5e272a0864a6e2583942998bca1fe397c0e4205b269c97ae4'
             '73d314dad7a93073140ee9d868e1071a107b1afdecc67cb67d85a91391452a82'
diff --git a/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
index 9fa075d1..15ca6ec5 100644
--- a/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
+++ b/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
@@ -1,7 +1,7 @@
-From 76b918b0c930c9c4c704f4ce947822e30c1bf1ec Mon Sep 17 00:00:00 2001
+From af6803389ebba50abfe7ad299bbf99c9c8d1a8aa Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/33] Add profile for cross compilation with mingw-w64
+Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64
 
 ---
  mkspecs/mingw-w64-g++/qmake.conf      | 126 +++++++++++++++++++++++++++
@@ -12,7 +12,7 @@ Subject: [PATCH 01/33] 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..c929483fcd
+index 0000000000..0979611a53
 --- /dev/null
 +++ b/mkspecs/mingw-w64-g++/qmake.conf
 @@ -0,0 +1,126 @@
@@ -133,7 +133,7 @@ index 0000000000..c929483fcd
 +                              $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
 +                              $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
 +QMAKE_LIBS_NETWORK          = -lws2_32 -lcrypt32 -ldnsapi
-+QMAKE_LIBS_NETWORK_STATIC   = $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libssl.a $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libcrypto.a -lgdi32
++QMAKE_LIBS_NETWORK_STATIC   = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -ldnsapi
 +QMAKE_LIBS_DBUS             = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1)
 +QMAKE_LIBS_OPENGL           = -lglu32 -lopengl32 -lgdi32 -luser32
 +QMAKE_LIBS_OPENGL_ES2       = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
@@ -304,5 +304,5 @@ index 0000000000..c5a70b1445
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
index e644e2aa..91acfc8f 100644
--- a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,7 +1,7 @@
-From 31fa3e1192849fb5460b346a3fc1f91fe1431f8e Mon Sep 17 00:00:00 2001
+From b8e324aa1716e50bdb66772bab2442e5b7c7afe8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---
@@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch
index f753a01a..94419690 100644
--- a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch
@@ -1,7 +1,7 @@
-From 00b0e801caf246047f3ea18bead0ffc7c7631dad Mon Sep 17 00:00:00 2001
+From 036909a4c082a17bee90c451842ebaee896e1893 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/33] Use external ANGLE library
+Subject: [PATCH 03/34] Use external ANGLE library
 
 ---
  src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
@@ -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 f7d077e656..b7fc6fadaf 100644
+index f8cec00b82..d09c9fd49c 100644
 --- a/src/gui/gui.pro
 +++ b/src/gui/gui.pro
 @@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@@ -66,7 +66,7 @@ index 016db46405..02f1204f0f 100644
  HEADERS += qgl.h \
             qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index 6d01d05fcc..181ac2cb3b 100644
+index b7790a66e3..046fe34a06 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
 @@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
@@ -78,10 +78,10 @@ index 6d01d05fcc..181ac2cb3b 100644
  mingw: LIBS *= -luuid
  # For the dialog helpers:
 diff --git a/src/src.pro b/src/src.pro
-index 43fc06f2e5..4188d4ea6b 100644
+index a2064b1362..b9ba606b03 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -175,10 +175,6 @@ qtConfig(gui) {
+@@ -180,10 +180,6 @@ qtConfig(gui) {
          SUBDIRS += src_3rdparty_harfbuzzng
          src_gui.depends += src_3rdparty_harfbuzzng
      }
@@ -93,5 +93,5 @@ index 43fc06f2e5..4188d4ea6b 100644
          SUBDIRS += src_3rdparty_libpng
          src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
index b3ae560d..7619c55f 100644
--- a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -1,7 +1,7 @@
-From 6f9daffcc9b83acbcae94ced0708f6f96f2e99c4 Mon Sep 17 00:00:00 2001
+From d67f33383fde286f9c8e77bbd686a5c335473645 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.
@@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch
index e99439db..c685ba02 100644
--- a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,7 +1,7 @@
-From 198b5f7e944f21a7f9caaeb686afddfc9e87c768 Mon Sep 17 00:00:00 2001
+From 1c595c81473d93a87b339df137820624cafdc373 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
+Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -10,7 +10,7 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
  3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a1f3352aa3..0be4b1ef01 100644
+index 82573347b6..b9871ff49c 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
@@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
index 43268114..d5221ecb 100644
--- a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,7 +1,7 @@
-From 5731914d9e5d8a026901e5bbab3f3ee1b3ea50f3 Mon Sep 17 00:00:00 2001
+From 50b56803c962a656211021e50cd3e7df57722726 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references
@@ -11,10 +11,10 @@ like .obj/debug/Qt5Cored_resource_res.o
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
-index bad53dc5b7..c730d641b2 100644
+index 792ffb1997..faf8b5a275 100644
 --- a/qmake/generators/win32/mingw_make.cpp
 +++ b/qmake/generators/win32/mingw_make.cpp
-@@ -202,7 +202,7 @@ void MingwMakefileGenerator::init()
+@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init()
  
      processVars();
  
@@ -24,5 +24,5 @@ index bad53dc5b7..c730d641b2 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch
index f09d6fae..a3e93271 100644
--- a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,7 +1,7 @@
-From 285b5fee5b5ada6cd82ddaf33eb9c1a05b564bc6 Mon Sep 17 00:00:00 2001
+From b02e8af19e3d94f9c39bbcaf94e91ab6dc6ca3f8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
 
 qmake generates the pkgconfig .pc files two times, once for the
 release build and once for the debug build (which we're not actually
@@ -15,7 +15,7 @@ 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 0be4b1ef01..c7e075b5bc 100644
+index b9871ff49c..0d07d6c333 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
@@ -29,5 +29,5 @@ index 0be4b1ef01..c7e075b5bc 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch
index d1b4f7ac..a5eef160 100644
--- a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch
@@ -1,7 +1,7 @@
-From 1ee8c85cd86ca49c2d43d81af0c57eb49b877372 Mon Sep 17 00:00:00 2001
+From e48d371cf5b0b98f91fca0fe38a5dd0479fcdfca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 08/33] Fix linking against shared/static libpng
+Subject: [PATCH 08/34] Fix linking against shared/static libpng
 
 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
@@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 28c8034c75..7e9148500b 100644
+index 0a591e110c..4ca919c6da 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -294,7 +294,8 @@
+@@ -296,7 +296,8 @@
              "sources": [
                  { "type": "pkgConfig", "args": "libpng" },
                  { "libs": "-llibpng", "condition": "config.msvc" },
@@ -23,5 +23,5 @@ index 28c8034c75..7e9148500b 100644
              "use": [
                  { "lib": "zlib", "condition": "features.system-zlib" }
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch
index d07abaee..4b897989 100644
--- a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch
@@ -1,7 +1,7 @@
-From 3e04b4a701a7dde06f5ea046198ac5646b644e86 Mon Sep 17 00:00:00 2001
+From 6785fbf99c08ef26967bcd064941b7bd692afb41 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 09/33] Fix linking against static D-Bus
+Subject: [PATCH 09/34] Fix linking against static D-Bus
 
 ---
  configure.json             | 9 +++++++--
@@ -9,7 +9,7 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/configure.json b/configure.json
-index a91456aaf3..55c56369ba 100644
+index 26e1572f32..108619634c 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -171,18 +171,23 @@
@@ -54,5 +54,5 @@ index cfc0e12046..65f1397cd6 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
index 02a01b11..ebdc33ce 100644
--- a/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,7 +1,7 @@
-From 28750e29ab3549300823ff8af3c2064479e71c95 Mon Sep 17 00:00:00 2001
+From 94ba6e5a623a81ee02f6b7a46b7e82f4ea505f4f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
-Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
+Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
 
 Required for a debug build of Qt because mingw-w64-dbus
 does not contain debug version
@@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 55c56369ba..9914bf0487 100644
+index 108619634c..d668ce0c98 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -184,7 +184,7 @@
@@ -25,5 +25,5 @@ index 55c56369ba..9914bf0487 100644
                      },
                      "condition": "config.win32 && features.shared"
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch
index aa7a66d4..a45279cf 100644
--- a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch
@@ -1,17 +1,17 @@
-From e7e7c7500e07d5d1eaa69550ac6c760e55e857a4 Mon Sep 17 00:00:00 2001
+From 6e4e751d6f39c6869cacb6d4148f5358f58bb54e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 11/33] Fix linking against static freetype2
+Subject: [PATCH 11/34] Fix linking against static freetype2
 
 ---
  src/gui/configure.json | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 7e9148500b..27f8257c18 100644
+index 4ca919c6da..5d524b1d73 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -156,8 +156,11 @@
+@@ -158,8 +158,11 @@
                  ]
              },
              "sources": [
@@ -26,5 +26,5 @@ index 7e9148500b..27f8257c18 100644
          },
          "fontconfig": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch
index 91364f8c..71e2a90b 100644
--- a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch
@@ -1,17 +1,17 @@
-From 38b3a06ebd65bab1765c95537eb8503286e31754 Mon Sep 17 00:00:00 2001
+From e05dcf0fb89c0ab64aba0f3a53986daa6a0bed76 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 12/33] Fix linking against static harfbuzz
+Subject: [PATCH 12/34] Fix linking against static harfbuzz
 
 ---
  src/gui/configure.json | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 27f8257c18..1a87110831 100644
+index 5d524b1d73..78f1b90d37 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -221,7 +221,11 @@
+@@ -223,7 +223,11 @@
                  ]
              },
              "sources": [
@@ -25,5 +25,5 @@ index 27f8257c18..1a87110831 100644
          },
          "imf": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch
index 0bdd68d8..6e3e18c9 100644
--- a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch
@@ -1,7 +1,7 @@
-From f5a1650b08d90f854b1b8eb12c0e6b9a5c3f5cc4 Mon Sep 17 00:00:00 2001
+From 9e7f8734086cc4a2dd7f6e713076af64648802f7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 13/33] Fix linking against static pcre
+Subject: [PATCH 13/34] Fix linking against static pcre
 
 Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
@@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
  1 file changed, 4 insertions(+)
 
 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 88b696f53a..afe444027e 100644
+index 86bc99716d..5037ae68a1 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
 @@ -55,6 +55,10 @@
@@ -24,5 +24,5 @@ index 88b696f53a..afe444027e 100644
  #include <pcre2.h>
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch
index 402f1dd8..6185fe92 100644
--- a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,7 +1,7 @@
-From a1d177d63fb62d1bb77225fd90c5eb2883322a26 Mon Sep 17 00:00:00 2001
+From 8d8e5c1df2e366ba3c595970813caf98768a140f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
+Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
 
 Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
@@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
                  { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                  { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch
index ec7e9178..abe072c4 100644
--- a/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,7 +1,7 @@
-From 603ca5161d67e72432128a21478bd623d8b973c2 Mon Sep 17 00:00:00 2001
+From fd736054ec03ad328b1e8c4195184f286655040e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
 
 ---
  src/plugins/sqldrivers/configure.json | 5 +++--
@@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
              ]
          },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch
index a2a5d387..26b8cf2f 100644
--- a/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch
@@ -1,7 +1,7 @@
-From eed57ae8b6b9a2a8a6183751f08f16c9921bf32b Mon Sep 17 00:00:00 2001
+From 15f3d49456695caeb91f1e861730883aea04ca5f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 16/33] Rename qtmain to qt5main
+Subject: [PATCH 16/34] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
  
  CONFIG += static
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch
index 2f2262c1..184aff91 100644
--- a/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch
@@ -1,7 +1,7 @@
-From b5a1c1909c58b62705f1ff46adfac40ed26b0f5d Mon Sep 17 00:00:00 2001
+From 366c764b927e568c75968ae92ec16caca54c0d31 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
-Subject: [PATCH 17/33] Build dynamic host libraries
+Subject: [PATCH 17/34] Build dynamic host libraries
 
 This came initially from Fedora, not sure whether
 it makes sense to keep it. Regular Arch package
@@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 36f632e8ca..2deec56866 100644
+index c0a8dcc251..200fa40840 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -24,7 +24,7 @@ requires(!$$skip)
@@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch
index 4740f5c0..c8636ff4 100644
--- a/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch
@@ -1,7 +1,7 @@
-From 7b40a97b618dda07f6e9fdaf28db958c0f5b33fc Mon Sep 17 00:00:00 2001
+From b6dfc4016e7f61c1eb178b051387b08219652484 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 18/33] Enable rpath for build tools
+Subject: [PATCH 18/34] Enable rpath for build tools
 
 - Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib
@@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
  INSTALLS += target
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch
index 834f8ccc..e76fce8a 100644
--- a/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch
@@ -1,17 +1,17 @@
-From 25849eed06ade33131bb0dfa2bdb3e890b2e9ee7 Mon Sep 17 00:00:00 2001
+From 012d6961a9ffbaeabf1742243b23ee092b915af2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 19/33] Use system zlib for build tools
+Subject: [PATCH 19/34] Use system zlib for build tools
 
 ---
  src/tools/bootstrap/bootstrap.pro | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index 521dd5f0f2..eb8cb4770c 100644
+index 042ad7adb9..7e3bc3977a 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -129,7 +129,7 @@ macx {
+@@ -132,7 +132,7 @@ macx {
          ../../corelib/io/qstandardpaths_win.cpp
  }
  
@@ -21,5 +21,5 @@ index 521dd5f0f2..eb8cb4770c 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64-angle/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
index ff40a808..cf2e1d82 100644
--- a/qt5-base/mingw-w64-angle/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+++ b/qt5-base/mingw-w64-angle/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
@@ -1,7 +1,7 @@
-From 98a2adad712fb0c23ad2813e1a35a793317461ad Mon Sep 17 00:00:00 2001
+From 81a6a9a34e71a08fd5a8b87f44c71803d7f07797 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:20:25 +0200
-Subject: [PATCH 20/33] Disable determing default include and lib dirs at qmake
+Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake
  time when building with mingw-w64
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 20/33] 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 35175f1744..96afeeca57 100644
+index ba41598be1..6416db4d58 100644
 --- a/mkspecs/features/toolchain.prf
 +++ b/mkspecs/features/toolchain.prf
 @@ -31,7 +31,7 @@ isEmpty($${target_prefix}.INCDIRS) {
@@ -18,9 +18,9 @@ index 35175f1744..96afeeca57 100644
      #
 -    gcc {
 +    !win32:gcc {
-         !equals(QMAKE_HOST.os, Windows) {
-             cmd_prefix = "LC_ALL=C"
-             cmd_suffix = "</dev/null >/dev/null"
+         cmd_suffix = "<$$QMAKE_SYSTEM_NULL_DEVICE >$$QMAKE_SYSTEM_NULL_DEVICE"
+         equals(QMAKE_HOST.os, Windows): \
+             cmd_prefix = "set LC_ALL=C&"
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0021-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-angle/0021-Use-.dll.a-as-import-lib-extension.patch
index b3f9e5dc..4f2ee4c6 100644
--- a/qt5-base/mingw-w64-angle/0021-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-angle/0021-Use-.dll.a-as-import-lib-extension.patch
@@ -1,7 +1,7 @@
-From 5cb315e62e7c4114d62767c274952c58ebe88b06 Mon Sep 17 00:00:00 2001
+From 834b94ccb1897cd5325557fa6051ef2cb4bb70a0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 21/33] Use *.dll.a as import lib extension
+Subject: [PATCH 21/34] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 mingw-w64 specific mkspec
@@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0022-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-angle/0022-Merge-shared-and-static-library-trees.patch
index c2c02d58..44d0bcb3 100644
--- a/qt5-base/mingw-w64-angle/0022-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-angle/0022-Merge-shared-and-static-library-trees.patch
@@ -1,7 +1,7 @@
-From 0401a8dd7051a1d6aca6288fd5a5d0bef006168e Mon Sep 17 00:00:00 2001
+From 4502d0a9e9102067541a4307e80444a4fb44717c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 22/33] Merge shared and static library trees
+Subject: [PATCH 22/34] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
 ---
@@ -99,7 +99,7 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index c7e075b5bc..d61f7b05e5 100644
+index 0d07d6c333..5e84628e72 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
@@ -126,5 +126,5 @@ index c7e075b5bc..d61f7b05e5 100644
  
      t << endl;
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-angle/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index 2fd999f6..bf2ec7ba 100644
--- a/qt5-base/mingw-w64-angle/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-angle/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,7 +1,7 @@
-From 6e0b658e5cadf0248954fbbf1b8271d54b9778a2 Mon Sep 17 00:00:00 2001
+From f73b460094294c7cd9f9d9cd481fbf1cef5a2a49 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 23/33] Pull dependencies of static libraries in CMake modules
+Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules
 
 When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
@@ -251,7 +251,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index d61f7b05e5..2dd26bf4dd 100644
+index 5e84628e72..c853d52b27 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@@ -269,5 +269,5 @@ index d61f7b05e5..2dd26bf4dd 100644
  }
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0024-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-angle/0024-Allow-usage-of-static-version-with-CMake.patch
index 0e9f9771..c4e60933 100644
--- a/qt5-base/mingw-w64-angle/0024-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-angle/0024-Allow-usage-of-static-version-with-CMake.patch
@@ -1,7 +1,7 @@
-From eec4b8a76d8c5882a5fbd4e6aa85dea696049c23 Mon Sep 17 00:00:00 2001
+From 903ed5730e5a25ea6fda815fcd88cc36e3d8639e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
-Subject: [PATCH 24/33] Allow usage of static version with CMake
+Subject: [PATCH 24/34] Allow usage of static version with CMake
 
 Allow selecting between dynamic and static Qt versions
 installed in the same prefix
@@ -997,5 +997,5 @@ index 2a575958ae..ca0e3be3b5 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-angle/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index b9f81f22..02432029 100644
--- a/qt5-base/mingw-w64-angle/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-angle/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,7 +1,7 @@
-From 0aac929861fb8d60fbc66f2557e1b9c5022ff9c5 Mon Sep 17 00:00:00 2001
+From b3bcf57cfbd152eafa82b9d80183fde0f2bf1f5c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
-Subject: [PATCH 25/33] Adjust linker flags for static build with
+Subject: [PATCH 25/34] Adjust linker flags for static build with
  cmake/mingw-w64
 
 Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
@@ -25,5 +25,5 @@ index ebe6644dfe..687d611b3f 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0026-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-angle/0026-Use-correct-pkg-config-static-flag.patch
index 15c749e6..36498bf7 100644
--- a/qt5-base/mingw-w64-angle/0026-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-angle/0026-Use-correct-pkg-config-static-flag.patch
@@ -1,7 +1,7 @@
-From f2ff6d5023bd834b0110a97a16e085c3914335a7 Mon Sep 17 00:00:00 2001
+From 1e31f372966581f19bcbd9a39b29cf3dedfe9c5a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 26/33] Use correct pkg-config --static flag
+Subject: [PATCH 26/34] Use correct pkg-config --static flag
 
 ---
  configure.pri | 3 +++
@@ -22,5 +22,5 @@ index a05c3d98e6..8dc874a74d 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0027-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-angle/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
index a8508251..3b75e887 100644
--- a/qt5-base/mingw-w64-angle/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-angle/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,7 +1,7 @@
-From 4f332ea7f376d8a77d7dbfe82ab6e5eb6b6f1fe9 Mon Sep 17 00:00:00 2001
+From 0f6a4852f4bf5d43aa856f2af475f5f526b76daf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 27/33] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic
 
 * Otherwise the arguments aren't passed correctly leading to errors like
   ```
@@ -70,5 +70,5 @@ index f5e7b7f050..18d120f0c7 100644
            MAIN_DEPENDENCY ${infile} VERBATIM)
          list(APPEND ${outfiles} ${outfile})
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0028-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-angle/0028-Ignore-errors-about-missing-feature-static.patch
index 104d9c20..803dfe38 100644
--- a/qt5-base/mingw-w64-angle/0028-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-angle/0028-Ignore-errors-about-missing-feature-static.patch
@@ -1,7 +1,7 @@
-From a8039e2f388a3fbd289dc912ae6b6a58beb84f19 Mon Sep 17 00:00:00 2001
+From 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 28/33] Ignore errors about missing feature static
+Subject: [PATCH 28/34] 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 150d2b2cc3..d93d24cce5 100644
+index 76e1d15319..9a1c5cd8b6 100644
 --- a/mkspecs/features/qt_build_config.prf
 +++ b/mkspecs/features/qt_build_config.prf
-@@ -135,5 +135,5 @@ defineTest(qtConfig) {
+@@ -138,5 +138,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -21,10 +21,10 @@ index 150d2b2cc3..d93d24cce5 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 c00fdb73f8..d4d5599433 100644
+index 1903e509c8..1fcb597fa3 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -351,5 +351,5 @@ defineTest(qtConfig) {
+@@ -348,5 +348,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -32,5 +32,5 @@ index c00fdb73f8..d4d5599433 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0029-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-angle/0029-Enable-and-fix-use-of-iconv.patch
index ddffbea3..128a1cf3 100644
--- a/qt5-base/mingw-w64-angle/0029-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-angle/0029-Enable-and-fix-use-of-iconv.patch
@@ -1,7 +1,7 @@
-From 05738e526362a5c712d8341ada02e557e76579f5 Mon Sep 17 00:00:00 2001
+From 3a5569599bd8c5267e41c57917b19e16bba1169c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 29/33] Enable and fix use of iconv
+Subject: [PATCH 29/34] Enable and fix use of iconv
 
 Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
 ---
@@ -63,10 +63,10 @@ index d6362b6fbc..4da4546a24 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index a5b69a2df6..9e3eb4f671 100644
+index bf44f2649d..90f0450902 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
-@@ -428,9 +428,9 @@
+@@ -521,9 +521,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",
@@ -79,5 +79,5 @@ index a5b69a2df6..9e3eb4f671 100644
          },
          "icu": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0030-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-angle/0030-Ignore-failing-pkg-config-test.patch
index cc89a8e3..4c8cc8f8 100644
--- a/qt5-base/mingw-w64-angle/0030-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-angle/0030-Ignore-failing-pkg-config-test.patch
@@ -1,7 +1,7 @@
-From f99af5483b8c3d8b511db8476f4d738ff868886c Mon Sep 17 00:00:00 2001
+From e9f964d079c6dea6404f01d0d8f1acfa5287ccdc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 30/33] Ignore failing pkg-config test
+Subject: [PATCH 30/34] Ignore failing pkg-config test
 
 Didn't investigate why it fails, let's hope for the best
 ---
@@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
  1 file changed, 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 9914bf0487..d5b81d53f5 100644
+index d668ce0c98..2d36a60cd3 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -710,7 +710,6 @@
+@@ -725,7 +725,6 @@
          "pkg-config": {
              "label": "Using pkg-config",
              "autoDetect": "!config.darwin && !config.win32",
@@ -21,5 +21,5 @@ index 9914bf0487..d5b81d53f5 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-angle/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 5fc9df50..e4349439 100644
--- a/qt5-base/mingw-w64-angle/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-angle/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,7 +1,7 @@
-From eadf27b8bd882899a99254578ecb8407a0acab6f Mon Sep 17 00:00:00 2001
+From d35384a8d6191d68f8cd2b60a2295f5372d67fa4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 31/33] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies
 
 In particular, it messes resolving cyclic dependency between
 static freetype2 and harfbuzz
@@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644
    static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
    for (int i = 0; lflags[i]; i++) {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0032-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-angle/0032-Hardcode-linker-flags-for-platform-plugins.patch
index 5562bbf3..3d82dfff 100644
--- a/qt5-base/mingw-w64-angle/0032-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-angle/0032-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,18 +1,16 @@
-From f7bb119102d28e22b764cce82ee491e747034247 Mon Sep 17 00:00:00 2001
+From aa947be7429528caf04ad7db6f077fe695bcfe82 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 32/33] Hardcode linker flags for platform plugins
+Subject: [PATCH 32/34] 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(-)
+ src/plugins/platforms/minimal/minimal.pro     | 15 +++++++++++--
+ src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++--
+ src/plugins/platforms/windows/windows.pro     | 32 +++++++++++++++++++--------
+ 3 files changed, 48 insertions(+), 13 deletions(-)
 
 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
 index 8cfb68824e..46834a71fc 100644
@@ -66,36 +64,47 @@ index 6652cefd86..a322b17cc5 100644
  DEFINES += QT_NO_FOREACH
  
 diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
-index 23168c10dc..eb4af726ca 100644
+index 174bc7b609..e66488e364 100644
 --- a/src/plugins/platforms/windows/windows.pro
 +++ b/src/plugins/platforms/windows/windows.pro
-@@ -1,11 +1,22 @@
+@@ -1,14 +1,28 @@
  TARGET = qwindows
  
- QT += \
+-QT += \
 -    core-private gui-private \
--    eventdispatcher_support-private accessibility_support-private \
+-    eventdispatcher_support-private \
 -    fontdatabase_support-private theme_support-private
-+    core-private gui-private
- 
+-
+-qtConfig(accessibility): QT += accessibility_support-private
+-qtConfig(vulkan): QT += vulkan_support-private
+-
 -LIBS += -lgdi32 -ldwmapi
++QT += core-private gui-private
++
 +# 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/$${QT_VERSION} \
-+    $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION} \
 +    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \
 +    $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION}
++# Same for private support libs for accessibility and vulkan, if those are enabled
++qtConfig(accessibility) {
++    LIBS += -lQt5AccessibilitySupport
++    INCLUDEPATH += $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}
++}
++qtConfig(vulkan) {
++    LIBS += -lQt5VulkanSupport
++    INCLUDEPATH += $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}
++}
  
  include(windows.pri)
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0033-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-angle/0033-Fix-linking-against-static-plugins-with-qmake.patch
index 676a558c..d849f3d8 100644
--- a/qt5-base/mingw-w64-angle/0033-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-angle/0033-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,7 +1,7 @@
-From b91d3a0690995511d1388b9d9493aed702bd0138 Mon Sep 17 00:00:00 2001
+From 7db753e04de6a458fc10124b7e3b12ac5f4d1623 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
-Subject: [PATCH 33/33] Fix linking against static plugins with qmake
+Subject: [PATCH 33/34] Fix linking against static plugins with qmake
 
 Required because qtConfig(static) does not work
 with 'Merge shared and static library trees'
@@ -33,5 +33,5 @@ index afaac3dbc4..82b02b5113 100644
          # Check if the plugin is known to Qt. We can use this to determine
          # the plugin path. Unknown plugins must rely on the default link path.
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-angle/0034-Don-t-use-the-statx-syscall.patch b/qt5-base/mingw-w64-angle/0034-Don-t-use-the-statx-syscall.patch
new file mode 100644
index 00000000..56e0ca93
--- /dev/null
+++ b/qt5-base/mingw-w64-angle/0034-Don-t-use-the-statx-syscall.patch
@@ -0,0 +1,27 @@
+From e8cbf42a882706cce93f46142748d252cb492e1c Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 9 Dec 2017 00:36:56 +0100
+Subject: [PATCH 34/34] Don't use the statx syscall
+
+Otherwise Qt can not be built in a systemd
+container
+---
+ src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index 77d154c6b4..6036bae4f1 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -95,7 +95,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp
+ { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
+ #  endif
+ 
+-#  if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE(<linux/stat.h>)
++#  if 0
+ #    include <linux/stat.h>
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+-- 
+2.15.1
+
diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD
index a1bc8dd8..c67806c0 100644
--- a/qt5-base/mingw-w64-angle/PKGBUILD
+++ b/qt5-base/mingw-w64-angle/PKGBUILD
@@ -84,7 +84,7 @@ isNoOpenGL() {
 }
 
 pkgname=mingw-w64-qt5-base-angle
-pkgver=5.9.2
+pkgver=5.10.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
@@ -92,14 +92,14 @@ 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-1.0' 'mingw-w64-dbus' 'mingw-w64-harfbuzz'
+         'mingw-w64-libpng' 'mingw-w64-openssl' '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')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
-_pkgfqn="qtbase-opensource-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+_pkgfqn="qtbase-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Add-profile-for-cross-compilation-with-mingw-w64.patch'
         '0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch'
         '0003-Use-external-ANGLE-library.patch'
@@ -132,41 +132,43 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
         '0030-Ignore-failing-pkg-config-test.patch'
         '0031-Prevent-qmake-from-messing-static-lib-dependencies.patch'
         '0032-Hardcode-linker-flags-for-platform-plugins.patch'
-        '0033-Fix-linking-against-static-plugins-with-qmake.patch')
-sha256sums=('7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b'
-            '685fd08e1c4e97bbf6990959cb3dbe88dd3ed494221400dce6aef159d277c34a'
-            '4e5115e62b952acface29882c5f6423569cd1c439c454e58594b5fb2cb740916'
-            '0b339563844ccd325486d78711592561996fb256f0612c63b33b6ea52a6fc77e'
-            '18945eb521df54d37922894c9bc82ccd03eb3fd9f6e0aed986facf2b49f336d4'
-            '2c2b5f9b3db02750ae9a9626ea8a24a3516c881c5eaa9b19fb9a2621fc1263fc'
-            '81559290cc03f7ff6042f28a6eb319882264876076a20e24531641ebe4ef3aee'
-            'a3d657ee7f8bfa6c3e5a4aa626710bc27fc82fea3d834098bde2b2f67244d11c'
-            '3df9bf81a936c737cc7ca53bdea9cfd2a4010fa190fe3e1a45611097d8213ef4'
-            '5aac41daaf223726d31ab5a7aec0bdc050aa182522ca732cc31c3b5ac8cd28dc'
-            '6844b7106e636d513b077edeba318990641b1ee294f2a70739830e3d0a9b0d02'
-            '12b51c32069270e49e05e64b0f54d6e3e871523660fd17673e0ee6e67206955e'
-            '4baa73f8b3d61b503a9de1437bdc9f7f84cd2443280afc1461456ae34d222e9b'
-            'e34eec672f9f681302edd809cbcb7d6848a310a02acc5711e2e348aab1b8d74c'
-            'd70f44c06a7bae6fbd91022ec79f09e2d658969aa5a6602bff6eb61076801b6e'
-            'f705fcfe1f552536318c2c63d59e5ec95640321d9f1fff1016a34d1bc862c9df'
-            '60034cce435d3eca60906e4af2f1ad55edd12b4e95ccc9905e793bc7b9d66917'
-            '295c307f6b075b0c20b7d714b6ecff1bc25927b80dd60d725052b4bc05d1b055'
-            '37c2d0bce780a15e7bdb477324936b1ae0ebe576c64d3a713a9086586518d50a'
-            '36b6a2e1d2bf478746e931da5223dcfeffc5eda513b64596ffbbd663fd5e63e7'
-            'e1b45c50ca09b065f218442a1fc3ddf3c8de1357a818925497fe0e3e7c28cacd'
-            '03feabae42553a6960c2a257eb951d956fe31a9a4440a92b373e8a0d6cb301ff'
-            '1ec8a7ebaf5e400aca7a0abe8cee78d0dae6b662c30bf245b81814cfcd048dd3'
-            'bc2f049471853a6bb2e83de3c2691a4206d55c7fe018bb7910215e9968759082'
-            '8611ac15ee36b803b5095466509c57d45532ab017d61513f2be7b34d5c13da0f'
-            'f999f20131f0180439b59320ab350a284b169e5ee5e21379fa74dc07d4aeda25'
-            'd9fed680c0313c89458361ac253a5710379fa8022c7c24b05d2807ecaf4f803a'
-            'd263509d7951f12d9ccfa841cd7f205aebc7b9db28913925b65a23e627258023'
-            '092176255153bae63f779833d25e5f64a2c489a1b6f33e8e158ff59629916b36'
-            '65023b59b41797281876b5fcd8cb1542ad790b9b6f83125b6b0aa1e02d9de4fb'
-            '3d5202be8837bccab4dedc9b6f10b3722ca57ea8b663e08b55d0235381397508'
-            '4df4c2ad348c13a3b82c3a9b127464492898379a82dfd6db9d3ff9d051a08dab'
-            'cfa48754bef9f7a95f1350c0c1ec1699c9dc413013ef78d218206f5d60335823'
-            '135123e630efdbeb6d4edc9bc200754f2c881760652fe5152f0903ae238ce2c9')
+        '0033-Fix-linking-against-static-plugins-with-qmake.patch'
+        '0034-Don-t-use-the-statx-syscall.patch')
+sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
+            'd2784f40a1f8f3f7041c94b89702404a21ef2fd1d6c63bbffe14e26321265745'
+            'c695a25e6dc0ddd8b1dd07adba6eee518294ffb69b689f373dde861f935c876b'
+            '4a7a855fe8abffe0aa3da450981439a1c26f7f65fe456149f627bccd603ad5b7'
+            '46a42a20a4bed03f9f0b7abd55904be3e560dfd4e10e586d68479a5060ce06e2'
+            '70550f6cbe95c5a14ccb7e9ba5fab7cb595a0fc49b889c9ac735cca41148ab5b'
+            'fa16872915ce6d24bc217ee7c5e42c3c61e29034f832e32f2971da85eb4f3d08'
+            '19b01e55dd3eb311c182d2ef682f15a2739556d5585d9e19de633e92dba9a788'
+            'e13936a6f7d17a6c38c95e9cc9e19209a3d03970cf5157931f309edf45530132'
+            '978a2f5a53c0fe50780a12c09bbc81ee8efe60d1437425b08b3c5b4a4edb217c'
+            '8ffb5f68ebe09e99580d45c1279dc39ef811d0de7e4d363173af3be2cf3c9ee8'
+            '305f18d1b011033fbb12ca544d3af47cb45a1b6d324bf68b671cb007dc2a8a0a'
+            '53fb05efee9c024643cd607c623eda745a122cddc2880d6554b3168778942316'
+            '927188133dc2708345f7c831e1253b59338a9554b544c1d2cfdf02493b92573f'
+            '125f0b758bf2088589a31ced00146dc2cce28fa93bdd84684857ae60850c96b8'
+            '016c3a2980060365dd7e83a001f274b6a7f736af2519fa7c5263b0def10e2703'
+            '48930971f0ce225795bd0b6292c4e3ad27843ec0c95113b95be44274435b6623'
+            'a6f8e6111b6960b86b347c3927251f41c8fa235aabf90e89965063326c7cedd3'
+            'a57e452177fd1aa7f0d22b1a83f29dd18010dfef7b007157a7dc8d6399232471'
+            '07b1ab8b25a02e1ed369017178847081afe937817e71384dfb17ab56ff278a0e'
+            '2b426ab2aa774110c2b628c4987748520925e7ebfda2f524407cdc606315696b'
+            'a78df9e2a5f3da89f944328a217ae5dd75fabd37f5b5c9ebc8eb75678f31910a'
+            '8470c121a04702b1a0ef4f52d310e69906bab0c066fcb6c7601bcb678655b959'
+            'ac09e38e4f555e5bae1bc0f01b70a67624b15ecf5affc06d85eaccbc85f3c1da'
+            '0c1939eff41143bc78a6bf6e8b51515f4ba68337b9723674e6e7ab696167edae'
+            'ed64b7a36a01d30bc9d35fed47186f9161e5ceba7dd92da7c60d288026fa8856'
+            '3f42240d83d09c62b8a7d9a98fe2d6a9d9fcf8ba6b5ff3d303a941411ef7d1a4'
+            'd44bdc6363d1e5e1cbcdb5b61e0a788a38368ab3090746c165981bd0a5eb0854'
+            '15c0691f6fd058bf70be79b221ab4ace66cc574728b68d9f15bafe1877f46266'
+            '05aec6b0c2d9add0e4181246b52096d4cf2f4176f4c0e9f467d5244492844c28'
+            'ed1237884607a368190cb1ac4de2a12f00e54ecfcea901c7f1980ac37b94b57b'
+            '4a83eb1549be9477bc002a6b939e24a6f1b6fd14bfcc804235771d484762aa3e'
+            'a100076b67008b64f73fd4fd4b131e1774b84b24b61198cabecdb5916d634887'
+            'fe9ecf6e82b64b3a955f688d51c87ca82a4aa4ad59e419c7c284ce18b72e223c'
+            'cbc0e2570ca5b52681d99ab15e7a7a79a286e498203d34c2d67493a78dd6b84d')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -232,8 +234,6 @@ build() {
   unset PKG_CONFIG_PATH
 
   for _arch in ${_architectures}; do
-    echo "INCLUDEPATH += /usr/${_arch}/include/openssl-1.0" >> src/network/network.pro
-
     # To prevent conflicts with the mingw-w64-qt4 package we have
     # to put tools in a dedicated folder
 
@@ -314,22 +314,26 @@ build() {
     # Fix MariaDB
     qt_configure_args+=" -I/usr/${_arch}/include/mariadb"
 
+    msg2 'Configure and build qmake'
     mkdir -p ../build-${_arch} && pushd ../build-${_arch}
     if isStatic; then
-      export OPENSSL_LIBS="/usr/${_arch}/lib/openssl-1.0/libssl.a /usr/${_arch}/lib/openssl-1.0/libcrypto.a -lws2_32 -lgdi32 -lcrypt32"
+      export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32"
       ../${_pkgfqn}/configure \
         $qt_configure_args \
         -static \
         -openssl-linked
+      msg2 'Build static Qt libraries'
       make
     else
       # The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared
       # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
       # libraries aren't installed at this point yet, we have to workaround this
-      ../${_pkgfqn}/configure $qt_configure_args \
+      ../${_pkgfqn}/configure \
+        $qt_configure_args \
         -shared \
         -openssl-runtime \
         -device-option 'CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build'
+      msg2 'Build shared Qt libraries'
       LD_LIBRARY_PATH="$PWD/lib" LDFLAGS="-L$PWD/lib" make
     fi
     popd
@@ -351,6 +355,7 @@ package() {
         "${pkgdir}/usr/${_arch}/lib/"{lib,}qt5main* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5AccessibilitySupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5DeviceDiscoverySupport* \
+        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EdidSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EventDispatcherSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FbSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FontDatabaseSupport* \
diff --git a/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
index 9fa075d1..15ca6ec5 100644
--- a/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
+++ b/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
@@ -1,7 +1,7 @@
-From 76b918b0c930c9c4c704f4ce947822e30c1bf1ec Mon Sep 17 00:00:00 2001
+From af6803389ebba50abfe7ad299bbf99c9c8d1a8aa Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/33] Add profile for cross compilation with mingw-w64
+Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64
 
 ---
  mkspecs/mingw-w64-g++/qmake.conf      | 126 +++++++++++++++++++++++++++
@@ -12,7 +12,7 @@ Subject: [PATCH 01/33] 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..c929483fcd
+index 0000000000..0979611a53
 --- /dev/null
 +++ b/mkspecs/mingw-w64-g++/qmake.conf
 @@ -0,0 +1,126 @@
@@ -133,7 +133,7 @@ index 0000000000..c929483fcd
 +                              $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
 +                              $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
 +QMAKE_LIBS_NETWORK          = -lws2_32 -lcrypt32 -ldnsapi
-+QMAKE_LIBS_NETWORK_STATIC   = $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libssl.a $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libcrypto.a -lgdi32
++QMAKE_LIBS_NETWORK_STATIC   = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -ldnsapi
 +QMAKE_LIBS_DBUS             = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1)
 +QMAKE_LIBS_OPENGL           = -lglu32 -lopengl32 -lgdi32 -luser32
 +QMAKE_LIBS_OPENGL_ES2       = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
@@ -304,5 +304,5 @@ index 0000000000..c5a70b1445
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
index e644e2aa..91acfc8f 100644
--- a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,7 +1,7 @@
-From 31fa3e1192849fb5460b346a3fc1f91fe1431f8e Mon Sep 17 00:00:00 2001
+From b8e324aa1716e50bdb66772bab2442e5b7c7afe8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---
@@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch
index f753a01a..94419690 100644
--- a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch
@@ -1,7 +1,7 @@
-From 00b0e801caf246047f3ea18bead0ffc7c7631dad Mon Sep 17 00:00:00 2001
+From 036909a4c082a17bee90c451842ebaee896e1893 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/33] Use external ANGLE library
+Subject: [PATCH 03/34] Use external ANGLE library
 
 ---
  src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
@@ -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 f7d077e656..b7fc6fadaf 100644
+index f8cec00b82..d09c9fd49c 100644
 --- a/src/gui/gui.pro
 +++ b/src/gui/gui.pro
 @@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@@ -66,7 +66,7 @@ index 016db46405..02f1204f0f 100644
  HEADERS += qgl.h \
             qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index 6d01d05fcc..181ac2cb3b 100644
+index b7790a66e3..046fe34a06 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
 @@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
@@ -78,10 +78,10 @@ index 6d01d05fcc..181ac2cb3b 100644
  mingw: LIBS *= -luuid
  # For the dialog helpers:
 diff --git a/src/src.pro b/src/src.pro
-index 43fc06f2e5..4188d4ea6b 100644
+index a2064b1362..b9ba606b03 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -175,10 +175,6 @@ qtConfig(gui) {
+@@ -180,10 +180,6 @@ qtConfig(gui) {
          SUBDIRS += src_3rdparty_harfbuzzng
          src_gui.depends += src_3rdparty_harfbuzzng
      }
@@ -93,5 +93,5 @@ index 43fc06f2e5..4188d4ea6b 100644
          SUBDIRS += src_3rdparty_libpng
          src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
index b3ae560d..7619c55f 100644
--- a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -1,7 +1,7 @@
-From 6f9daffcc9b83acbcae94ced0708f6f96f2e99c4 Mon Sep 17 00:00:00 2001
+From d67f33383fde286f9c8e77bbd686a5c335473645 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.
@@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch
index e99439db..c685ba02 100644
--- a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,7 +1,7 @@
-From 198b5f7e944f21a7f9caaeb686afddfc9e87c768 Mon Sep 17 00:00:00 2001
+From 1c595c81473d93a87b339df137820624cafdc373 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
+Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -10,7 +10,7 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
  3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a1f3352aa3..0be4b1ef01 100644
+index 82573347b6..b9871ff49c 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
@@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
index 43268114..d5221ecb 100644
--- a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,7 +1,7 @@
-From 5731914d9e5d8a026901e5bbab3f3ee1b3ea50f3 Mon Sep 17 00:00:00 2001
+From 50b56803c962a656211021e50cd3e7df57722726 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references
@@ -11,10 +11,10 @@ like .obj/debug/Qt5Cored_resource_res.o
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
-index bad53dc5b7..c730d641b2 100644
+index 792ffb1997..faf8b5a275 100644
 --- a/qmake/generators/win32/mingw_make.cpp
 +++ b/qmake/generators/win32/mingw_make.cpp
-@@ -202,7 +202,7 @@ void MingwMakefileGenerator::init()
+@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init()
  
      processVars();
  
@@ -24,5 +24,5 @@ index bad53dc5b7..c730d641b2 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch
index f09d6fae..a3e93271 100644
--- a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,7 +1,7 @@
-From 285b5fee5b5ada6cd82ddaf33eb9c1a05b564bc6 Mon Sep 17 00:00:00 2001
+From b02e8af19e3d94f9c39bbcaf94e91ab6dc6ca3f8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
 
 qmake generates the pkgconfig .pc files two times, once for the
 release build and once for the debug build (which we're not actually
@@ -15,7 +15,7 @@ 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 0be4b1ef01..c7e075b5bc 100644
+index b9871ff49c..0d07d6c333 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
@@ -29,5 +29,5 @@ index 0be4b1ef01..c7e075b5bc 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch
index d1b4f7ac..a5eef160 100644
--- a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch
@@ -1,7 +1,7 @@
-From 1ee8c85cd86ca49c2d43d81af0c57eb49b877372 Mon Sep 17 00:00:00 2001
+From e48d371cf5b0b98f91fca0fe38a5dd0479fcdfca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 08/33] Fix linking against shared/static libpng
+Subject: [PATCH 08/34] Fix linking against shared/static libpng
 
 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
@@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 28c8034c75..7e9148500b 100644
+index 0a591e110c..4ca919c6da 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -294,7 +294,8 @@
+@@ -296,7 +296,8 @@
              "sources": [
                  { "type": "pkgConfig", "args": "libpng" },
                  { "libs": "-llibpng", "condition": "config.msvc" },
@@ -23,5 +23,5 @@ index 28c8034c75..7e9148500b 100644
              "use": [
                  { "lib": "zlib", "condition": "features.system-zlib" }
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch
index d07abaee..4b897989 100644
--- a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch
@@ -1,7 +1,7 @@
-From 3e04b4a701a7dde06f5ea046198ac5646b644e86 Mon Sep 17 00:00:00 2001
+From 6785fbf99c08ef26967bcd064941b7bd692afb41 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 09/33] Fix linking against static D-Bus
+Subject: [PATCH 09/34] Fix linking against static D-Bus
 
 ---
  configure.json             | 9 +++++++--
@@ -9,7 +9,7 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/configure.json b/configure.json
-index a91456aaf3..55c56369ba 100644
+index 26e1572f32..108619634c 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -171,18 +171,23 @@
@@ -54,5 +54,5 @@ index cfc0e12046..65f1397cd6 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
index 02a01b11..ebdc33ce 100644
--- a/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,7 +1,7 @@
-From 28750e29ab3549300823ff8af3c2064479e71c95 Mon Sep 17 00:00:00 2001
+From 94ba6e5a623a81ee02f6b7a46b7e82f4ea505f4f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
-Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
+Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
 
 Required for a debug build of Qt because mingw-w64-dbus
 does not contain debug version
@@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 55c56369ba..9914bf0487 100644
+index 108619634c..d668ce0c98 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -184,7 +184,7 @@
@@ -25,5 +25,5 @@ index 55c56369ba..9914bf0487 100644
                      },
                      "condition": "config.win32 && features.shared"
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch
index aa7a66d4..a45279cf 100644
--- a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch
@@ -1,17 +1,17 @@
-From e7e7c7500e07d5d1eaa69550ac6c760e55e857a4 Mon Sep 17 00:00:00 2001
+From 6e4e751d6f39c6869cacb6d4148f5358f58bb54e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 11/33] Fix linking against static freetype2
+Subject: [PATCH 11/34] Fix linking against static freetype2
 
 ---
  src/gui/configure.json | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 7e9148500b..27f8257c18 100644
+index 4ca919c6da..5d524b1d73 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -156,8 +156,11 @@
+@@ -158,8 +158,11 @@
                  ]
              },
              "sources": [
@@ -26,5 +26,5 @@ index 7e9148500b..27f8257c18 100644
          },
          "fontconfig": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch
index 91364f8c..71e2a90b 100644
--- a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch
@@ -1,17 +1,17 @@
-From 38b3a06ebd65bab1765c95537eb8503286e31754 Mon Sep 17 00:00:00 2001
+From e05dcf0fb89c0ab64aba0f3a53986daa6a0bed76 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 12/33] Fix linking against static harfbuzz
+Subject: [PATCH 12/34] Fix linking against static harfbuzz
 
 ---
  src/gui/configure.json | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 27f8257c18..1a87110831 100644
+index 5d524b1d73..78f1b90d37 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -221,7 +221,11 @@
+@@ -223,7 +223,11 @@
                  ]
              },
              "sources": [
@@ -25,5 +25,5 @@ index 27f8257c18..1a87110831 100644
          },
          "imf": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch
index 0bdd68d8..6e3e18c9 100644
--- a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch
@@ -1,7 +1,7 @@
-From f5a1650b08d90f854b1b8eb12c0e6b9a5c3f5cc4 Mon Sep 17 00:00:00 2001
+From 9e7f8734086cc4a2dd7f6e713076af64648802f7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 13/33] Fix linking against static pcre
+Subject: [PATCH 13/34] Fix linking against static pcre
 
 Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
@@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
  1 file changed, 4 insertions(+)
 
 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 88b696f53a..afe444027e 100644
+index 86bc99716d..5037ae68a1 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
 @@ -55,6 +55,10 @@
@@ -24,5 +24,5 @@ index 88b696f53a..afe444027e 100644
  #include <pcre2.h>
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch
index 402f1dd8..6185fe92 100644
--- a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,7 +1,7 @@
-From a1d177d63fb62d1bb77225fd90c5eb2883322a26 Mon Sep 17 00:00:00 2001
+From 8d8e5c1df2e366ba3c595970813caf98768a140f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
+Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
 
 Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
@@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
                  { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                  { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch
index ec7e9178..abe072c4 100644
--- a/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,7 +1,7 @@
-From 603ca5161d67e72432128a21478bd623d8b973c2 Mon Sep 17 00:00:00 2001
+From fd736054ec03ad328b1e8c4195184f286655040e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
 
 ---
  src/plugins/sqldrivers/configure.json | 5 +++--
@@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
              ]
          },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch
index a2a5d387..26b8cf2f 100644
--- a/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch
@@ -1,7 +1,7 @@
-From eed57ae8b6b9a2a8a6183751f08f16c9921bf32b Mon Sep 17 00:00:00 2001
+From 15f3d49456695caeb91f1e861730883aea04ca5f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 16/33] Rename qtmain to qt5main
+Subject: [PATCH 16/34] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
  
  CONFIG += static
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch
index 2f2262c1..184aff91 100644
--- a/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch
@@ -1,7 +1,7 @@
-From b5a1c1909c58b62705f1ff46adfac40ed26b0f5d Mon Sep 17 00:00:00 2001
+From 366c764b927e568c75968ae92ec16caca54c0d31 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
-Subject: [PATCH 17/33] Build dynamic host libraries
+Subject: [PATCH 17/34] Build dynamic host libraries
 
 This came initially from Fedora, not sure whether
 it makes sense to keep it. Regular Arch package
@@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 36f632e8ca..2deec56866 100644
+index c0a8dcc251..200fa40840 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -24,7 +24,7 @@ requires(!$$skip)
@@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch
index 4740f5c0..c8636ff4 100644
--- a/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch
@@ -1,7 +1,7 @@
-From 7b40a97b618dda07f6e9fdaf28db958c0f5b33fc Mon Sep 17 00:00:00 2001
+From b6dfc4016e7f61c1eb178b051387b08219652484 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 18/33] Enable rpath for build tools
+Subject: [PATCH 18/34] Enable rpath for build tools
 
 - Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib
@@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
  INSTALLS += target
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch
index 834f8ccc..e76fce8a 100644
--- a/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch
@@ -1,17 +1,17 @@
-From 25849eed06ade33131bb0dfa2bdb3e890b2e9ee7 Mon Sep 17 00:00:00 2001
+From 012d6961a9ffbaeabf1742243b23ee092b915af2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 19/33] Use system zlib for build tools
+Subject: [PATCH 19/34] Use system zlib for build tools
 
 ---
  src/tools/bootstrap/bootstrap.pro | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index 521dd5f0f2..eb8cb4770c 100644
+index 042ad7adb9..7e3bc3977a 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -129,7 +129,7 @@ macx {
+@@ -132,7 +132,7 @@ macx {
          ../../corelib/io/qstandardpaths_win.cpp
  }
  
@@ -21,5 +21,5 @@ index 521dd5f0f2..eb8cb4770c 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64-dynamic/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
index ff40a808..cf2e1d82 100644
--- a/qt5-base/mingw-w64-dynamic/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+++ b/qt5-base/mingw-w64-dynamic/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
@@ -1,7 +1,7 @@
-From 98a2adad712fb0c23ad2813e1a35a793317461ad Mon Sep 17 00:00:00 2001
+From 81a6a9a34e71a08fd5a8b87f44c71803d7f07797 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:20:25 +0200
-Subject: [PATCH 20/33] Disable determing default include and lib dirs at qmake
+Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake
  time when building with mingw-w64
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 20/33] 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 35175f1744..96afeeca57 100644
+index ba41598be1..6416db4d58 100644
 --- a/mkspecs/features/toolchain.prf
 +++ b/mkspecs/features/toolchain.prf
 @@ -31,7 +31,7 @@ isEmpty($${target_prefix}.INCDIRS) {
@@ -18,9 +18,9 @@ index 35175f1744..96afeeca57 100644
      #
 -    gcc {
 +    !win32:gcc {
-         !equals(QMAKE_HOST.os, Windows) {
-             cmd_prefix = "LC_ALL=C"
-             cmd_suffix = "</dev/null >/dev/null"
+         cmd_suffix = "<$$QMAKE_SYSTEM_NULL_DEVICE >$$QMAKE_SYSTEM_NULL_DEVICE"
+         equals(QMAKE_HOST.os, Windows): \
+             cmd_prefix = "set LC_ALL=C&"
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0021-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-dynamic/0021-Use-.dll.a-as-import-lib-extension.patch
index b3f9e5dc..4f2ee4c6 100644
--- a/qt5-base/mingw-w64-dynamic/0021-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-dynamic/0021-Use-.dll.a-as-import-lib-extension.patch
@@ -1,7 +1,7 @@
-From 5cb315e62e7c4114d62767c274952c58ebe88b06 Mon Sep 17 00:00:00 2001
+From 834b94ccb1897cd5325557fa6051ef2cb4bb70a0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 21/33] Use *.dll.a as import lib extension
+Subject: [PATCH 21/34] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 mingw-w64 specific mkspec
@@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0022-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-dynamic/0022-Merge-shared-and-static-library-trees.patch
index c2c02d58..44d0bcb3 100644
--- a/qt5-base/mingw-w64-dynamic/0022-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-dynamic/0022-Merge-shared-and-static-library-trees.patch
@@ -1,7 +1,7 @@
-From 0401a8dd7051a1d6aca6288fd5a5d0bef006168e Mon Sep 17 00:00:00 2001
+From 4502d0a9e9102067541a4307e80444a4fb44717c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 22/33] Merge shared and static library trees
+Subject: [PATCH 22/34] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
 ---
@@ -99,7 +99,7 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index c7e075b5bc..d61f7b05e5 100644
+index 0d07d6c333..5e84628e72 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
@@ -126,5 +126,5 @@ index c7e075b5bc..d61f7b05e5 100644
  
      t << endl;
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-dynamic/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index 2fd999f6..bf2ec7ba 100644
--- a/qt5-base/mingw-w64-dynamic/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-dynamic/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,7 +1,7 @@
-From 6e0b658e5cadf0248954fbbf1b8271d54b9778a2 Mon Sep 17 00:00:00 2001
+From f73b460094294c7cd9f9d9cd481fbf1cef5a2a49 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 23/33] Pull dependencies of static libraries in CMake modules
+Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules
 
 When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
@@ -251,7 +251,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index d61f7b05e5..2dd26bf4dd 100644
+index 5e84628e72..c853d52b27 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@@ -269,5 +269,5 @@ index d61f7b05e5..2dd26bf4dd 100644
  }
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0024-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-dynamic/0024-Allow-usage-of-static-version-with-CMake.patch
index 0e9f9771..c4e60933 100644
--- a/qt5-base/mingw-w64-dynamic/0024-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-dynamic/0024-Allow-usage-of-static-version-with-CMake.patch
@@ -1,7 +1,7 @@
-From eec4b8a76d8c5882a5fbd4e6aa85dea696049c23 Mon Sep 17 00:00:00 2001
+From 903ed5730e5a25ea6fda815fcd88cc36e3d8639e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
-Subject: [PATCH 24/33] Allow usage of static version with CMake
+Subject: [PATCH 24/34] Allow usage of static version with CMake
 
 Allow selecting between dynamic and static Qt versions
 installed in the same prefix
@@ -997,5 +997,5 @@ index 2a575958ae..ca0e3be3b5 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-dynamic/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index b9f81f22..02432029 100644
--- a/qt5-base/mingw-w64-dynamic/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-dynamic/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,7 +1,7 @@
-From 0aac929861fb8d60fbc66f2557e1b9c5022ff9c5 Mon Sep 17 00:00:00 2001
+From b3bcf57cfbd152eafa82b9d80183fde0f2bf1f5c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
-Subject: [PATCH 25/33] Adjust linker flags for static build with
+Subject: [PATCH 25/34] Adjust linker flags for static build with
  cmake/mingw-w64
 
 Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
@@ -25,5 +25,5 @@ index ebe6644dfe..687d611b3f 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0026-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-dynamic/0026-Use-correct-pkg-config-static-flag.patch
index 15c749e6..36498bf7 100644
--- a/qt5-base/mingw-w64-dynamic/0026-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-dynamic/0026-Use-correct-pkg-config-static-flag.patch
@@ -1,7 +1,7 @@
-From f2ff6d5023bd834b0110a97a16e085c3914335a7 Mon Sep 17 00:00:00 2001
+From 1e31f372966581f19bcbd9a39b29cf3dedfe9c5a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 26/33] Use correct pkg-config --static flag
+Subject: [PATCH 26/34] Use correct pkg-config --static flag
 
 ---
  configure.pri | 3 +++
@@ -22,5 +22,5 @@ index a05c3d98e6..8dc874a74d 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0027-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-dynamic/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
index a8508251..3b75e887 100644
--- a/qt5-base/mingw-w64-dynamic/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-dynamic/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,7 +1,7 @@
-From 4f332ea7f376d8a77d7dbfe82ab6e5eb6b6f1fe9 Mon Sep 17 00:00:00 2001
+From 0f6a4852f4bf5d43aa856f2af475f5f526b76daf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 27/33] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic
 
 * Otherwise the arguments aren't passed correctly leading to errors like
   ```
@@ -70,5 +70,5 @@ index f5e7b7f050..18d120f0c7 100644
            MAIN_DEPENDENCY ${infile} VERBATIM)
          list(APPEND ${outfiles} ${outfile})
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0028-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-dynamic/0028-Ignore-errors-about-missing-feature-static.patch
index 104d9c20..803dfe38 100644
--- a/qt5-base/mingw-w64-dynamic/0028-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-dynamic/0028-Ignore-errors-about-missing-feature-static.patch
@@ -1,7 +1,7 @@
-From a8039e2f388a3fbd289dc912ae6b6a58beb84f19 Mon Sep 17 00:00:00 2001
+From 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 28/33] Ignore errors about missing feature static
+Subject: [PATCH 28/34] 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 150d2b2cc3..d93d24cce5 100644
+index 76e1d15319..9a1c5cd8b6 100644
 --- a/mkspecs/features/qt_build_config.prf
 +++ b/mkspecs/features/qt_build_config.prf
-@@ -135,5 +135,5 @@ defineTest(qtConfig) {
+@@ -138,5 +138,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -21,10 +21,10 @@ index 150d2b2cc3..d93d24cce5 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 c00fdb73f8..d4d5599433 100644
+index 1903e509c8..1fcb597fa3 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -351,5 +351,5 @@ defineTest(qtConfig) {
+@@ -348,5 +348,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -32,5 +32,5 @@ index c00fdb73f8..d4d5599433 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0029-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-dynamic/0029-Enable-and-fix-use-of-iconv.patch
index ddffbea3..128a1cf3 100644
--- a/qt5-base/mingw-w64-dynamic/0029-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-dynamic/0029-Enable-and-fix-use-of-iconv.patch
@@ -1,7 +1,7 @@
-From 05738e526362a5c712d8341ada02e557e76579f5 Mon Sep 17 00:00:00 2001
+From 3a5569599bd8c5267e41c57917b19e16bba1169c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 29/33] Enable and fix use of iconv
+Subject: [PATCH 29/34] Enable and fix use of iconv
 
 Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
 ---
@@ -63,10 +63,10 @@ index d6362b6fbc..4da4546a24 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index a5b69a2df6..9e3eb4f671 100644
+index bf44f2649d..90f0450902 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
-@@ -428,9 +428,9 @@
+@@ -521,9 +521,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",
@@ -79,5 +79,5 @@ index a5b69a2df6..9e3eb4f671 100644
          },
          "icu": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0030-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-dynamic/0030-Ignore-failing-pkg-config-test.patch
index cc89a8e3..4c8cc8f8 100644
--- a/qt5-base/mingw-w64-dynamic/0030-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-dynamic/0030-Ignore-failing-pkg-config-test.patch
@@ -1,7 +1,7 @@
-From f99af5483b8c3d8b511db8476f4d738ff868886c Mon Sep 17 00:00:00 2001
+From e9f964d079c6dea6404f01d0d8f1acfa5287ccdc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 30/33] Ignore failing pkg-config test
+Subject: [PATCH 30/34] Ignore failing pkg-config test
 
 Didn't investigate why it fails, let's hope for the best
 ---
@@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
  1 file changed, 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 9914bf0487..d5b81d53f5 100644
+index d668ce0c98..2d36a60cd3 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -710,7 +710,6 @@
+@@ -725,7 +725,6 @@
          "pkg-config": {
              "label": "Using pkg-config",
              "autoDetect": "!config.darwin && !config.win32",
@@ -21,5 +21,5 @@ index 9914bf0487..d5b81d53f5 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-dynamic/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 5fc9df50..e4349439 100644
--- a/qt5-base/mingw-w64-dynamic/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-dynamic/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,7 +1,7 @@
-From eadf27b8bd882899a99254578ecb8407a0acab6f Mon Sep 17 00:00:00 2001
+From d35384a8d6191d68f8cd2b60a2295f5372d67fa4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 31/33] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies
 
 In particular, it messes resolving cyclic dependency between
 static freetype2 and harfbuzz
@@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644
    static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
    for (int i = 0; lflags[i]; i++) {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0032-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-dynamic/0032-Hardcode-linker-flags-for-platform-plugins.patch
index 5562bbf3..3d82dfff 100644
--- a/qt5-base/mingw-w64-dynamic/0032-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-dynamic/0032-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,18 +1,16 @@
-From f7bb119102d28e22b764cce82ee491e747034247 Mon Sep 17 00:00:00 2001
+From aa947be7429528caf04ad7db6f077fe695bcfe82 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 32/33] Hardcode linker flags for platform plugins
+Subject: [PATCH 32/34] 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(-)
+ src/plugins/platforms/minimal/minimal.pro     | 15 +++++++++++--
+ src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++--
+ src/plugins/platforms/windows/windows.pro     | 32 +++++++++++++++++++--------
+ 3 files changed, 48 insertions(+), 13 deletions(-)
 
 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
 index 8cfb68824e..46834a71fc 100644
@@ -66,36 +64,47 @@ index 6652cefd86..a322b17cc5 100644
  DEFINES += QT_NO_FOREACH
  
 diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
-index 23168c10dc..eb4af726ca 100644
+index 174bc7b609..e66488e364 100644
 --- a/src/plugins/platforms/windows/windows.pro
 +++ b/src/plugins/platforms/windows/windows.pro
-@@ -1,11 +1,22 @@
+@@ -1,14 +1,28 @@
  TARGET = qwindows
  
- QT += \
+-QT += \
 -    core-private gui-private \
--    eventdispatcher_support-private accessibility_support-private \
+-    eventdispatcher_support-private \
 -    fontdatabase_support-private theme_support-private
-+    core-private gui-private
- 
+-
+-qtConfig(accessibility): QT += accessibility_support-private
+-qtConfig(vulkan): QT += vulkan_support-private
+-
 -LIBS += -lgdi32 -ldwmapi
++QT += core-private gui-private
++
 +# 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/$${QT_VERSION} \
-+    $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION} \
 +    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \
 +    $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION}
++# Same for private support libs for accessibility and vulkan, if those are enabled
++qtConfig(accessibility) {
++    LIBS += -lQt5AccessibilitySupport
++    INCLUDEPATH += $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}
++}
++qtConfig(vulkan) {
++    LIBS += -lQt5VulkanSupport
++    INCLUDEPATH += $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}
++}
  
  include(windows.pri)
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0033-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-dynamic/0033-Fix-linking-against-static-plugins-with-qmake.patch
index 676a558c..d849f3d8 100644
--- a/qt5-base/mingw-w64-dynamic/0033-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-dynamic/0033-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,7 +1,7 @@
-From b91d3a0690995511d1388b9d9493aed702bd0138 Mon Sep 17 00:00:00 2001
+From 7db753e04de6a458fc10124b7e3b12ac5f4d1623 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
-Subject: [PATCH 33/33] Fix linking against static plugins with qmake
+Subject: [PATCH 33/34] Fix linking against static plugins with qmake
 
 Required because qtConfig(static) does not work
 with 'Merge shared and static library trees'
@@ -33,5 +33,5 @@ index afaac3dbc4..82b02b5113 100644
          # Check if the plugin is known to Qt. We can use this to determine
          # the plugin path. Unknown plugins must rely on the default link path.
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-dynamic/0034-Don-t-use-the-statx-syscall.patch b/qt5-base/mingw-w64-dynamic/0034-Don-t-use-the-statx-syscall.patch
new file mode 100644
index 00000000..56e0ca93
--- /dev/null
+++ b/qt5-base/mingw-w64-dynamic/0034-Don-t-use-the-statx-syscall.patch
@@ -0,0 +1,27 @@
+From e8cbf42a882706cce93f46142748d252cb492e1c Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 9 Dec 2017 00:36:56 +0100
+Subject: [PATCH 34/34] Don't use the statx syscall
+
+Otherwise Qt can not be built in a systemd
+container
+---
+ src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index 77d154c6b4..6036bae4f1 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -95,7 +95,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp
+ { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
+ #  endif
+ 
+-#  if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE(<linux/stat.h>)
++#  if 0
+ #    include <linux/stat.h>
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+-- 
+2.15.1
+
diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD
index 4f7d8113..b3bb49ed 100644
--- a/qt5-base/mingw-w64-dynamic/PKGBUILD
+++ b/qt5-base/mingw-w64-dynamic/PKGBUILD
@@ -84,7 +84,7 @@ isNoOpenGL() {
 }
 
 pkgname=mingw-w64-qt5-base-dynamic
-pkgver=5.9.2
+pkgver=5.10.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
@@ -92,14 +92,14 @@ 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-1.0' 'mingw-w64-dbus' 'mingw-w64-harfbuzz'
+         'mingw-w64-libpng' 'mingw-w64-openssl' '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')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
-_pkgfqn="qtbase-opensource-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+_pkgfqn="qtbase-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Add-profile-for-cross-compilation-with-mingw-w64.patch'
         '0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch'
         '0003-Use-external-ANGLE-library.patch'
@@ -132,41 +132,43 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
         '0030-Ignore-failing-pkg-config-test.patch'
         '0031-Prevent-qmake-from-messing-static-lib-dependencies.patch'
         '0032-Hardcode-linker-flags-for-platform-plugins.patch'
-        '0033-Fix-linking-against-static-plugins-with-qmake.patch')
-sha256sums=('7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b'
-            '685fd08e1c4e97bbf6990959cb3dbe88dd3ed494221400dce6aef159d277c34a'
-            '4e5115e62b952acface29882c5f6423569cd1c439c454e58594b5fb2cb740916'
-            '0b339563844ccd325486d78711592561996fb256f0612c63b33b6ea52a6fc77e'
-            '18945eb521df54d37922894c9bc82ccd03eb3fd9f6e0aed986facf2b49f336d4'
-            '2c2b5f9b3db02750ae9a9626ea8a24a3516c881c5eaa9b19fb9a2621fc1263fc'
-            '81559290cc03f7ff6042f28a6eb319882264876076a20e24531641ebe4ef3aee'
-            'a3d657ee7f8bfa6c3e5a4aa626710bc27fc82fea3d834098bde2b2f67244d11c'
-            '3df9bf81a936c737cc7ca53bdea9cfd2a4010fa190fe3e1a45611097d8213ef4'
-            '5aac41daaf223726d31ab5a7aec0bdc050aa182522ca732cc31c3b5ac8cd28dc'
-            '6844b7106e636d513b077edeba318990641b1ee294f2a70739830e3d0a9b0d02'
-            '12b51c32069270e49e05e64b0f54d6e3e871523660fd17673e0ee6e67206955e'
-            '4baa73f8b3d61b503a9de1437bdc9f7f84cd2443280afc1461456ae34d222e9b'
-            'e34eec672f9f681302edd809cbcb7d6848a310a02acc5711e2e348aab1b8d74c'
-            'd70f44c06a7bae6fbd91022ec79f09e2d658969aa5a6602bff6eb61076801b6e'
-            'f705fcfe1f552536318c2c63d59e5ec95640321d9f1fff1016a34d1bc862c9df'
-            '60034cce435d3eca60906e4af2f1ad55edd12b4e95ccc9905e793bc7b9d66917'
-            '295c307f6b075b0c20b7d714b6ecff1bc25927b80dd60d725052b4bc05d1b055'
-            '37c2d0bce780a15e7bdb477324936b1ae0ebe576c64d3a713a9086586518d50a'
-            '36b6a2e1d2bf478746e931da5223dcfeffc5eda513b64596ffbbd663fd5e63e7'
-            'e1b45c50ca09b065f218442a1fc3ddf3c8de1357a818925497fe0e3e7c28cacd'
-            '03feabae42553a6960c2a257eb951d956fe31a9a4440a92b373e8a0d6cb301ff'
-            '1ec8a7ebaf5e400aca7a0abe8cee78d0dae6b662c30bf245b81814cfcd048dd3'
-            'bc2f049471853a6bb2e83de3c2691a4206d55c7fe018bb7910215e9968759082'
-            '8611ac15ee36b803b5095466509c57d45532ab017d61513f2be7b34d5c13da0f'
-            'f999f20131f0180439b59320ab350a284b169e5ee5e21379fa74dc07d4aeda25'
-            'd9fed680c0313c89458361ac253a5710379fa8022c7c24b05d2807ecaf4f803a'
-            'd263509d7951f12d9ccfa841cd7f205aebc7b9db28913925b65a23e627258023'
-            '092176255153bae63f779833d25e5f64a2c489a1b6f33e8e158ff59629916b36'
-            '65023b59b41797281876b5fcd8cb1542ad790b9b6f83125b6b0aa1e02d9de4fb'
-            '3d5202be8837bccab4dedc9b6f10b3722ca57ea8b663e08b55d0235381397508'
-            '4df4c2ad348c13a3b82c3a9b127464492898379a82dfd6db9d3ff9d051a08dab'
-            'cfa48754bef9f7a95f1350c0c1ec1699c9dc413013ef78d218206f5d60335823'
-            '135123e630efdbeb6d4edc9bc200754f2c881760652fe5152f0903ae238ce2c9')
+        '0033-Fix-linking-against-static-plugins-with-qmake.patch'
+        '0034-Don-t-use-the-statx-syscall.patch')
+sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
+            'd2784f40a1f8f3f7041c94b89702404a21ef2fd1d6c63bbffe14e26321265745'
+            'c695a25e6dc0ddd8b1dd07adba6eee518294ffb69b689f373dde861f935c876b'
+            '4a7a855fe8abffe0aa3da450981439a1c26f7f65fe456149f627bccd603ad5b7'
+            '46a42a20a4bed03f9f0b7abd55904be3e560dfd4e10e586d68479a5060ce06e2'
+            '70550f6cbe95c5a14ccb7e9ba5fab7cb595a0fc49b889c9ac735cca41148ab5b'
+            'fa16872915ce6d24bc217ee7c5e42c3c61e29034f832e32f2971da85eb4f3d08'
+            '19b01e55dd3eb311c182d2ef682f15a2739556d5585d9e19de633e92dba9a788'
+            'e13936a6f7d17a6c38c95e9cc9e19209a3d03970cf5157931f309edf45530132'
+            '978a2f5a53c0fe50780a12c09bbc81ee8efe60d1437425b08b3c5b4a4edb217c'
+            '8ffb5f68ebe09e99580d45c1279dc39ef811d0de7e4d363173af3be2cf3c9ee8'
+            '305f18d1b011033fbb12ca544d3af47cb45a1b6d324bf68b671cb007dc2a8a0a'
+            '53fb05efee9c024643cd607c623eda745a122cddc2880d6554b3168778942316'
+            '927188133dc2708345f7c831e1253b59338a9554b544c1d2cfdf02493b92573f'
+            '125f0b758bf2088589a31ced00146dc2cce28fa93bdd84684857ae60850c96b8'
+            '016c3a2980060365dd7e83a001f274b6a7f736af2519fa7c5263b0def10e2703'
+            '48930971f0ce225795bd0b6292c4e3ad27843ec0c95113b95be44274435b6623'
+            'a6f8e6111b6960b86b347c3927251f41c8fa235aabf90e89965063326c7cedd3'
+            'a57e452177fd1aa7f0d22b1a83f29dd18010dfef7b007157a7dc8d6399232471'
+            '07b1ab8b25a02e1ed369017178847081afe937817e71384dfb17ab56ff278a0e'
+            '2b426ab2aa774110c2b628c4987748520925e7ebfda2f524407cdc606315696b'
+            'a78df9e2a5f3da89f944328a217ae5dd75fabd37f5b5c9ebc8eb75678f31910a'
+            '8470c121a04702b1a0ef4f52d310e69906bab0c066fcb6c7601bcb678655b959'
+            'ac09e38e4f555e5bae1bc0f01b70a67624b15ecf5affc06d85eaccbc85f3c1da'
+            '0c1939eff41143bc78a6bf6e8b51515f4ba68337b9723674e6e7ab696167edae'
+            'ed64b7a36a01d30bc9d35fed47186f9161e5ceba7dd92da7c60d288026fa8856'
+            '3f42240d83d09c62b8a7d9a98fe2d6a9d9fcf8ba6b5ff3d303a941411ef7d1a4'
+            'd44bdc6363d1e5e1cbcdb5b61e0a788a38368ab3090746c165981bd0a5eb0854'
+            '15c0691f6fd058bf70be79b221ab4ace66cc574728b68d9f15bafe1877f46266'
+            '05aec6b0c2d9add0e4181246b52096d4cf2f4176f4c0e9f467d5244492844c28'
+            'ed1237884607a368190cb1ac4de2a12f00e54ecfcea901c7f1980ac37b94b57b'
+            '4a83eb1549be9477bc002a6b939e24a6f1b6fd14bfcc804235771d484762aa3e'
+            'a100076b67008b64f73fd4fd4b131e1774b84b24b61198cabecdb5916d634887'
+            'fe9ecf6e82b64b3a955f688d51c87ca82a4aa4ad59e419c7c284ce18b72e223c'
+            'cbc0e2570ca5b52681d99ab15e7a7a79a286e498203d34c2d67493a78dd6b84d')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -232,8 +234,6 @@ build() {
   unset PKG_CONFIG_PATH
 
   for _arch in ${_architectures}; do
-    echo "INCLUDEPATH += /usr/${_arch}/include/openssl-1.0" >> src/network/network.pro
-
     # To prevent conflicts with the mingw-w64-qt4 package we have
     # to put tools in a dedicated folder
 
@@ -314,22 +314,26 @@ build() {
     # Fix MariaDB
     qt_configure_args+=" -I/usr/${_arch}/include/mariadb"
 
+    msg2 'Configure and build qmake'
     mkdir -p ../build-${_arch} && pushd ../build-${_arch}
     if isStatic; then
-      export OPENSSL_LIBS="/usr/${_arch}/lib/openssl-1.0/libssl.a /usr/${_arch}/lib/openssl-1.0/libcrypto.a -lws2_32 -lgdi32 -lcrypt32"
+      export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32"
       ../${_pkgfqn}/configure \
         $qt_configure_args \
         -static \
         -openssl-linked
+      msg2 'Build static Qt libraries'
       make
     else
       # The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared
       # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
       # libraries aren't installed at this point yet, we have to workaround this
-      ../${_pkgfqn}/configure $qt_configure_args \
+      ../${_pkgfqn}/configure \
+        $qt_configure_args \
         -shared \
         -openssl-runtime \
         -device-option 'CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build'
+      msg2 'Build shared Qt libraries'
       LD_LIBRARY_PATH="$PWD/lib" LDFLAGS="-L$PWD/lib" make
     fi
     popd
@@ -351,6 +355,7 @@ package() {
         "${pkgdir}/usr/${_arch}/lib/"{lib,}qt5main* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5AccessibilitySupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5DeviceDiscoverySupport* \
+        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EdidSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EventDispatcherSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FbSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FontDatabaseSupport* \
diff --git a/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
index 9fa075d1..15ca6ec5 100644
--- a/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
+++ b/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
@@ -1,7 +1,7 @@
-From 76b918b0c930c9c4c704f4ce947822e30c1bf1ec Mon Sep 17 00:00:00 2001
+From af6803389ebba50abfe7ad299bbf99c9c8d1a8aa Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/33] Add profile for cross compilation with mingw-w64
+Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64
 
 ---
  mkspecs/mingw-w64-g++/qmake.conf      | 126 +++++++++++++++++++++++++++
@@ -12,7 +12,7 @@ Subject: [PATCH 01/33] 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..c929483fcd
+index 0000000000..0979611a53
 --- /dev/null
 +++ b/mkspecs/mingw-w64-g++/qmake.conf
 @@ -0,0 +1,126 @@
@@ -133,7 +133,7 @@ index 0000000000..c929483fcd
 +                              $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
 +                              $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
 +QMAKE_LIBS_NETWORK          = -lws2_32 -lcrypt32 -ldnsapi
-+QMAKE_LIBS_NETWORK_STATIC   = $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libssl.a $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libcrypto.a -lgdi32
++QMAKE_LIBS_NETWORK_STATIC   = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -ldnsapi
 +QMAKE_LIBS_DBUS             = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1)
 +QMAKE_LIBS_OPENGL           = -lglu32 -lopengl32 -lgdi32 -luser32
 +QMAKE_LIBS_OPENGL_ES2       = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
@@ -304,5 +304,5 @@ index 0000000000..c5a70b1445
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
index e644e2aa..91acfc8f 100644
--- a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,7 +1,7 @@
-From 31fa3e1192849fb5460b346a3fc1f91fe1431f8e Mon Sep 17 00:00:00 2001
+From b8e324aa1716e50bdb66772bab2442e5b7c7afe8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---
@@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch
index f753a01a..94419690 100644
--- a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch
@@ -1,7 +1,7 @@
-From 00b0e801caf246047f3ea18bead0ffc7c7631dad Mon Sep 17 00:00:00 2001
+From 036909a4c082a17bee90c451842ebaee896e1893 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/33] Use external ANGLE library
+Subject: [PATCH 03/34] Use external ANGLE library
 
 ---
  src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
@@ -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 f7d077e656..b7fc6fadaf 100644
+index f8cec00b82..d09c9fd49c 100644
 --- a/src/gui/gui.pro
 +++ b/src/gui/gui.pro
 @@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@@ -66,7 +66,7 @@ index 016db46405..02f1204f0f 100644
  HEADERS += qgl.h \
             qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index 6d01d05fcc..181ac2cb3b 100644
+index b7790a66e3..046fe34a06 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
 @@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
@@ -78,10 +78,10 @@ index 6d01d05fcc..181ac2cb3b 100644
  mingw: LIBS *= -luuid
  # For the dialog helpers:
 diff --git a/src/src.pro b/src/src.pro
-index 43fc06f2e5..4188d4ea6b 100644
+index a2064b1362..b9ba606b03 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -175,10 +175,6 @@ qtConfig(gui) {
+@@ -180,10 +180,6 @@ qtConfig(gui) {
          SUBDIRS += src_3rdparty_harfbuzzng
          src_gui.depends += src_3rdparty_harfbuzzng
      }
@@ -93,5 +93,5 @@ index 43fc06f2e5..4188d4ea6b 100644
          SUBDIRS += src_3rdparty_libpng
          src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
index b3ae560d..7619c55f 100644
--- a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -1,7 +1,7 @@
-From 6f9daffcc9b83acbcae94ced0708f6f96f2e99c4 Mon Sep 17 00:00:00 2001
+From d67f33383fde286f9c8e77bbd686a5c335473645 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.
@@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch
index e99439db..c685ba02 100644
--- a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,7 +1,7 @@
-From 198b5f7e944f21a7f9caaeb686afddfc9e87c768 Mon Sep 17 00:00:00 2001
+From 1c595c81473d93a87b339df137820624cafdc373 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
+Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -10,7 +10,7 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
  3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a1f3352aa3..0be4b1ef01 100644
+index 82573347b6..b9871ff49c 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
@@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
index 43268114..d5221ecb 100644
--- a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,7 +1,7 @@
-From 5731914d9e5d8a026901e5bbab3f3ee1b3ea50f3 Mon Sep 17 00:00:00 2001
+From 50b56803c962a656211021e50cd3e7df57722726 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references
@@ -11,10 +11,10 @@ like .obj/debug/Qt5Cored_resource_res.o
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
-index bad53dc5b7..c730d641b2 100644
+index 792ffb1997..faf8b5a275 100644
 --- a/qmake/generators/win32/mingw_make.cpp
 +++ b/qmake/generators/win32/mingw_make.cpp
-@@ -202,7 +202,7 @@ void MingwMakefileGenerator::init()
+@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init()
  
      processVars();
  
@@ -24,5 +24,5 @@ index bad53dc5b7..c730d641b2 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch
index f09d6fae..a3e93271 100644
--- a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,7 +1,7 @@
-From 285b5fee5b5ada6cd82ddaf33eb9c1a05b564bc6 Mon Sep 17 00:00:00 2001
+From b02e8af19e3d94f9c39bbcaf94e91ab6dc6ca3f8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
 
 qmake generates the pkgconfig .pc files two times, once for the
 release build and once for the debug build (which we're not actually
@@ -15,7 +15,7 @@ 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 0be4b1ef01..c7e075b5bc 100644
+index b9871ff49c..0d07d6c333 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
@@ -29,5 +29,5 @@ index 0be4b1ef01..c7e075b5bc 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch
index d1b4f7ac..a5eef160 100644
--- a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch
@@ -1,7 +1,7 @@
-From 1ee8c85cd86ca49c2d43d81af0c57eb49b877372 Mon Sep 17 00:00:00 2001
+From e48d371cf5b0b98f91fca0fe38a5dd0479fcdfca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 08/33] Fix linking against shared/static libpng
+Subject: [PATCH 08/34] Fix linking against shared/static libpng
 
 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
@@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 28c8034c75..7e9148500b 100644
+index 0a591e110c..4ca919c6da 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -294,7 +294,8 @@
+@@ -296,7 +296,8 @@
              "sources": [
                  { "type": "pkgConfig", "args": "libpng" },
                  { "libs": "-llibpng", "condition": "config.msvc" },
@@ -23,5 +23,5 @@ index 28c8034c75..7e9148500b 100644
              "use": [
                  { "lib": "zlib", "condition": "features.system-zlib" }
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch
index d07abaee..4b897989 100644
--- a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch
@@ -1,7 +1,7 @@
-From 3e04b4a701a7dde06f5ea046198ac5646b644e86 Mon Sep 17 00:00:00 2001
+From 6785fbf99c08ef26967bcd064941b7bd692afb41 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 09/33] Fix linking against static D-Bus
+Subject: [PATCH 09/34] Fix linking against static D-Bus
 
 ---
  configure.json             | 9 +++++++--
@@ -9,7 +9,7 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/configure.json b/configure.json
-index a91456aaf3..55c56369ba 100644
+index 26e1572f32..108619634c 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -171,18 +171,23 @@
@@ -54,5 +54,5 @@ index cfc0e12046..65f1397cd6 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
index 02a01b11..ebdc33ce 100644
--- a/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,7 +1,7 @@
-From 28750e29ab3549300823ff8af3c2064479e71c95 Mon Sep 17 00:00:00 2001
+From 94ba6e5a623a81ee02f6b7a46b7e82f4ea505f4f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
-Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
+Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
 
 Required for a debug build of Qt because mingw-w64-dbus
 does not contain debug version
@@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 55c56369ba..9914bf0487 100644
+index 108619634c..d668ce0c98 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -184,7 +184,7 @@
@@ -25,5 +25,5 @@ index 55c56369ba..9914bf0487 100644
                      },
                      "condition": "config.win32 && features.shared"
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch
index aa7a66d4..a45279cf 100644
--- a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch
@@ -1,17 +1,17 @@
-From e7e7c7500e07d5d1eaa69550ac6c760e55e857a4 Mon Sep 17 00:00:00 2001
+From 6e4e751d6f39c6869cacb6d4148f5358f58bb54e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 11/33] Fix linking against static freetype2
+Subject: [PATCH 11/34] Fix linking against static freetype2
 
 ---
  src/gui/configure.json | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 7e9148500b..27f8257c18 100644
+index 4ca919c6da..5d524b1d73 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -156,8 +156,11 @@
+@@ -158,8 +158,11 @@
                  ]
              },
              "sources": [
@@ -26,5 +26,5 @@ index 7e9148500b..27f8257c18 100644
          },
          "fontconfig": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch
index 91364f8c..71e2a90b 100644
--- a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch
@@ -1,17 +1,17 @@
-From 38b3a06ebd65bab1765c95537eb8503286e31754 Mon Sep 17 00:00:00 2001
+From e05dcf0fb89c0ab64aba0f3a53986daa6a0bed76 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 12/33] Fix linking against static harfbuzz
+Subject: [PATCH 12/34] Fix linking against static harfbuzz
 
 ---
  src/gui/configure.json | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 27f8257c18..1a87110831 100644
+index 5d524b1d73..78f1b90d37 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -221,7 +221,11 @@
+@@ -223,7 +223,11 @@
                  ]
              },
              "sources": [
@@ -25,5 +25,5 @@ index 27f8257c18..1a87110831 100644
          },
          "imf": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch
index 0bdd68d8..6e3e18c9 100644
--- a/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch
@@ -1,7 +1,7 @@
-From f5a1650b08d90f854b1b8eb12c0e6b9a5c3f5cc4 Mon Sep 17 00:00:00 2001
+From 9e7f8734086cc4a2dd7f6e713076af64648802f7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 13/33] Fix linking against static pcre
+Subject: [PATCH 13/34] Fix linking against static pcre
 
 Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
@@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
  1 file changed, 4 insertions(+)
 
 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 88b696f53a..afe444027e 100644
+index 86bc99716d..5037ae68a1 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
 @@ -55,6 +55,10 @@
@@ -24,5 +24,5 @@ index 88b696f53a..afe444027e 100644
  #include <pcre2.h>
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch
index 402f1dd8..6185fe92 100644
--- a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,7 +1,7 @@
-From a1d177d63fb62d1bb77225fd90c5eb2883322a26 Mon Sep 17 00:00:00 2001
+From 8d8e5c1df2e366ba3c595970813caf98768a140f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
+Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
 
 Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
@@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
                  { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                  { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch
index ec7e9178..abe072c4 100644
--- a/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,7 +1,7 @@
-From 603ca5161d67e72432128a21478bd623d8b973c2 Mon Sep 17 00:00:00 2001
+From fd736054ec03ad328b1e8c4195184f286655040e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
 
 ---
  src/plugins/sqldrivers/configure.json | 5 +++--
@@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
              ]
          },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch
index a2a5d387..26b8cf2f 100644
--- a/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch
@@ -1,7 +1,7 @@
-From eed57ae8b6b9a2a8a6183751f08f16c9921bf32b Mon Sep 17 00:00:00 2001
+From 15f3d49456695caeb91f1e861730883aea04ca5f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 16/33] Rename qtmain to qt5main
+Subject: [PATCH 16/34] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
  
  CONFIG += static
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch
index 2f2262c1..184aff91 100644
--- a/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch
@@ -1,7 +1,7 @@
-From b5a1c1909c58b62705f1ff46adfac40ed26b0f5d Mon Sep 17 00:00:00 2001
+From 366c764b927e568c75968ae92ec16caca54c0d31 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
-Subject: [PATCH 17/33] Build dynamic host libraries
+Subject: [PATCH 17/34] Build dynamic host libraries
 
 This came initially from Fedora, not sure whether
 it makes sense to keep it. Regular Arch package
@@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 36f632e8ca..2deec56866 100644
+index c0a8dcc251..200fa40840 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -24,7 +24,7 @@ requires(!$$skip)
@@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch
index 4740f5c0..c8636ff4 100644
--- a/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch
@@ -1,7 +1,7 @@
-From 7b40a97b618dda07f6e9fdaf28db958c0f5b33fc Mon Sep 17 00:00:00 2001
+From b6dfc4016e7f61c1eb178b051387b08219652484 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 18/33] Enable rpath for build tools
+Subject: [PATCH 18/34] Enable rpath for build tools
 
 - Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib
@@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
  INSTALLS += target
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch
index 834f8ccc..e76fce8a 100644
--- a/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch
@@ -1,17 +1,17 @@
-From 25849eed06ade33131bb0dfa2bdb3e890b2e9ee7 Mon Sep 17 00:00:00 2001
+From 012d6961a9ffbaeabf1742243b23ee092b915af2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 19/33] Use system zlib for build tools
+Subject: [PATCH 19/34] Use system zlib for build tools
 
 ---
  src/tools/bootstrap/bootstrap.pro | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index 521dd5f0f2..eb8cb4770c 100644
+index 042ad7adb9..7e3bc3977a 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -129,7 +129,7 @@ macx {
+@@ -132,7 +132,7 @@ macx {
          ../../corelib/io/qstandardpaths_win.cpp
  }
  
@@ -21,5 +21,5 @@ index 521dd5f0f2..eb8cb4770c 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64-static/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
index ff40a808..cf2e1d82 100644
--- a/qt5-base/mingw-w64-static/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+++ b/qt5-base/mingw-w64-static/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
@@ -1,7 +1,7 @@
-From 98a2adad712fb0c23ad2813e1a35a793317461ad Mon Sep 17 00:00:00 2001
+From 81a6a9a34e71a08fd5a8b87f44c71803d7f07797 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:20:25 +0200
-Subject: [PATCH 20/33] Disable determing default include and lib dirs at qmake
+Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake
  time when building with mingw-w64
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 20/33] 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 35175f1744..96afeeca57 100644
+index ba41598be1..6416db4d58 100644
 --- a/mkspecs/features/toolchain.prf
 +++ b/mkspecs/features/toolchain.prf
 @@ -31,7 +31,7 @@ isEmpty($${target_prefix}.INCDIRS) {
@@ -18,9 +18,9 @@ index 35175f1744..96afeeca57 100644
      #
 -    gcc {
 +    !win32:gcc {
-         !equals(QMAKE_HOST.os, Windows) {
-             cmd_prefix = "LC_ALL=C"
-             cmd_suffix = "</dev/null >/dev/null"
+         cmd_suffix = "<$$QMAKE_SYSTEM_NULL_DEVICE >$$QMAKE_SYSTEM_NULL_DEVICE"
+         equals(QMAKE_HOST.os, Windows): \
+             cmd_prefix = "set LC_ALL=C&"
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0021-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-static/0021-Use-.dll.a-as-import-lib-extension.patch
index b3f9e5dc..4f2ee4c6 100644
--- a/qt5-base/mingw-w64-static/0021-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-static/0021-Use-.dll.a-as-import-lib-extension.patch
@@ -1,7 +1,7 @@
-From 5cb315e62e7c4114d62767c274952c58ebe88b06 Mon Sep 17 00:00:00 2001
+From 834b94ccb1897cd5325557fa6051ef2cb4bb70a0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 21/33] Use *.dll.a as import lib extension
+Subject: [PATCH 21/34] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 mingw-w64 specific mkspec
@@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0022-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-static/0022-Merge-shared-and-static-library-trees.patch
index c2c02d58..44d0bcb3 100644
--- a/qt5-base/mingw-w64-static/0022-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-static/0022-Merge-shared-and-static-library-trees.patch
@@ -1,7 +1,7 @@
-From 0401a8dd7051a1d6aca6288fd5a5d0bef006168e Mon Sep 17 00:00:00 2001
+From 4502d0a9e9102067541a4307e80444a4fb44717c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 22/33] Merge shared and static library trees
+Subject: [PATCH 22/34] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
 ---
@@ -99,7 +99,7 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index c7e075b5bc..d61f7b05e5 100644
+index 0d07d6c333..5e84628e72 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
@@ -126,5 +126,5 @@ index c7e075b5bc..d61f7b05e5 100644
  
      t << endl;
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-static/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index 2fd999f6..bf2ec7ba 100644
--- a/qt5-base/mingw-w64-static/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-static/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,7 +1,7 @@
-From 6e0b658e5cadf0248954fbbf1b8271d54b9778a2 Mon Sep 17 00:00:00 2001
+From f73b460094294c7cd9f9d9cd481fbf1cef5a2a49 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 23/33] Pull dependencies of static libraries in CMake modules
+Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules
 
 When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
@@ -251,7 +251,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index d61f7b05e5..2dd26bf4dd 100644
+index 5e84628e72..c853d52b27 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@@ -269,5 +269,5 @@ index d61f7b05e5..2dd26bf4dd 100644
  }
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0024-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-static/0024-Allow-usage-of-static-version-with-CMake.patch
index 0e9f9771..c4e60933 100644
--- a/qt5-base/mingw-w64-static/0024-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-static/0024-Allow-usage-of-static-version-with-CMake.patch
@@ -1,7 +1,7 @@
-From eec4b8a76d8c5882a5fbd4e6aa85dea696049c23 Mon Sep 17 00:00:00 2001
+From 903ed5730e5a25ea6fda815fcd88cc36e3d8639e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
-Subject: [PATCH 24/33] Allow usage of static version with CMake
+Subject: [PATCH 24/34] Allow usage of static version with CMake
 
 Allow selecting between dynamic and static Qt versions
 installed in the same prefix
@@ -997,5 +997,5 @@ index 2a575958ae..ca0e3be3b5 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-static/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index b9f81f22..02432029 100644
--- a/qt5-base/mingw-w64-static/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-static/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,7 +1,7 @@
-From 0aac929861fb8d60fbc66f2557e1b9c5022ff9c5 Mon Sep 17 00:00:00 2001
+From b3bcf57cfbd152eafa82b9d80183fde0f2bf1f5c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
-Subject: [PATCH 25/33] Adjust linker flags for static build with
+Subject: [PATCH 25/34] Adjust linker flags for static build with
  cmake/mingw-w64
 
 Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
@@ -25,5 +25,5 @@ index ebe6644dfe..687d611b3f 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0026-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-static/0026-Use-correct-pkg-config-static-flag.patch
index 15c749e6..36498bf7 100644
--- a/qt5-base/mingw-w64-static/0026-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-static/0026-Use-correct-pkg-config-static-flag.patch
@@ -1,7 +1,7 @@
-From f2ff6d5023bd834b0110a97a16e085c3914335a7 Mon Sep 17 00:00:00 2001
+From 1e31f372966581f19bcbd9a39b29cf3dedfe9c5a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 26/33] Use correct pkg-config --static flag
+Subject: [PATCH 26/34] Use correct pkg-config --static flag
 
 ---
  configure.pri | 3 +++
@@ -22,5 +22,5 @@ index a05c3d98e6..8dc874a74d 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0027-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-static/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
index a8508251..3b75e887 100644
--- a/qt5-base/mingw-w64-static/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-static/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,7 +1,7 @@
-From 4f332ea7f376d8a77d7dbfe82ab6e5eb6b6f1fe9 Mon Sep 17 00:00:00 2001
+From 0f6a4852f4bf5d43aa856f2af475f5f526b76daf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 27/33] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic
 
 * Otherwise the arguments aren't passed correctly leading to errors like
   ```
@@ -70,5 +70,5 @@ index f5e7b7f050..18d120f0c7 100644
            MAIN_DEPENDENCY ${infile} VERBATIM)
          list(APPEND ${outfiles} ${outfile})
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0028-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-static/0028-Ignore-errors-about-missing-feature-static.patch
index 104d9c20..803dfe38 100644
--- a/qt5-base/mingw-w64-static/0028-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-static/0028-Ignore-errors-about-missing-feature-static.patch
@@ -1,7 +1,7 @@
-From a8039e2f388a3fbd289dc912ae6b6a58beb84f19 Mon Sep 17 00:00:00 2001
+From 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 28/33] Ignore errors about missing feature static
+Subject: [PATCH 28/34] 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 150d2b2cc3..d93d24cce5 100644
+index 76e1d15319..9a1c5cd8b6 100644
 --- a/mkspecs/features/qt_build_config.prf
 +++ b/mkspecs/features/qt_build_config.prf
-@@ -135,5 +135,5 @@ defineTest(qtConfig) {
+@@ -138,5 +138,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -21,10 +21,10 @@ index 150d2b2cc3..d93d24cce5 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 c00fdb73f8..d4d5599433 100644
+index 1903e509c8..1fcb597fa3 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -351,5 +351,5 @@ defineTest(qtConfig) {
+@@ -348,5 +348,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -32,5 +32,5 @@ index c00fdb73f8..d4d5599433 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0029-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-static/0029-Enable-and-fix-use-of-iconv.patch
index ddffbea3..128a1cf3 100644
--- a/qt5-base/mingw-w64-static/0029-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-static/0029-Enable-and-fix-use-of-iconv.patch
@@ -1,7 +1,7 @@
-From 05738e526362a5c712d8341ada02e557e76579f5 Mon Sep 17 00:00:00 2001
+From 3a5569599bd8c5267e41c57917b19e16bba1169c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 29/33] Enable and fix use of iconv
+Subject: [PATCH 29/34] Enable and fix use of iconv
 
 Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
 ---
@@ -63,10 +63,10 @@ index d6362b6fbc..4da4546a24 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index a5b69a2df6..9e3eb4f671 100644
+index bf44f2649d..90f0450902 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
-@@ -428,9 +428,9 @@
+@@ -521,9 +521,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",
@@ -79,5 +79,5 @@ index a5b69a2df6..9e3eb4f671 100644
          },
          "icu": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0030-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-static/0030-Ignore-failing-pkg-config-test.patch
index cc89a8e3..4c8cc8f8 100644
--- a/qt5-base/mingw-w64-static/0030-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-static/0030-Ignore-failing-pkg-config-test.patch
@@ -1,7 +1,7 @@
-From f99af5483b8c3d8b511db8476f4d738ff868886c Mon Sep 17 00:00:00 2001
+From e9f964d079c6dea6404f01d0d8f1acfa5287ccdc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 30/33] Ignore failing pkg-config test
+Subject: [PATCH 30/34] Ignore failing pkg-config test
 
 Didn't investigate why it fails, let's hope for the best
 ---
@@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
  1 file changed, 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 9914bf0487..d5b81d53f5 100644
+index d668ce0c98..2d36a60cd3 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -710,7 +710,6 @@
+@@ -725,7 +725,6 @@
          "pkg-config": {
              "label": "Using pkg-config",
              "autoDetect": "!config.darwin && !config.win32",
@@ -21,5 +21,5 @@ index 9914bf0487..d5b81d53f5 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-static/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 5fc9df50..e4349439 100644
--- a/qt5-base/mingw-w64-static/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-static/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,7 +1,7 @@
-From eadf27b8bd882899a99254578ecb8407a0acab6f Mon Sep 17 00:00:00 2001
+From d35384a8d6191d68f8cd2b60a2295f5372d67fa4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 31/33] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies
 
 In particular, it messes resolving cyclic dependency between
 static freetype2 and harfbuzz
@@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644
    static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
    for (int i = 0; lflags[i]; i++) {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0032-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-static/0032-Hardcode-linker-flags-for-platform-plugins.patch
index 5562bbf3..3d82dfff 100644
--- a/qt5-base/mingw-w64-static/0032-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-static/0032-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,18 +1,16 @@
-From f7bb119102d28e22b764cce82ee491e747034247 Mon Sep 17 00:00:00 2001
+From aa947be7429528caf04ad7db6f077fe695bcfe82 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 32/33] Hardcode linker flags for platform plugins
+Subject: [PATCH 32/34] 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(-)
+ src/plugins/platforms/minimal/minimal.pro     | 15 +++++++++++--
+ src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++--
+ src/plugins/platforms/windows/windows.pro     | 32 +++++++++++++++++++--------
+ 3 files changed, 48 insertions(+), 13 deletions(-)
 
 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
 index 8cfb68824e..46834a71fc 100644
@@ -66,36 +64,47 @@ index 6652cefd86..a322b17cc5 100644
  DEFINES += QT_NO_FOREACH
  
 diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
-index 23168c10dc..eb4af726ca 100644
+index 174bc7b609..e66488e364 100644
 --- a/src/plugins/platforms/windows/windows.pro
 +++ b/src/plugins/platforms/windows/windows.pro
-@@ -1,11 +1,22 @@
+@@ -1,14 +1,28 @@
  TARGET = qwindows
  
- QT += \
+-QT += \
 -    core-private gui-private \
--    eventdispatcher_support-private accessibility_support-private \
+-    eventdispatcher_support-private \
 -    fontdatabase_support-private theme_support-private
-+    core-private gui-private
- 
+-
+-qtConfig(accessibility): QT += accessibility_support-private
+-qtConfig(vulkan): QT += vulkan_support-private
+-
 -LIBS += -lgdi32 -ldwmapi
++QT += core-private gui-private
++
 +# 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/$${QT_VERSION} \
-+    $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION} \
 +    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \
 +    $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION}
++# Same for private support libs for accessibility and vulkan, if those are enabled
++qtConfig(accessibility) {
++    LIBS += -lQt5AccessibilitySupport
++    INCLUDEPATH += $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}
++}
++qtConfig(vulkan) {
++    LIBS += -lQt5VulkanSupport
++    INCLUDEPATH += $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}
++}
  
  include(windows.pri)
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0033-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-static/0033-Fix-linking-against-static-plugins-with-qmake.patch
index 676a558c..d849f3d8 100644
--- a/qt5-base/mingw-w64-static/0033-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-static/0033-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,7 +1,7 @@
-From b91d3a0690995511d1388b9d9493aed702bd0138 Mon Sep 17 00:00:00 2001
+From 7db753e04de6a458fc10124b7e3b12ac5f4d1623 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
-Subject: [PATCH 33/33] Fix linking against static plugins with qmake
+Subject: [PATCH 33/34] Fix linking against static plugins with qmake
 
 Required because qtConfig(static) does not work
 with 'Merge shared and static library trees'
@@ -33,5 +33,5 @@ index afaac3dbc4..82b02b5113 100644
          # Check if the plugin is known to Qt. We can use this to determine
          # the plugin path. Unknown plugins must rely on the default link path.
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64-static/0034-Don-t-use-the-statx-syscall.patch b/qt5-base/mingw-w64-static/0034-Don-t-use-the-statx-syscall.patch
new file mode 100644
index 00000000..56e0ca93
--- /dev/null
+++ b/qt5-base/mingw-w64-static/0034-Don-t-use-the-statx-syscall.patch
@@ -0,0 +1,27 @@
+From e8cbf42a882706cce93f46142748d252cb492e1c Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 9 Dec 2017 00:36:56 +0100
+Subject: [PATCH 34/34] Don't use the statx syscall
+
+Otherwise Qt can not be built in a systemd
+container
+---
+ src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index 77d154c6b4..6036bae4f1 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -95,7 +95,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp
+ { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
+ #  endif
+ 
+-#  if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE(<linux/stat.h>)
++#  if 0
+ #    include <linux/stat.h>
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+-- 
+2.15.1
+
diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD
index a908623e..ac6aa182 100644
--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@@ -84,7 +84,7 @@ isNoOpenGL() {
 }
 
 pkgname=mingw-w64-qt5-base-static
-pkgver=5.9.2
+pkgver=5.10.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
@@ -92,14 +92,14 @@ 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-1.0' 'mingw-w64-dbus' 'mingw-w64-harfbuzz'
+         'mingw-w64-libpng' 'mingw-w64-openssl' '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')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
-_pkgfqn="qtbase-opensource-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+_pkgfqn="qtbase-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Add-profile-for-cross-compilation-with-mingw-w64.patch'
         '0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch'
         '0003-Use-external-ANGLE-library.patch'
@@ -132,41 +132,43 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
         '0030-Ignore-failing-pkg-config-test.patch'
         '0031-Prevent-qmake-from-messing-static-lib-dependencies.patch'
         '0032-Hardcode-linker-flags-for-platform-plugins.patch'
-        '0033-Fix-linking-against-static-plugins-with-qmake.patch')
-sha256sums=('7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b'
-            '685fd08e1c4e97bbf6990959cb3dbe88dd3ed494221400dce6aef159d277c34a'
-            '4e5115e62b952acface29882c5f6423569cd1c439c454e58594b5fb2cb740916'
-            '0b339563844ccd325486d78711592561996fb256f0612c63b33b6ea52a6fc77e'
-            '18945eb521df54d37922894c9bc82ccd03eb3fd9f6e0aed986facf2b49f336d4'
-            '2c2b5f9b3db02750ae9a9626ea8a24a3516c881c5eaa9b19fb9a2621fc1263fc'
-            '81559290cc03f7ff6042f28a6eb319882264876076a20e24531641ebe4ef3aee'
-            'a3d657ee7f8bfa6c3e5a4aa626710bc27fc82fea3d834098bde2b2f67244d11c'
-            '3df9bf81a936c737cc7ca53bdea9cfd2a4010fa190fe3e1a45611097d8213ef4'
-            '5aac41daaf223726d31ab5a7aec0bdc050aa182522ca732cc31c3b5ac8cd28dc'
-            '6844b7106e636d513b077edeba318990641b1ee294f2a70739830e3d0a9b0d02'
-            '12b51c32069270e49e05e64b0f54d6e3e871523660fd17673e0ee6e67206955e'
-            '4baa73f8b3d61b503a9de1437bdc9f7f84cd2443280afc1461456ae34d222e9b'
-            'e34eec672f9f681302edd809cbcb7d6848a310a02acc5711e2e348aab1b8d74c'
-            'd70f44c06a7bae6fbd91022ec79f09e2d658969aa5a6602bff6eb61076801b6e'
-            'f705fcfe1f552536318c2c63d59e5ec95640321d9f1fff1016a34d1bc862c9df'
-            '60034cce435d3eca60906e4af2f1ad55edd12b4e95ccc9905e793bc7b9d66917'
-            '295c307f6b075b0c20b7d714b6ecff1bc25927b80dd60d725052b4bc05d1b055'
-            '37c2d0bce780a15e7bdb477324936b1ae0ebe576c64d3a713a9086586518d50a'
-            '36b6a2e1d2bf478746e931da5223dcfeffc5eda513b64596ffbbd663fd5e63e7'
-            'e1b45c50ca09b065f218442a1fc3ddf3c8de1357a818925497fe0e3e7c28cacd'
-            '03feabae42553a6960c2a257eb951d956fe31a9a4440a92b373e8a0d6cb301ff'
-            '1ec8a7ebaf5e400aca7a0abe8cee78d0dae6b662c30bf245b81814cfcd048dd3'
-            'bc2f049471853a6bb2e83de3c2691a4206d55c7fe018bb7910215e9968759082'
-            '8611ac15ee36b803b5095466509c57d45532ab017d61513f2be7b34d5c13da0f'
-            'f999f20131f0180439b59320ab350a284b169e5ee5e21379fa74dc07d4aeda25'
-            'd9fed680c0313c89458361ac253a5710379fa8022c7c24b05d2807ecaf4f803a'
-            'd263509d7951f12d9ccfa841cd7f205aebc7b9db28913925b65a23e627258023'
-            '092176255153bae63f779833d25e5f64a2c489a1b6f33e8e158ff59629916b36'
-            '65023b59b41797281876b5fcd8cb1542ad790b9b6f83125b6b0aa1e02d9de4fb'
-            '3d5202be8837bccab4dedc9b6f10b3722ca57ea8b663e08b55d0235381397508'
-            '4df4c2ad348c13a3b82c3a9b127464492898379a82dfd6db9d3ff9d051a08dab'
-            'cfa48754bef9f7a95f1350c0c1ec1699c9dc413013ef78d218206f5d60335823'
-            '135123e630efdbeb6d4edc9bc200754f2c881760652fe5152f0903ae238ce2c9')
+        '0033-Fix-linking-against-static-plugins-with-qmake.patch'
+        '0034-Don-t-use-the-statx-syscall.patch')
+sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
+            'd2784f40a1f8f3f7041c94b89702404a21ef2fd1d6c63bbffe14e26321265745'
+            'c695a25e6dc0ddd8b1dd07adba6eee518294ffb69b689f373dde861f935c876b'
+            '4a7a855fe8abffe0aa3da450981439a1c26f7f65fe456149f627bccd603ad5b7'
+            '46a42a20a4bed03f9f0b7abd55904be3e560dfd4e10e586d68479a5060ce06e2'
+            '70550f6cbe95c5a14ccb7e9ba5fab7cb595a0fc49b889c9ac735cca41148ab5b'
+            'fa16872915ce6d24bc217ee7c5e42c3c61e29034f832e32f2971da85eb4f3d08'
+            '19b01e55dd3eb311c182d2ef682f15a2739556d5585d9e19de633e92dba9a788'
+            'e13936a6f7d17a6c38c95e9cc9e19209a3d03970cf5157931f309edf45530132'
+            '978a2f5a53c0fe50780a12c09bbc81ee8efe60d1437425b08b3c5b4a4edb217c'
+            '8ffb5f68ebe09e99580d45c1279dc39ef811d0de7e4d363173af3be2cf3c9ee8'
+            '305f18d1b011033fbb12ca544d3af47cb45a1b6d324bf68b671cb007dc2a8a0a'
+            '53fb05efee9c024643cd607c623eda745a122cddc2880d6554b3168778942316'
+            '927188133dc2708345f7c831e1253b59338a9554b544c1d2cfdf02493b92573f'
+            '125f0b758bf2088589a31ced00146dc2cce28fa93bdd84684857ae60850c96b8'
+            '016c3a2980060365dd7e83a001f274b6a7f736af2519fa7c5263b0def10e2703'
+            '48930971f0ce225795bd0b6292c4e3ad27843ec0c95113b95be44274435b6623'
+            'a6f8e6111b6960b86b347c3927251f41c8fa235aabf90e89965063326c7cedd3'
+            'a57e452177fd1aa7f0d22b1a83f29dd18010dfef7b007157a7dc8d6399232471'
+            '07b1ab8b25a02e1ed369017178847081afe937817e71384dfb17ab56ff278a0e'
+            '2b426ab2aa774110c2b628c4987748520925e7ebfda2f524407cdc606315696b'
+            'a78df9e2a5f3da89f944328a217ae5dd75fabd37f5b5c9ebc8eb75678f31910a'
+            '8470c121a04702b1a0ef4f52d310e69906bab0c066fcb6c7601bcb678655b959'
+            'ac09e38e4f555e5bae1bc0f01b70a67624b15ecf5affc06d85eaccbc85f3c1da'
+            '0c1939eff41143bc78a6bf6e8b51515f4ba68337b9723674e6e7ab696167edae'
+            'ed64b7a36a01d30bc9d35fed47186f9161e5ceba7dd92da7c60d288026fa8856'
+            '3f42240d83d09c62b8a7d9a98fe2d6a9d9fcf8ba6b5ff3d303a941411ef7d1a4'
+            'd44bdc6363d1e5e1cbcdb5b61e0a788a38368ab3090746c165981bd0a5eb0854'
+            '15c0691f6fd058bf70be79b221ab4ace66cc574728b68d9f15bafe1877f46266'
+            '05aec6b0c2d9add0e4181246b52096d4cf2f4176f4c0e9f467d5244492844c28'
+            'ed1237884607a368190cb1ac4de2a12f00e54ecfcea901c7f1980ac37b94b57b'
+            '4a83eb1549be9477bc002a6b939e24a6f1b6fd14bfcc804235771d484762aa3e'
+            'a100076b67008b64f73fd4fd4b131e1774b84b24b61198cabecdb5916d634887'
+            'fe9ecf6e82b64b3a955f688d51c87ca82a4aa4ad59e419c7c284ce18b72e223c'
+            'cbc0e2570ca5b52681d99ab15e7a7a79a286e498203d34c2d67493a78dd6b84d')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -232,8 +234,6 @@ build() {
   unset PKG_CONFIG_PATH
 
   for _arch in ${_architectures}; do
-    echo "INCLUDEPATH += /usr/${_arch}/include/openssl-1.0" >> src/network/network.pro
-
     # To prevent conflicts with the mingw-w64-qt4 package we have
     # to put tools in a dedicated folder
 
@@ -314,22 +314,26 @@ build() {
     # Fix MariaDB
     qt_configure_args+=" -I/usr/${_arch}/include/mariadb"
 
+    msg2 'Configure and build qmake'
     mkdir -p ../build-${_arch} && pushd ../build-${_arch}
     if isStatic; then
-      export OPENSSL_LIBS="/usr/${_arch}/lib/openssl-1.0/libssl.a /usr/${_arch}/lib/openssl-1.0/libcrypto.a -lws2_32 -lgdi32 -lcrypt32"
+      export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32"
       ../${_pkgfqn}/configure \
         $qt_configure_args \
         -static \
         -openssl-linked
+      msg2 'Build static Qt libraries'
       make
     else
       # The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared
       # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
       # libraries aren't installed at this point yet, we have to workaround this
-      ../${_pkgfqn}/configure $qt_configure_args \
+      ../${_pkgfqn}/configure \
+        $qt_configure_args \
         -shared \
         -openssl-runtime \
         -device-option 'CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build'
+      msg2 'Build shared Qt libraries'
       LD_LIBRARY_PATH="$PWD/lib" LDFLAGS="-L$PWD/lib" make
     fi
     popd
@@ -351,6 +355,7 @@ package() {
         "${pkgdir}/usr/${_arch}/lib/"{lib,}qt5main* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5AccessibilitySupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5DeviceDiscoverySupport* \
+        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EdidSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EventDispatcherSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FbSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FontDatabaseSupport* \
diff --git a/qt5-base/mingw-w64-test/PKGBUILD b/qt5-base/mingw-w64-test/PKGBUILD
index 85d0ea20..cbafa1ff 100644
--- a/qt5-base/mingw-w64-test/PKGBUILD
+++ b/qt5-base/mingw-w64-test/PKGBUILD
@@ -21,7 +21,7 @@ optdepends=()
 makedepends=('mingw-w64-gcc' 'qt5-examples' 'mingw-w64-qtutilities' 'mingw-w64-tagparser' 'mingw-w64-cmake')
 conflicts=('mingw-w64-qt5-examples' 'mingw-w64-tageditor')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
-_pkgfqn="qtbase-opensource-src-${pkgver}"
+_pkgfqn="qtbase-everywhere-src-${pkgver}"
 source=("tageditor-2.2.5.tar.gz::https://github.com/Martchus/tageditor/archive/v2.2.5.tar.gz")
 sha256sums=('1b5e44ffc224cd26531f3dd99945ff5e60c051027421dd027bd3f133fbb0d2a8')
 
diff --git a/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
index 9fa075d1..15ca6ec5 100644
--- a/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
+++ b/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
@@ -1,7 +1,7 @@
-From 76b918b0c930c9c4c704f4ce947822e30c1bf1ec Mon Sep 17 00:00:00 2001
+From af6803389ebba50abfe7ad299bbf99c9c8d1a8aa Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/33] Add profile for cross compilation with mingw-w64
+Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64
 
 ---
  mkspecs/mingw-w64-g++/qmake.conf      | 126 +++++++++++++++++++++++++++
@@ -12,7 +12,7 @@ Subject: [PATCH 01/33] 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..c929483fcd
+index 0000000000..0979611a53
 --- /dev/null
 +++ b/mkspecs/mingw-w64-g++/qmake.conf
 @@ -0,0 +1,126 @@
@@ -133,7 +133,7 @@ index 0000000000..c929483fcd
 +                              $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
 +                              $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
 +QMAKE_LIBS_NETWORK          = -lws2_32 -lcrypt32 -ldnsapi
-+QMAKE_LIBS_NETWORK_STATIC   = $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libssl.a $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libcrypto.a -lgdi32
++QMAKE_LIBS_NETWORK_STATIC   = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -ldnsapi
 +QMAKE_LIBS_DBUS             = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1)
 +QMAKE_LIBS_OPENGL           = -lglu32 -lopengl32 -lgdi32 -luser32
 +QMAKE_LIBS_OPENGL_ES2       = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
@@ -304,5 +304,5 @@ index 0000000000..c5a70b1445
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
index e644e2aa..91acfc8f 100644
--- a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,7 +1,7 @@
-From 31fa3e1192849fb5460b346a3fc1f91fe1431f8e Mon Sep 17 00:00:00 2001
+From b8e324aa1716e50bdb66772bab2442e5b7c7afe8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---
@@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch
index f753a01a..94419690 100644
--- a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch
@@ -1,7 +1,7 @@
-From 00b0e801caf246047f3ea18bead0ffc7c7631dad Mon Sep 17 00:00:00 2001
+From 036909a4c082a17bee90c451842ebaee896e1893 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/33] Use external ANGLE library
+Subject: [PATCH 03/34] Use external ANGLE library
 
 ---
  src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
@@ -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 f7d077e656..b7fc6fadaf 100644
+index f8cec00b82..d09c9fd49c 100644
 --- a/src/gui/gui.pro
 +++ b/src/gui/gui.pro
 @@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@@ -66,7 +66,7 @@ index 016db46405..02f1204f0f 100644
  HEADERS += qgl.h \
             qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index 6d01d05fcc..181ac2cb3b 100644
+index b7790a66e3..046fe34a06 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
 @@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
@@ -78,10 +78,10 @@ index 6d01d05fcc..181ac2cb3b 100644
  mingw: LIBS *= -luuid
  # For the dialog helpers:
 diff --git a/src/src.pro b/src/src.pro
-index 43fc06f2e5..4188d4ea6b 100644
+index a2064b1362..b9ba606b03 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -175,10 +175,6 @@ qtConfig(gui) {
+@@ -180,10 +180,6 @@ qtConfig(gui) {
          SUBDIRS += src_3rdparty_harfbuzzng
          src_gui.depends += src_3rdparty_harfbuzzng
      }
@@ -93,5 +93,5 @@ index 43fc06f2e5..4188d4ea6b 100644
          SUBDIRS += src_3rdparty_libpng
          src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
index b3ae560d..7619c55f 100644
--- a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -1,7 +1,7 @@
-From 6f9daffcc9b83acbcae94ced0708f6f96f2e99c4 Mon Sep 17 00:00:00 2001
+From d67f33383fde286f9c8e77bbd686a5c335473645 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.
@@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch
index e99439db..c685ba02 100644
--- a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,7 +1,7 @@
-From 198b5f7e944f21a7f9caaeb686afddfc9e87c768 Mon Sep 17 00:00:00 2001
+From 1c595c81473d93a87b339df137820624cafdc373 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
+Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -10,7 +10,7 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
  3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a1f3352aa3..0be4b1ef01 100644
+index 82573347b6..b9871ff49c 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
@@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
index 43268114..d5221ecb 100644
--- a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,7 +1,7 @@
-From 5731914d9e5d8a026901e5bbab3f3ee1b3ea50f3 Mon Sep 17 00:00:00 2001
+From 50b56803c962a656211021e50cd3e7df57722726 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references
@@ -11,10 +11,10 @@ like .obj/debug/Qt5Cored_resource_res.o
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
-index bad53dc5b7..c730d641b2 100644
+index 792ffb1997..faf8b5a275 100644
 --- a/qmake/generators/win32/mingw_make.cpp
 +++ b/qmake/generators/win32/mingw_make.cpp
-@@ -202,7 +202,7 @@ void MingwMakefileGenerator::init()
+@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init()
  
      processVars();
  
@@ -24,5 +24,5 @@ index bad53dc5b7..c730d641b2 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch
index f09d6fae..a3e93271 100644
--- a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,7 +1,7 @@
-From 285b5fee5b5ada6cd82ddaf33eb9c1a05b564bc6 Mon Sep 17 00:00:00 2001
+From b02e8af19e3d94f9c39bbcaf94e91ab6dc6ca3f8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
+Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
 
 qmake generates the pkgconfig .pc files two times, once for the
 release build and once for the debug build (which we're not actually
@@ -15,7 +15,7 @@ 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 0be4b1ef01..c7e075b5bc 100644
+index b9871ff49c..0d07d6c333 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
@@ -29,5 +29,5 @@ index 0be4b1ef01..c7e075b5bc 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch
index d1b4f7ac..a5eef160 100644
--- a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch
@@ -1,7 +1,7 @@
-From 1ee8c85cd86ca49c2d43d81af0c57eb49b877372 Mon Sep 17 00:00:00 2001
+From e48d371cf5b0b98f91fca0fe38a5dd0479fcdfca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 08/33] Fix linking against shared/static libpng
+Subject: [PATCH 08/34] Fix linking against shared/static libpng
 
 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
@@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 28c8034c75..7e9148500b 100644
+index 0a591e110c..4ca919c6da 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -294,7 +294,8 @@
+@@ -296,7 +296,8 @@
              "sources": [
                  { "type": "pkgConfig", "args": "libpng" },
                  { "libs": "-llibpng", "condition": "config.msvc" },
@@ -23,5 +23,5 @@ index 28c8034c75..7e9148500b 100644
              "use": [
                  { "lib": "zlib", "condition": "features.system-zlib" }
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch
index d07abaee..4b897989 100644
--- a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch
@@ -1,7 +1,7 @@
-From 3e04b4a701a7dde06f5ea046198ac5646b644e86 Mon Sep 17 00:00:00 2001
+From 6785fbf99c08ef26967bcd064941b7bd692afb41 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 09/33] Fix linking against static D-Bus
+Subject: [PATCH 09/34] Fix linking against static D-Bus
 
 ---
  configure.json             | 9 +++++++--
@@ -9,7 +9,7 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/configure.json b/configure.json
-index a91456aaf3..55c56369ba 100644
+index 26e1572f32..108619634c 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -171,18 +171,23 @@
@@ -54,5 +54,5 @@ index cfc0e12046..65f1397cd6 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
index 02a01b11..ebdc33ce 100644
--- a/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,7 +1,7 @@
-From 28750e29ab3549300823ff8af3c2064479e71c95 Mon Sep 17 00:00:00 2001
+From 94ba6e5a623a81ee02f6b7a46b7e82f4ea505f4f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
-Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
+Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
 
 Required for a debug build of Qt because mingw-w64-dbus
 does not contain debug version
@@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 55c56369ba..9914bf0487 100644
+index 108619634c..d668ce0c98 100644
 --- a/configure.json
 +++ b/configure.json
 @@ -184,7 +184,7 @@
@@ -25,5 +25,5 @@ index 55c56369ba..9914bf0487 100644
                      },
                      "condition": "config.win32 && features.shared"
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch
index aa7a66d4..a45279cf 100644
--- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch
@@ -1,17 +1,17 @@
-From e7e7c7500e07d5d1eaa69550ac6c760e55e857a4 Mon Sep 17 00:00:00 2001
+From 6e4e751d6f39c6869cacb6d4148f5358f58bb54e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 11/33] Fix linking against static freetype2
+Subject: [PATCH 11/34] Fix linking against static freetype2
 
 ---
  src/gui/configure.json | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 7e9148500b..27f8257c18 100644
+index 4ca919c6da..5d524b1d73 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -156,8 +156,11 @@
+@@ -158,8 +158,11 @@
                  ]
              },
              "sources": [
@@ -26,5 +26,5 @@ index 7e9148500b..27f8257c18 100644
          },
          "fontconfig": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch
index 91364f8c..71e2a90b 100644
--- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch
@@ -1,17 +1,17 @@
-From 38b3a06ebd65bab1765c95537eb8503286e31754 Mon Sep 17 00:00:00 2001
+From e05dcf0fb89c0ab64aba0f3a53986daa6a0bed76 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 12/33] Fix linking against static harfbuzz
+Subject: [PATCH 12/34] Fix linking against static harfbuzz
 
 ---
  src/gui/configure.json | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 27f8257c18..1a87110831 100644
+index 5d524b1d73..78f1b90d37 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -221,7 +221,11 @@
+@@ -223,7 +223,11 @@
                  ]
              },
              "sources": [
@@ -25,5 +25,5 @@ index 27f8257c18..1a87110831 100644
          },
          "imf": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch
index 0bdd68d8..6e3e18c9 100644
--- a/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch
@@ -1,7 +1,7 @@
-From f5a1650b08d90f854b1b8eb12c0e6b9a5c3f5cc4 Mon Sep 17 00:00:00 2001
+From 9e7f8734086cc4a2dd7f6e713076af64648802f7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 13/33] Fix linking against static pcre
+Subject: [PATCH 13/34] Fix linking against static pcre
 
 Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
@@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
  1 file changed, 4 insertions(+)
 
 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 88b696f53a..afe444027e 100644
+index 86bc99716d..5037ae68a1 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
 @@ -55,6 +55,10 @@
@@ -24,5 +24,5 @@ index 88b696f53a..afe444027e 100644
  #include <pcre2.h>
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch
index 402f1dd8..6185fe92 100644
--- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,7 +1,7 @@
-From a1d177d63fb62d1bb77225fd90c5eb2883322a26 Mon Sep 17 00:00:00 2001
+From 8d8e5c1df2e366ba3c595970813caf98768a140f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
+Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
 
 Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
@@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
                  { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                  { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch
index ec7e9178..abe072c4 100644
--- a/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,7 +1,7 @@
-From 603ca5161d67e72432128a21478bd623d8b973c2 Mon Sep 17 00:00:00 2001
+From fd736054ec03ad328b1e8c4195184f286655040e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
 
 ---
  src/plugins/sqldrivers/configure.json | 5 +++--
@@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
              ]
          },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch
index a2a5d387..26b8cf2f 100644
--- a/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch
@@ -1,7 +1,7 @@
-From eed57ae8b6b9a2a8a6183751f08f16c9921bf32b Mon Sep 17 00:00:00 2001
+From 15f3d49456695caeb91f1e861730883aea04ca5f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 16/33] Rename qtmain to qt5main
+Subject: [PATCH 16/34] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
  
  CONFIG += static
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch
index 2f2262c1..184aff91 100644
--- a/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch
@@ -1,7 +1,7 @@
-From b5a1c1909c58b62705f1ff46adfac40ed26b0f5d Mon Sep 17 00:00:00 2001
+From 366c764b927e568c75968ae92ec16caca54c0d31 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
-Subject: [PATCH 17/33] Build dynamic host libraries
+Subject: [PATCH 17/34] Build dynamic host libraries
 
 This came initially from Fedora, not sure whether
 it makes sense to keep it. Regular Arch package
@@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 36f632e8ca..2deec56866 100644
+index c0a8dcc251..200fa40840 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -24,7 +24,7 @@ requires(!$$skip)
@@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch
index 4740f5c0..c8636ff4 100644
--- a/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch
@@ -1,7 +1,7 @@
-From 7b40a97b618dda07f6e9fdaf28db958c0f5b33fc Mon Sep 17 00:00:00 2001
+From b6dfc4016e7f61c1eb178b051387b08219652484 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 18/33] Enable rpath for build tools
+Subject: [PATCH 18/34] Enable rpath for build tools
 
 - Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib
@@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
  INSTALLS += target
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch
index 834f8ccc..e76fce8a 100644
--- a/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch
@@ -1,17 +1,17 @@
-From 25849eed06ade33131bb0dfa2bdb3e890b2e9ee7 Mon Sep 17 00:00:00 2001
+From 012d6961a9ffbaeabf1742243b23ee092b915af2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 19/33] Use system zlib for build tools
+Subject: [PATCH 19/34] Use system zlib for build tools
 
 ---
  src/tools/bootstrap/bootstrap.pro | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index 521dd5f0f2..eb8cb4770c 100644
+index 042ad7adb9..7e3bc3977a 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -129,7 +129,7 @@ macx {
+@@ -132,7 +132,7 @@ macx {
          ../../corelib/io/qstandardpaths_win.cpp
  }
  
@@ -21,5 +21,5 @@ index 521dd5f0f2..eb8cb4770c 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
index ff40a808..cf2e1d82 100644
--- a/qt5-base/mingw-w64/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+++ b/qt5-base/mingw-w64/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
@@ -1,7 +1,7 @@
-From 98a2adad712fb0c23ad2813e1a35a793317461ad Mon Sep 17 00:00:00 2001
+From 81a6a9a34e71a08fd5a8b87f44c71803d7f07797 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:20:25 +0200
-Subject: [PATCH 20/33] Disable determing default include and lib dirs at qmake
+Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake
  time when building with mingw-w64
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 20/33] 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 35175f1744..96afeeca57 100644
+index ba41598be1..6416db4d58 100644
 --- a/mkspecs/features/toolchain.prf
 +++ b/mkspecs/features/toolchain.prf
 @@ -31,7 +31,7 @@ isEmpty($${target_prefix}.INCDIRS) {
@@ -18,9 +18,9 @@ index 35175f1744..96afeeca57 100644
      #
 -    gcc {
 +    !win32:gcc {
-         !equals(QMAKE_HOST.os, Windows) {
-             cmd_prefix = "LC_ALL=C"
-             cmd_suffix = "</dev/null >/dev/null"
+         cmd_suffix = "<$$QMAKE_SYSTEM_NULL_DEVICE >$$QMAKE_SYSTEM_NULL_DEVICE"
+         equals(QMAKE_HOST.os, Windows): \
+             cmd_prefix = "set LC_ALL=C&"
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0021-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64/0021-Use-.dll.a-as-import-lib-extension.patch
index b3f9e5dc..4f2ee4c6 100644
--- a/qt5-base/mingw-w64/0021-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64/0021-Use-.dll.a-as-import-lib-extension.patch
@@ -1,7 +1,7 @@
-From 5cb315e62e7c4114d62767c274952c58ebe88b06 Mon Sep 17 00:00:00 2001
+From 834b94ccb1897cd5325557fa6051ef2cb4bb70a0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 21/33] Use *.dll.a as import lib extension
+Subject: [PATCH 21/34] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 mingw-w64 specific mkspec
@@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0022-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64/0022-Merge-shared-and-static-library-trees.patch
index c2c02d58..44d0bcb3 100644
--- a/qt5-base/mingw-w64/0022-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64/0022-Merge-shared-and-static-library-trees.patch
@@ -1,7 +1,7 @@
-From 0401a8dd7051a1d6aca6288fd5a5d0bef006168e Mon Sep 17 00:00:00 2001
+From 4502d0a9e9102067541a4307e80444a4fb44717c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 22/33] Merge shared and static library trees
+Subject: [PATCH 22/34] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
 ---
@@ -99,7 +99,7 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index c7e075b5bc..d61f7b05e5 100644
+index 0d07d6c333..5e84628e72 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
@@ -126,5 +126,5 @@ index c7e075b5bc..d61f7b05e5 100644
  
      t << endl;
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index 2fd999f6..bf2ec7ba 100644
--- a/qt5-base/mingw-w64/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,7 +1,7 @@
-From 6e0b658e5cadf0248954fbbf1b8271d54b9778a2 Mon Sep 17 00:00:00 2001
+From f73b460094294c7cd9f9d9cd481fbf1cef5a2a49 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 23/33] Pull dependencies of static libraries in CMake modules
+Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules
 
 When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
@@ -251,7 +251,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index d61f7b05e5..2dd26bf4dd 100644
+index 5e84628e72..c853d52b27 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@@ -269,5 +269,5 @@ index d61f7b05e5..2dd26bf4dd 100644
  }
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0024-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64/0024-Allow-usage-of-static-version-with-CMake.patch
index 0e9f9771..c4e60933 100644
--- a/qt5-base/mingw-w64/0024-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64/0024-Allow-usage-of-static-version-with-CMake.patch
@@ -1,7 +1,7 @@
-From eec4b8a76d8c5882a5fbd4e6aa85dea696049c23 Mon Sep 17 00:00:00 2001
+From 903ed5730e5a25ea6fda815fcd88cc36e3d8639e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
-Subject: [PATCH 24/33] Allow usage of static version with CMake
+Subject: [PATCH 24/34] Allow usage of static version with CMake
 
 Allow selecting between dynamic and static Qt versions
 installed in the same prefix
@@ -997,5 +997,5 @@ index 2a575958ae..ca0e3be3b5 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index b9f81f22..02432029 100644
--- a/qt5-base/mingw-w64/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,7 +1,7 @@
-From 0aac929861fb8d60fbc66f2557e1b9c5022ff9c5 Mon Sep 17 00:00:00 2001
+From b3bcf57cfbd152eafa82b9d80183fde0f2bf1f5c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
-Subject: [PATCH 25/33] Adjust linker flags for static build with
+Subject: [PATCH 25/34] Adjust linker flags for static build with
  cmake/mingw-w64
 
 Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
@@ -25,5 +25,5 @@ index ebe6644dfe..687d611b3f 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0026-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64/0026-Use-correct-pkg-config-static-flag.patch
index 15c749e6..36498bf7 100644
--- a/qt5-base/mingw-w64/0026-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64/0026-Use-correct-pkg-config-static-flag.patch
@@ -1,7 +1,7 @@
-From f2ff6d5023bd834b0110a97a16e085c3914335a7 Mon Sep 17 00:00:00 2001
+From 1e31f372966581f19bcbd9a39b29cf3dedfe9c5a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 26/33] Use correct pkg-config --static flag
+Subject: [PATCH 26/34] Use correct pkg-config --static flag
 
 ---
  configure.pri | 3 +++
@@ -22,5 +22,5 @@ index a05c3d98e6..8dc874a74d 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0027-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
index a8508251..3b75e887 100644
--- a/qt5-base/mingw-w64/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64/0027-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,7 +1,7 @@
-From 4f332ea7f376d8a77d7dbfe82ab6e5eb6b6f1fe9 Mon Sep 17 00:00:00 2001
+From 0f6a4852f4bf5d43aa856f2af475f5f526b76daf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 27/33] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic
 
 * Otherwise the arguments aren't passed correctly leading to errors like
   ```
@@ -70,5 +70,5 @@ index f5e7b7f050..18d120f0c7 100644
            MAIN_DEPENDENCY ${infile} VERBATIM)
          list(APPEND ${outfiles} ${outfile})
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0028-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64/0028-Ignore-errors-about-missing-feature-static.patch
index 104d9c20..803dfe38 100644
--- a/qt5-base/mingw-w64/0028-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64/0028-Ignore-errors-about-missing-feature-static.patch
@@ -1,7 +1,7 @@
-From a8039e2f388a3fbd289dc912ae6b6a58beb84f19 Mon Sep 17 00:00:00 2001
+From 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 28/33] Ignore errors about missing feature static
+Subject: [PATCH 28/34] 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 150d2b2cc3..d93d24cce5 100644
+index 76e1d15319..9a1c5cd8b6 100644
 --- a/mkspecs/features/qt_build_config.prf
 +++ b/mkspecs/features/qt_build_config.prf
-@@ -135,5 +135,5 @@ defineTest(qtConfig) {
+@@ -138,5 +138,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -21,10 +21,10 @@ index 150d2b2cc3..d93d24cce5 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 c00fdb73f8..d4d5599433 100644
+index 1903e509c8..1fcb597fa3 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -351,5 +351,5 @@ defineTest(qtConfig) {
+@@ -348,5 +348,5 @@ defineTest(qtConfig) {
          contains(QT.$${module}.disabled_features, $$1): \
              return(false)
      }
@@ -32,5 +32,5 @@ index c00fdb73f8..d4d5599433 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0029-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64/0029-Enable-and-fix-use-of-iconv.patch
index ddffbea3..128a1cf3 100644
--- a/qt5-base/mingw-w64/0029-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64/0029-Enable-and-fix-use-of-iconv.patch
@@ -1,7 +1,7 @@
-From 05738e526362a5c712d8341ada02e557e76579f5 Mon Sep 17 00:00:00 2001
+From 3a5569599bd8c5267e41c57917b19e16bba1169c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 29/33] Enable and fix use of iconv
+Subject: [PATCH 29/34] Enable and fix use of iconv
 
 Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
 ---
@@ -63,10 +63,10 @@ index d6362b6fbc..4da4546a24 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index a5b69a2df6..9e3eb4f671 100644
+index bf44f2649d..90f0450902 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
-@@ -428,9 +428,9 @@
+@@ -521,9 +521,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",
@@ -79,5 +79,5 @@ index a5b69a2df6..9e3eb4f671 100644
          },
          "icu": {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0030-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64/0030-Ignore-failing-pkg-config-test.patch
index cc89a8e3..4c8cc8f8 100644
--- a/qt5-base/mingw-w64/0030-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64/0030-Ignore-failing-pkg-config-test.patch
@@ -1,7 +1,7 @@
-From f99af5483b8c3d8b511db8476f4d738ff868886c Mon Sep 17 00:00:00 2001
+From e9f964d079c6dea6404f01d0d8f1acfa5287ccdc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 30/33] Ignore failing pkg-config test
+Subject: [PATCH 30/34] Ignore failing pkg-config test
 
 Didn't investigate why it fails, let's hope for the best
 ---
@@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
  1 file changed, 1 deletion(-)
 
 diff --git a/configure.json b/configure.json
-index 9914bf0487..d5b81d53f5 100644
+index d668ce0c98..2d36a60cd3 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -710,7 +710,6 @@
+@@ -725,7 +725,6 @@
          "pkg-config": {
              "label": "Using pkg-config",
              "autoDetect": "!config.darwin && !config.win32",
@@ -21,5 +21,5 @@ index 9914bf0487..d5b81d53f5 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 5fc9df50..e4349439 100644
--- a/qt5-base/mingw-w64/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,7 +1,7 @@
-From eadf27b8bd882899a99254578ecb8407a0acab6f Mon Sep 17 00:00:00 2001
+From d35384a8d6191d68f8cd2b60a2295f5372d67fa4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 31/33] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies
 
 In particular, it messes resolving cyclic dependency between
 static freetype2 and harfbuzz
@@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644
    static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
    for (int i = 0; lflags[i]; i++) {
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0032-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64/0032-Hardcode-linker-flags-for-platform-plugins.patch
index 5562bbf3..3d82dfff 100644
--- a/qt5-base/mingw-w64/0032-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64/0032-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,18 +1,16 @@
-From f7bb119102d28e22b764cce82ee491e747034247 Mon Sep 17 00:00:00 2001
+From aa947be7429528caf04ad7db6f077fe695bcfe82 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 32/33] Hardcode linker flags for platform plugins
+Subject: [PATCH 32/34] 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(-)
+ src/plugins/platforms/minimal/minimal.pro     | 15 +++++++++++--
+ src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++--
+ src/plugins/platforms/windows/windows.pro     | 32 +++++++++++++++++++--------
+ 3 files changed, 48 insertions(+), 13 deletions(-)
 
 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
 index 8cfb68824e..46834a71fc 100644
@@ -66,36 +64,47 @@ index 6652cefd86..a322b17cc5 100644
  DEFINES += QT_NO_FOREACH
  
 diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
-index 23168c10dc..eb4af726ca 100644
+index 174bc7b609..e66488e364 100644
 --- a/src/plugins/platforms/windows/windows.pro
 +++ b/src/plugins/platforms/windows/windows.pro
-@@ -1,11 +1,22 @@
+@@ -1,14 +1,28 @@
  TARGET = qwindows
  
- QT += \
+-QT += \
 -    core-private gui-private \
--    eventdispatcher_support-private accessibility_support-private \
+-    eventdispatcher_support-private \
 -    fontdatabase_support-private theme_support-private
-+    core-private gui-private
- 
+-
+-qtConfig(accessibility): QT += accessibility_support-private
+-qtConfig(vulkan): QT += vulkan_support-private
+-
 -LIBS += -lgdi32 -ldwmapi
++QT += core-private gui-private
++
 +# 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/$${QT_VERSION} \
-+    $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION} \
 +    $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \
 +    $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION}
++# Same for private support libs for accessibility and vulkan, if those are enabled
++qtConfig(accessibility) {
++    LIBS += -lQt5AccessibilitySupport
++    INCLUDEPATH += $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}
++}
++qtConfig(vulkan) {
++    LIBS += -lQt5VulkanSupport
++    INCLUDEPATH += $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}
++}
  
  include(windows.pri)
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0033-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64/0033-Fix-linking-against-static-plugins-with-qmake.patch
index 676a558c..d849f3d8 100644
--- a/qt5-base/mingw-w64/0033-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64/0033-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,7 +1,7 @@
-From b91d3a0690995511d1388b9d9493aed702bd0138 Mon Sep 17 00:00:00 2001
+From 7db753e04de6a458fc10124b7e3b12ac5f4d1623 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
-Subject: [PATCH 33/33] Fix linking against static plugins with qmake
+Subject: [PATCH 33/34] Fix linking against static plugins with qmake
 
 Required because qtConfig(static) does not work
 with 'Merge shared and static library trees'
@@ -33,5 +33,5 @@ index afaac3dbc4..82b02b5113 100644
          # Check if the plugin is known to Qt. We can use this to determine
          # the plugin path. Unknown plugins must rely on the default link path.
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-base/mingw-w64/0034-Don-t-use-the-statx-syscall.patch b/qt5-base/mingw-w64/0034-Don-t-use-the-statx-syscall.patch
new file mode 100644
index 00000000..56e0ca93
--- /dev/null
+++ b/qt5-base/mingw-w64/0034-Don-t-use-the-statx-syscall.patch
@@ -0,0 +1,27 @@
+From e8cbf42a882706cce93f46142748d252cb492e1c Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 9 Dec 2017 00:36:56 +0100
+Subject: [PATCH 34/34] Don't use the statx syscall
+
+Otherwise Qt can not be built in a systemd
+container
+---
+ src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index 77d154c6b4..6036bae4f1 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -95,7 +95,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp
+ { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
+ #  endif
+ 
+-#  if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE(<linux/stat.h>)
++#  if 0
+ #    include <linux/stat.h>
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+-- 
+2.15.1
+
diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD
index dd89f80b..5c450ae7 100644
--- a/qt5-base/mingw-w64/PKGBUILD
+++ b/qt5-base/mingw-w64/PKGBUILD
@@ -84,7 +84,7 @@ isNoOpenGL() {
 }
 
 pkgname=mingw-w64-qt5-base
-pkgver=5.9.2
+pkgver=5.10.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
@@ -92,14 +92,14 @@ 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-1.0' 'mingw-w64-dbus' 'mingw-w64-harfbuzz'
+         'mingw-w64-libpng' 'mingw-w64-openssl' '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')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
-_pkgfqn="qtbase-opensource-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+_pkgfqn="qtbase-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Add-profile-for-cross-compilation-with-mingw-w64.patch'
         '0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch'
         '0003-Use-external-ANGLE-library.patch'
@@ -132,41 +132,43 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
         '0030-Ignore-failing-pkg-config-test.patch'
         '0031-Prevent-qmake-from-messing-static-lib-dependencies.patch'
         '0032-Hardcode-linker-flags-for-platform-plugins.patch'
-        '0033-Fix-linking-against-static-plugins-with-qmake.patch')
-sha256sums=('7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b'
-            '685fd08e1c4e97bbf6990959cb3dbe88dd3ed494221400dce6aef159d277c34a'
-            '4e5115e62b952acface29882c5f6423569cd1c439c454e58594b5fb2cb740916'
-            '0b339563844ccd325486d78711592561996fb256f0612c63b33b6ea52a6fc77e'
-            '18945eb521df54d37922894c9bc82ccd03eb3fd9f6e0aed986facf2b49f336d4'
-            '2c2b5f9b3db02750ae9a9626ea8a24a3516c881c5eaa9b19fb9a2621fc1263fc'
-            '81559290cc03f7ff6042f28a6eb319882264876076a20e24531641ebe4ef3aee'
-            'a3d657ee7f8bfa6c3e5a4aa626710bc27fc82fea3d834098bde2b2f67244d11c'
-            '3df9bf81a936c737cc7ca53bdea9cfd2a4010fa190fe3e1a45611097d8213ef4'
-            '5aac41daaf223726d31ab5a7aec0bdc050aa182522ca732cc31c3b5ac8cd28dc'
-            '6844b7106e636d513b077edeba318990641b1ee294f2a70739830e3d0a9b0d02'
-            '12b51c32069270e49e05e64b0f54d6e3e871523660fd17673e0ee6e67206955e'
-            '4baa73f8b3d61b503a9de1437bdc9f7f84cd2443280afc1461456ae34d222e9b'
-            'e34eec672f9f681302edd809cbcb7d6848a310a02acc5711e2e348aab1b8d74c'
-            'd70f44c06a7bae6fbd91022ec79f09e2d658969aa5a6602bff6eb61076801b6e'
-            'f705fcfe1f552536318c2c63d59e5ec95640321d9f1fff1016a34d1bc862c9df'
-            '60034cce435d3eca60906e4af2f1ad55edd12b4e95ccc9905e793bc7b9d66917'
-            '295c307f6b075b0c20b7d714b6ecff1bc25927b80dd60d725052b4bc05d1b055'
-            '37c2d0bce780a15e7bdb477324936b1ae0ebe576c64d3a713a9086586518d50a'
-            '36b6a2e1d2bf478746e931da5223dcfeffc5eda513b64596ffbbd663fd5e63e7'
-            'e1b45c50ca09b065f218442a1fc3ddf3c8de1357a818925497fe0e3e7c28cacd'
-            '03feabae42553a6960c2a257eb951d956fe31a9a4440a92b373e8a0d6cb301ff'
-            '1ec8a7ebaf5e400aca7a0abe8cee78d0dae6b662c30bf245b81814cfcd048dd3'
-            'bc2f049471853a6bb2e83de3c2691a4206d55c7fe018bb7910215e9968759082'
-            '8611ac15ee36b803b5095466509c57d45532ab017d61513f2be7b34d5c13da0f'
-            'f999f20131f0180439b59320ab350a284b169e5ee5e21379fa74dc07d4aeda25'
-            'd9fed680c0313c89458361ac253a5710379fa8022c7c24b05d2807ecaf4f803a'
-            'd263509d7951f12d9ccfa841cd7f205aebc7b9db28913925b65a23e627258023'
-            '092176255153bae63f779833d25e5f64a2c489a1b6f33e8e158ff59629916b36'
-            '65023b59b41797281876b5fcd8cb1542ad790b9b6f83125b6b0aa1e02d9de4fb'
-            '3d5202be8837bccab4dedc9b6f10b3722ca57ea8b663e08b55d0235381397508'
-            '4df4c2ad348c13a3b82c3a9b127464492898379a82dfd6db9d3ff9d051a08dab'
-            'cfa48754bef9f7a95f1350c0c1ec1699c9dc413013ef78d218206f5d60335823'
-            '135123e630efdbeb6d4edc9bc200754f2c881760652fe5152f0903ae238ce2c9')
+        '0033-Fix-linking-against-static-plugins-with-qmake.patch'
+        '0034-Don-t-use-the-statx-syscall.patch')
+sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
+            'd2784f40a1f8f3f7041c94b89702404a21ef2fd1d6c63bbffe14e26321265745'
+            'c695a25e6dc0ddd8b1dd07adba6eee518294ffb69b689f373dde861f935c876b'
+            '4a7a855fe8abffe0aa3da450981439a1c26f7f65fe456149f627bccd603ad5b7'
+            '46a42a20a4bed03f9f0b7abd55904be3e560dfd4e10e586d68479a5060ce06e2'
+            '70550f6cbe95c5a14ccb7e9ba5fab7cb595a0fc49b889c9ac735cca41148ab5b'
+            'fa16872915ce6d24bc217ee7c5e42c3c61e29034f832e32f2971da85eb4f3d08'
+            '19b01e55dd3eb311c182d2ef682f15a2739556d5585d9e19de633e92dba9a788'
+            'e13936a6f7d17a6c38c95e9cc9e19209a3d03970cf5157931f309edf45530132'
+            '978a2f5a53c0fe50780a12c09bbc81ee8efe60d1437425b08b3c5b4a4edb217c'
+            '8ffb5f68ebe09e99580d45c1279dc39ef811d0de7e4d363173af3be2cf3c9ee8'
+            '305f18d1b011033fbb12ca544d3af47cb45a1b6d324bf68b671cb007dc2a8a0a'
+            '53fb05efee9c024643cd607c623eda745a122cddc2880d6554b3168778942316'
+            '927188133dc2708345f7c831e1253b59338a9554b544c1d2cfdf02493b92573f'
+            '125f0b758bf2088589a31ced00146dc2cce28fa93bdd84684857ae60850c96b8'
+            '016c3a2980060365dd7e83a001f274b6a7f736af2519fa7c5263b0def10e2703'
+            '48930971f0ce225795bd0b6292c4e3ad27843ec0c95113b95be44274435b6623'
+            'a6f8e6111b6960b86b347c3927251f41c8fa235aabf90e89965063326c7cedd3'
+            'a57e452177fd1aa7f0d22b1a83f29dd18010dfef7b007157a7dc8d6399232471'
+            '07b1ab8b25a02e1ed369017178847081afe937817e71384dfb17ab56ff278a0e'
+            '2b426ab2aa774110c2b628c4987748520925e7ebfda2f524407cdc606315696b'
+            'a78df9e2a5f3da89f944328a217ae5dd75fabd37f5b5c9ebc8eb75678f31910a'
+            '8470c121a04702b1a0ef4f52d310e69906bab0c066fcb6c7601bcb678655b959'
+            'ac09e38e4f555e5bae1bc0f01b70a67624b15ecf5affc06d85eaccbc85f3c1da'
+            '0c1939eff41143bc78a6bf6e8b51515f4ba68337b9723674e6e7ab696167edae'
+            'ed64b7a36a01d30bc9d35fed47186f9161e5ceba7dd92da7c60d288026fa8856'
+            '3f42240d83d09c62b8a7d9a98fe2d6a9d9fcf8ba6b5ff3d303a941411ef7d1a4'
+            'd44bdc6363d1e5e1cbcdb5b61e0a788a38368ab3090746c165981bd0a5eb0854'
+            '15c0691f6fd058bf70be79b221ab4ace66cc574728b68d9f15bafe1877f46266'
+            '05aec6b0c2d9add0e4181246b52096d4cf2f4176f4c0e9f467d5244492844c28'
+            'ed1237884607a368190cb1ac4de2a12f00e54ecfcea901c7f1980ac37b94b57b'
+            '4a83eb1549be9477bc002a6b939e24a6f1b6fd14bfcc804235771d484762aa3e'
+            'a100076b67008b64f73fd4fd4b131e1774b84b24b61198cabecdb5916d634887'
+            'fe9ecf6e82b64b3a955f688d51c87ca82a4aa4ad59e419c7c284ce18b72e223c'
+            'cbc0e2570ca5b52681d99ab15e7a7a79a286e498203d34c2d67493a78dd6b84d')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -232,8 +234,6 @@ build() {
   unset PKG_CONFIG_PATH
 
   for _arch in ${_architectures}; do
-    echo "INCLUDEPATH += /usr/${_arch}/include/openssl-1.0" >> src/network/network.pro
-
     # To prevent conflicts with the mingw-w64-qt4 package we have
     # to put tools in a dedicated folder
 
@@ -314,22 +314,26 @@ build() {
     # Fix MariaDB
     qt_configure_args+=" -I/usr/${_arch}/include/mariadb"
 
+    msg2 'Configure and build qmake'
     mkdir -p ../build-${_arch} && pushd ../build-${_arch}
     if isStatic; then
-      export OPENSSL_LIBS="/usr/${_arch}/lib/openssl-1.0/libssl.a /usr/${_arch}/lib/openssl-1.0/libcrypto.a -lws2_32 -lgdi32 -lcrypt32"
+      export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32"
       ../${_pkgfqn}/configure \
         $qt_configure_args \
         -static \
         -openssl-linked
+      msg2 'Build static Qt libraries'
       make
     else
       # The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared
       # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
       # libraries aren't installed at this point yet, we have to workaround this
-      ../${_pkgfqn}/configure $qt_configure_args \
+      ../${_pkgfqn}/configure \
+        $qt_configure_args \
         -shared \
         -openssl-runtime \
         -device-option 'CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build'
+      msg2 'Build shared Qt libraries'
       LD_LIBRARY_PATH="$PWD/lib" LDFLAGS="-L$PWD/lib" make
     fi
     popd
@@ -351,6 +355,7 @@ package() {
         "${pkgdir}/usr/${_arch}/lib/"{lib,}qt5main* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5AccessibilitySupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5DeviceDiscoverySupport* \
+        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EdidSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EventDispatcherSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FbSupport* \
         "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FontDatabaseSupport* \
diff --git a/qt5-canvas3d/mingw-w64/PKGBUILD b/qt5-canvas3d/mingw-w64/PKGBUILD
index 7f7102e6..e35111c9 100644
--- a/qt5-canvas3d/mingw-w64/PKGBUILD
+++ b/qt5-canvas3d/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtcanvas3d
 pkgname="mingw-w64-qt5-canvas3d"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="A JavaScript 3D rendering API for Qt Quick (mingw-w64)"
@@ -18,9 +18,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('84a8d66c2c35b67af84376037cac71fe77a105df09ffef7906a9cb1aeafb3eea')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('d289626f06236f2c0e3065416fd6a8a72b8895cb5253ee2d9b6320df5b452987')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-charts/mingw-w64/PKGBUILD b/qt5-charts/mingw-w64/PKGBUILD
index a30ac0b8..3e079ba5 100644
--- a/qt5-charts/mingw-w64/PKGBUILD
+++ b/qt5-charts/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtcharts
 pkgname="mingw-w64-qt5-charts"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Provides a set of easy to use chart components (mingw-w64)"
@@ -19,9 +19,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('4e7af70a73828ee1eb9606bd2c071cc7347c5f928aaf07b420dce7376b1c6aa4')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('12ce2c4a8467d349ecfdba831cc03c539f2b207aa21082a4e1043dcf8f1b31ef')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-connectivity/mingw-w64/PKGBUILD b/qt5-connectivity/mingw-w64/PKGBUILD
index 8047c808..e5cad433 100644
--- a/qt5-connectivity/mingw-w64/PKGBUILD
+++ b/qt5-connectivity/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtconnectivity
 pkgname="mingw-w64-qt5-connectivity"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
@@ -18,9 +18,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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")
-sha256sums=('2c759597ec959d54f29a3f628896d9208cf1f4e2269d8e01a9d3036f6995f3cc')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('2e3fe2e872449065ec3326955fb97c629106f62b9441e8dfd2e0adfc9fb169a6')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD b/qt5-datavis3d/mingw-w64/PKGBUILD
index 0ea8e7e3..120fec11 100644
--- a/qt5-datavis3d/mingw-w64/PKGBUILD
+++ b/qt5-datavis3d/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtdatavis3d
 pkgname="mingw-w64-qt5-datavis3d"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Qt Data Visualization module (mingw-w64)"
@@ -19,9 +19,9 @@ license=('GPL3' 'LGPL' 'FDL' 'custom')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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")
-sha256sums=('06ae5699872d048e8bb99464c420db3749c8b7601e9f855ce8b1e156d792b2b2')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('9206c4d7a093a20b57d0e5013aadd6fc52bccb321eb0d3329efccc44481f6618')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-declarative/apple-darwin/PKGBUILD b/qt5-declarative/apple-darwin/PKGBUILD
index 05522220..228afeee 100644
--- a/qt5-declarative/apple-darwin/PKGBUILD
+++ b/qt5-declarative/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qtdeclarative
 pkgname='apple-darwin-qt5-declarative'
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="Classes for QML and JavaScript languages (apple-darwin)"
@@ -15,9 +15,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('apple-darwin-qt5')
 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")
-sha256sums=('d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff'
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('5ccb4dbca5046554037bcffbb05918f6efcff321c44cd1c39b1c47be7e67711e'
             'd93731901616f494b5474cf78ec938c4c7e9e79a088457275b97f1f65cc82fe3')
 _architectures='x86_64-apple-darwin15'
 _configurations+=('CONFIG+=static')
diff --git a/qt5-declarative/mingw-w64/0001-Build-QML-dev-tools-as-shared-library.patch b/qt5-declarative/mingw-w64/0001-Build-QML-dev-tools-as-shared-library.patch
index 946ca5a4..958b9b35 100644
--- a/qt5-declarative/mingw-w64/0001-Build-QML-dev-tools-as-shared-library.patch
+++ b/qt5-declarative/mingw-w64/0001-Build-QML-dev-tools-as-shared-library.patch
@@ -1,4 +1,4 @@
-From 4924f5854a96eda470551762f90b64102de2a9cf Mon Sep 17 00:00:00 2001
+From cea3fc4942ec18a3d409bcabe4b57f80eec401be Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:24:15 +0200
 Subject: [PATCH 1/3] Build QML dev tools as shared library
@@ -23,5 +23,5 @@ index a21988b91..fc5c4d05d 100644
  MODULE_INCNAME = QtQml
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch b/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch
index b6076725..dfc64b15 100644
--- a/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch
+++ b/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From 0c0ffb778f79e2345dd6f0bbcdae8a374a34848c Mon Sep 17 00:00:00 2001
+From d4e3a5a7796274b3e3fdf083ebc4700c007bef83 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 23 Oct 2016 01:18:13 +0200
 Subject: [PATCH 2/3] Ensure static plugins are exported
@@ -18,5 +18,5 @@ index 9ddb9885c..9775d85e0 100644
  foreach(_other_plugin ${_qt5qml_other_plugins})
      include(${_other_plugin} OPTIONAL)
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
index 3c2624ff..d3c179b5 100644
--- a/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+++ b/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@@ -1,4 +1,4 @@
-From dca2e22e736445ae2acf463236bb66e60a072632 Mon Sep 17 00:00:00 2001
+From 1752086b718718c0b7364bb72245c4bb9b1aeba5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 4 Feb 2017 01:59:59 +0100
 Subject: [PATCH 3/3] Prevent exporting QML parser symbols on static build
@@ -33,5 +33,5 @@ index 0e195994b..8aa451e9d 100644
  #      define QML_PARSER_EXPORT
  #    elif defined(QT_BUILD_QML_LIB)
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD
index 583db470..6a4098e3 100755
--- a/qt5-declarative/mingw-w64/PKGBUILD
+++ b/qt5-declarative/mingw-w64/PKGBUILD
@@ -12,7 +12,7 @@
 
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
@@ -22,15 +22,15 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Build-QML-dev-tools-as-shared-library.patch'
         '0002-Ensure-static-plugins-are-exported.patch'
         '0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch')
-sha256sums=('0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08'
-            '0a9cca3ab4a5cded2a5b13f398cce19cbe8e84bb8c1d99bc3f3bb7715b1f4cb0'
-            'c3fa3cb98077531c373c8232c5b3b03e548aefbfecc11dd3a03cbf4ec3100838'
-            'd865f272436b47e027e9ad380fff1c134fe0396e446e7601cb5a59445aba79c4')
+sha256sums=('5ccb4dbca5046554037bcffbb05918f6efcff321c44cd1c39b1c47be7e67711e'
+            '8923258b451a885b2300169864a43e944f951963455da1c79b5f06693323be7d'
+            'b9a5545eb33621deb61676e9000fc0417d0b1e419143bc276174c34545d6b562'
+            'df36a5b2a09c46b415d92e7aa1f9fe587ddd1fc58a4ccfb269661cd338414089')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-gamepad/mingw-w64/PKGBUILD b/qt5-gamepad/mingw-w64/PKGBUILD
index 90e6dbe0..772d7891 100644
--- a/qt5-gamepad/mingw-w64/PKGBUILD
+++ b/qt5-gamepad/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtgamepad
 pkgname="mingw-w64-qt5-gamepad"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)"
@@ -19,9 +19,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('76d1e90d9015a189b6d77b3eeac1a8927cdb6a6d92b574d847f9387d07d9a552')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('537550f988a71942392b3df21044e4cd566378bad2d9727663c9e8e7743e87e6')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD
index fa716bc6..75b84391 100644
--- a/qt5-graphicaleffects/mingw-w64/PKGBUILD
+++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtgraphicaleffects
 pkgname="mingw-w64-qt5-graphicaleffects"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)"
@@ -20,9 +20,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('14594e7eb4b704dd69bf336828306fe8e6537c321d49ee0b701b3b1cdd8bfb76')
+_pkgfqn="${_qt_module}-everywhere-src-$pkgver"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('97b969112f21161fc924c1b1c98f1dad2bf7027e31b27ea9eec532db7b045e30')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-imageformats/apple-darwin/PKGBUILD b/qt5-imageformats/apple-darwin/PKGBUILD
index b0c62bea..20005078 100644
--- a/qt5-imageformats/apple-darwin/PKGBUILD
+++ b/qt5-imageformats/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qtimageformats
 pkgname='apple-darwin-qt5-imageformats'
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (apple-darwin)"
@@ -19,8 +19,8 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('apple-darwin-qt5')
 license=('GPL3' 'LGPL' '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")
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('79fee307310a66100bd3d907ea69bd039dcd727c15f27e990167e7a27d1b8a47')
 _architectures='x86_64-apple-darwin15'
 _configurations+=('CONFIG+=static')
diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD
index 18c822b8..75ba77a5 100644
--- a/qt5-imageformats/mingw-w64/PKGBUILD
+++ b/qt5-imageformats/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtimageformats
 pkgname="mingw-w64-qt5-imageformats"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)"
@@ -24,9 +24,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('3a626ca0ac7ffc56b59c4b3f66aac6bc76954054cedb6938b961562228eb9df3')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('91bfb884f965af6d6c187f8ac4f9bb1f9fe0af59cbbe36e035ee5f5510b7f4fc')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch b/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
index 1894839c..6ef34ea6 100644
--- a/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
+++ b/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
@@ -1,7 +1,7 @@
-From 75e1f8c1e4a3dffed27bbe6e82c940b8201457c9 Mon Sep 17 00:00:00 2001
+From 3912c09ab1d9fc9659765fd7db3fe7161e203320 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 22 Dec 2016 22:30:59 +0100
-Subject: [PATCH 1/2] Ensure static 3rdparty libs are linked correctly
+Subject: [PATCH] Ensure static 3rdparty libs are linked correctly
 
 Not sure whether this is still required in Qt 5.9.0
 ---
@@ -23,5 +23,5 @@ index dec1149b..ad57a5c5 100644
      plugin.json \
      qmldir
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-location/mingw-w64/0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch b/qt5-location/mingw-w64/0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch
deleted file mode 100644
index cf730a4d..00000000
--- a/qt5-location/mingw-w64/0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d3a663e73d22975ab1705e02bf981e451f1241dd Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 4 Jun 2017 00:37:16 +0200
-Subject: [PATCH 2/2] Enforce use of ANGLE in Mapbox GL plugin
-
-* Otherwise the build of qtlocation will fail
-  when Qt is configured for 'desktop OpenGL'
-* Requires ANGLE libraries present at build
-  time and to use the plugin
----
- src/plugins/geoservices/mapboxgl/mapboxgl.pro | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/geoservices/mapboxgl/mapboxgl.pro b/src/plugins/geoservices/mapboxgl/mapboxgl.pro
-index f35f26dc..2ff41608 100644
---- a/src/plugins/geoservices/mapboxgl/mapboxgl.pro
-+++ b/src/plugins/geoservices/mapboxgl/mapboxgl.pro
-@@ -38,11 +38,10 @@ qtConfig(icu) {
-     include(../../../3rdparty/icu_dependency.pri)
- }
- 
--# When building for Windows with dynamic OpenGL, this plugin
--# can only run with ANGLE because Mapbox GL requires at least
-+# Enforce use of ANGLE because Mapbox GL requires at least
- # OpenGL ES and does not use QOpenGLFunctions for resolving
- # the OpenGL symbols. -lopengl32 only gives OpenGL 1.1.
--win32:qtConfig(dynamicgl) {
-+win32:!qtConfig(angle) {
-     qtConfig(combined-angle-lib): LIBS_PRIVATE += -l$${LIBQTANGLE_NAME}
-     else: LIBS_PRIVATE += -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME}
- }
--- 
-2.14.2
-
diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD
index 18944a38..f7ffa03f 100644
--- a/qt5-location/mingw-w64/PKGBUILD
+++ b/qt5-location/mingw-w64/PKGBUILD
@@ -7,26 +7,28 @@
 # Includes dynamic and static versions; if only one version is requried, just
 # set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
 
+# Skip building mapboxgl as it increases compile time significantly and
+# likely not a lot of people actually using it; if you need it, just remove the
+# following line:
+_mapboxcfg='QT.global.disabled_features+=geoservices_mapboxgl'
+
 _qt_module=qtlocation
 pkgname=mingw-w64-qt5-location
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)'
 depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative')
-makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-angleproject')
-optdepends=('mingw-w64-angleproject: Mapbox GL plugin')
+makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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"
-        '0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch'
-        '0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch')
-sha256sums=('c81a42e44ebd4e9c33f7195e86af3deab9fde72ef0ad8dcb04acee250d356b0c'
-            '888b3f9c8f6765abf66f67fa0f4931ef9713462a33cd9c4b583bf6dcdc431097'
-            '6dcd0992504153a7f720ff46c4998717d4db74e69f88295d2de8fc1cb981d4d1')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+        '0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch')
+sha256sums=('d84dcec7cfbc99a13e048f935783b0c2e1cb540defc82d77ac869a5b76aa85c7'
+            'a4380c11444f11f79f5c78d76121e45aa27add611bc53204bb867fdf0832888c')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
@@ -52,7 +54,7 @@ build() {
     for _config in "${_configurations[@]}"; do
       msg2 "Building ${_config##*=} version for ${_arch}"
       mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
-      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config}
+      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_mapboxcfg}
       make
       popd
     done
diff --git a/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch b/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
index 30583753..b5285fee 100644
--- a/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
+++ b/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
@@ -1,4 +1,4 @@
-From b6482345c48aa2a0cc15064246c06964322b8572 Mon Sep 17 00:00:00 2001
+From b8444c5857432101b58cba43d43906b903da77ff Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:36:56 +0200
 Subject: [PATCH 1/2] Recorder includes to prevent conflict with vsnprintf
@@ -37,5 +37,5 @@ index 5f391710..3ae3b8aa 100644
  
  QT_BEGIN_NAMESPACE
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch b/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch
index cea4ab90..15b7d312 100644
--- a/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch
+++ b/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch
@@ -1,4 +1,4 @@
-From 81791388b2bf15a35d64c0ec2d7d382cd5bdb255 Mon Sep 17 00:00:00 2001
+From bb44cfccb2ff6cb24f16293e874d3ff335b17b51 Mon Sep 17 00:00:00 2001
 From: Jose Santiago <jsantiago@haivision.com>
 Date: Thu, 3 Nov 2016 14:36:10 -0500
 Subject: [PATCH 2/2] Fix build with ANGLE
@@ -8,14 +8,14 @@ Subject: [PATCH 2/2] Fix build with ANGLE
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/plugins/common/evr/evrd3dpresentengine.cpp b/src/plugins/common/evr/evrd3dpresentengine.cpp
-index 043d0ad7..bdf25a9c 100644
+index fd9ccdef..bdf25a9c 100644
 --- a/src/plugins/common/evr/evrd3dpresentengine.cpp
 +++ b/src/plugins/common/evr/evrd3dpresentengine.cpp
 @@ -49,9 +49,9 @@
  #include <private/qmediaopenglhelper_p.h>
  
  #ifdef MAYBE_ANGLE
--# include <qtgui/qguiapplication.h>
+-# include <qguiapplication.h>
 -# include <qpa/qplatformnativeinterface.h>
 -# include <qopenglfunctions.h>
 +# include <QtGui/qguiapplication.h>
@@ -25,5 +25,5 @@ index 043d0ad7..bdf25a9c 100644
  #endif
  
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD
index c786a5f4..b75f173c 100644
--- a/qt5-multimedia/mingw-w64/PKGBUILD
+++ b/qt5-multimedia/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
@@ -20,13 +20,13 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch'
         '0002-Fix-build-with-ANGLE.patch')
-sha256sums=('c9a62700024871f204e5f107894c3a339bd645bf6dbac2bcf1bff8ce46842520'
-            'f915b6feb5eb1254e33667556ebda15df73b07bab9f8bf0d57325f48d262ef62'
-            '53c8e9cc9b7ba69d87d6ab668bf0414e20e5c3d79a156dce35746deaafa8a8ad')
+sha256sums=('008333fdc3bc2d87977392397d38ebaae1329059997319cb1b0613fb6489806f'
+            '18df01e77021563ade5cd1a10efd053ce635c1ee3d81fe41ba9549aab1201fbe'
+            '54e4dd97457b1b9a9f061268daefaaea5ab64b752039a7a295107dad39093d6d')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-networkauth/mingw-w64/PKGBUILD b/qt5-networkauth/mingw-w64/PKGBUILD
new file mode 100644
index 00000000..9346da24
--- /dev/null
+++ b/qt5-networkauth/mingw-w64/PKGBUILD
@@ -0,0 +1,68 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+# Includes dynamic and static versions; if only one version is requried, just
+# set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
+
+_qt_module=qtnetworkauth
+pkgname="mingw-w64-qt5-networkauth"
+pkgver=5.10.0
+pkgrel=1
+arch=('any')
+pkgdesc="Network authentication module (mingw-w64)"
+depends=('mingw-w64-qt5-base')
+optdepends=()
+makedepends=('mingw-w64-gcc')
+options=('!strip' '!buildflags' 'staticlibs')
+groups=('mingw-w64-qt5')
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+url='https://www.qt.io/'
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('ecdafbe8fabce386f1aab2bcf6a0d9fd6a1a9083b1554645bc45267f7188d8d2')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+[[ $NO_STATIC_LIBS ]] || \
+  makedepends+=('mingw-w64-qt5-base-static') \
+  optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
+  _configurations+=('CONFIG+=static')
+[[ $NO_SHARED_LIBS ]] || \
+  _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
+
+build() {
+  cd "${srcdir}/${_pkgfqn}"
+
+  for _arch in ${_architectures}; do
+    for _config in "${_configurations[@]}"; do
+      msg2 "Building ${_config##*=} version for ${_arch}"
+      mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
+      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config}
+      make
+      popd
+    done
+  done
+}
+
+package() {
+  cd "${srcdir}/${_pkgfqn}"
+
+  for _arch in ${_architectures}; do
+    for _config in "${_configurations[@]}"; do
+      pushd build-${_arch}-${_config##*=}
+
+      make INSTALL_ROOT="$pkgdir" install
+      find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
+      [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
+        find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \; || \
+        find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip --strip-all {} \;
+      find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
+      find "${pkgdir}/usr/${_arch}" -name "*.a" -exec ${_arch}-strip -g {} \;
+      [[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \
+        find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
+      find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
+      popd
+    done
+  done
+}
diff --git a/qt5-quick1/mingw-w64/PKGBUILD b/qt5-quick1/mingw-w64/PKGBUILD
index d4b1dfbb..60b94d64 100644
--- a/qt5-quick1/mingw-w64/PKGBUILD
+++ b/qt5-quick1/mingw-w64/PKGBUILD
@@ -20,8 +20,8 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL')
 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")
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
 md5sums=('46a61a405844cbe88a754127422f6b6d')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD
index f47917ae..e7d56e4a 100644
--- a/qt5-quickcontrols/mingw-w64/PKGBUILD
+++ b/qt5-quickcontrols/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtquickcontrols
 pkgname="mingw-w64-qt5-quickcontrols"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
@@ -20,9 +20,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('5f09ecf8648acd8abed20d727b8517e0c53cf945e83a992ee58d4baadd84bd1f')
+_pkgfqn="${_qt_module}-everywhere-src-$pkgver"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('a133ef7724d5d2eef4085920d463af78024f327d0ae320f24202a51b554e6129')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD b/qt5-quickcontrols2/mingw-w64/PKGBUILD
index 0416472f..6e56d7b5 100644
--- a/qt5-quickcontrols2/mingw-w64/PKGBUILD
+++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtquickcontrols2
 pkgname="mingw-w64-qt5-quickcontrols2"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
@@ -20,9 +20,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('2b55dd3dd53b4a6abb0ceb74b7fb98a5e52e9056c71a6cdbaead5cdf9d1ac8d2')
+_pkgfqn="${_qt_module}-everywhere-src-$pkgver"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('818770247a3a211714dfc17f7f5a07c6cf49999ff405d36fd00fab1d5559a1a1')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD b/qt5-remoteobjects/mingw-w64/PKGBUILD
new file mode 100644
index 00000000..60b2ff65
--- /dev/null
+++ b/qt5-remoteobjects/mingw-w64/PKGBUILD
@@ -0,0 +1,77 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+# Includes dynamic and static versions; if only one version is requried, just
+# set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
+
+_qt_module=qtremoteobjects
+pkgname="mingw-w64-qt5-remoteobjects"
+pkgver=5.10.0
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)"
+depends=('mingw-w64-qt5-base')
+optdepends=('mingw-w64-qt5-declarative: QML bindings')
+makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative')
+options=('!strip' '!buildflags' 'staticlibs')
+groups=('mingw-w64-qt5')
+license=('GPL3' 'LGPL' 'FDL' 'custom')
+url='https://www.qt.io/'
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('df36a69fdbedf9e3612b60a22222c44a4b227d09be6f543e478dac8ea70f6e05')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+[[ $NO_STATIC_LIBS ]] || \
+  makedepends+=('mingw-w64-qt5-base-static') \
+  optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
+  _configurations+=('CONFIG+=static')
+[[ $NO_SHARED_LIBS ]] || \
+  _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
+
+build() {
+  cd "${srcdir}/${_pkgfqn}"
+
+  for _arch in ${_architectures}; do
+    for _config in "${_configurations[@]}"; do
+      msg2 "Building ${_config##*=} version for ${_arch}"
+      mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
+      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config}
+
+      # Search paths for host standard library (/usr/lib) and for Qt5Bootstrap (/usr/$_arch/lib) are not set correctly by qmake
+      # hence we need insert those paths manually
+      make qmake_all
+      find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5QmlDevTools -lQt5Bootstrap|-L/usr/lib /usr/$_arch/lib/libQt5QmlDevTools.so /usr/$_arch/lib/libQt5Bootstrap.so|g" {} \;
+      find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5QmlDevTools|-L/usr/lib /usr/$_arch/lib/libQt5QmlDevTools.so|g" {} \;
+      find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5Bootstrap|-L/usr/lib /usr/$_arch/lib/libQt5Bootstrap.so|g" {} \;
+      find . -type f -iname 'Makefile' -exec sed -i "s|-lQt5Bootstrap ||g" {} \;
+
+      make
+      popd
+    done
+  done
+}
+
+package() {
+  cd "${srcdir}/${_pkgfqn}"
+
+  for _arch in ${_architectures}; do
+    for _config in "${_configurations[@]}"; do
+      pushd build-${_arch}-${_config##*=}
+
+      make INSTALL_ROOT="$pkgdir" install
+      find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
+      [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
+        find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \; || \
+        find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip --strip-all {} \;
+      find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
+      find "${pkgdir}/usr/${_arch}" -name "*.a" -exec ${_arch}-strip -g {} \;
+      [[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \
+        find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
+      find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
+      popd
+    done
+  done
+}
diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD
index 0a72d892..952c7435 100644
--- a/qt5-script/mingw-w64/PKGBUILD
+++ b/qt5-script/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtscript
 pkgname="mingw-w64-qt5-script"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)"
@@ -20,9 +20,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('47807db5c2684609a0252601fda0a153530a2c97abb8c96df30f4e7897cd40f1')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('6cf2f2f09ccafa9c9cd5d16641ae2b75b7f98947de6ec0ec1717489f3a09cafc')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-scxml/mingw-w64/PKGBUILD b/qt5-scxml/mingw-w64/PKGBUILD
index cf79a8ee..e23b7969 100644
--- a/qt5-scxml/mingw-w64/PKGBUILD
+++ b/qt5-scxml/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtscxml
 pkgname="mingw-w64-qt5-scxml"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)"
@@ -20,9 +20,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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")
-sha256sums=('9d2b1292bc632305aa1963bfbfc06e8b4489ca0f9ed380ea6410c9dc38aeb15d')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('4bbb19d6b169ab04aec62d09ed4324639cda13d2c25cf584c9061c5d9af65890')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD
index 0f5747cc..5eb68ed8 100644
--- a/qt5-sensors/mingw-w64/PKGBUILD
+++ b/qt5-sensors/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtsensors
 pkgname=mingw-w64-qt5-sensors
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)"
@@ -21,9 +21,9 @@ groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 groups=('mingw-w64-qt5')
 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")
-sha256sums=('79441588c9c8bd1b34b91481441614077ea335a0005e79a1dc68ad964284b5d3')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('cd98c5afb25bdb243b03a8e1da1a9643fbad334549c8128328446d0818fe3971')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD
index c15d5c57..093dac56 100644
--- a/qt5-serialport/mingw-w64/PKGBUILD
+++ b/qt5-serialport/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtserialport
 pkgname="mingw-w64-qt5-serialport"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)"
@@ -19,9 +19,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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/qtserialport-opensource-src-$pkgver.tar.xz")
-sha256sums=('50ed9cc22db1615bc00267d24b0819813b854af3651ab6e5ffaa7f7c7e62cd42')
+_pkgfqn="${_qt_module}-everywhere-src-$pkgver"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('e580fed9ffd2a978df72775205a96b21d619b5fd5f5754f653864a206e831457')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-speech/mingw-w64/PKGBUILD b/qt5-speech/mingw-w64/PKGBUILD
new file mode 100644
index 00000000..63362b79
--- /dev/null
+++ b/qt5-speech/mingw-w64/PKGBUILD
@@ -0,0 +1,71 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+# Includes dynamic and static versions; if only one version is requried, just
+# set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
+
+_qt_module=qtspeech
+pkgname="mingw-w64-qt5-speech"
+pkgver=5.10.0
+pkgrel=1
+arch=('any')
+pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)"
+depends=('mingw-w64-qt5-multimedia')
+optdepends=()
+makedepends=('mingw-w64-gcc')
+# mingw-w64-flite and mingw-w64-speech-dispatcher are currently not available
+#optdepends=('mingw-w64-flite: flite TTS backend' 'mingw-w64-speech-dispatcher: speech-dispatcher TTS backend')
+#makedepends=('mingw-w64-gcc' 'mingw-w64-flite' 'mingw-w64-speech-dispatcher')
+options=('!strip' '!buildflags' 'staticlibs')
+groups=('mingw-w64-qt5')
+license=('GPL3' 'LGPL' 'FDL' 'custom')
+url='https://www.qt.io/'
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('79159e1a9502ccb67145e0f6bdc43e3c2248835ff22be04a10c18db15a845ac1')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+[[ $NO_STATIC_LIBS ]] || \
+  makedepends+=('mingw-w64-qt5-base-static') \
+  optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
+  _configurations+=('CONFIG+=static')
+[[ $NO_SHARED_LIBS ]] || \
+  _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
+
+build() {
+  cd "${srcdir}/${_pkgfqn}"
+
+  for _arch in ${_architectures}; do
+    for _config in "${_configurations[@]}"; do
+      msg2 "Building ${_config##*=} version for ${_arch}"
+      mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
+      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config}
+      make
+      popd
+    done
+  done
+}
+
+package() {
+  cd "${srcdir}/${_pkgfqn}"
+
+  for _arch in ${_architectures}; do
+    for _config in "${_configurations[@]}"; do
+      pushd build-${_arch}-${_config##*=}
+
+      make INSTALL_ROOT="$pkgdir" install
+      find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
+      [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
+        find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \; || \
+        find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip --strip-all {} \;
+      find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
+      find "${pkgdir}/usr/${_arch}" -name "*.a" -exec ${_arch}-strip -g {} \;
+      [[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \
+        find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
+      find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
+      popd
+    done
+  done
+}
diff --git a/qt5-svg/apple-darwin/PKGBUILD b/qt5-svg/apple-darwin/PKGBUILD
index b50c1ca9..9be7de58 100644
--- a/qt5-svg/apple-darwin/PKGBUILD
+++ b/qt5-svg/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qtsvg
 pkgname='apple-darwin-qt5-svg'
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for displaying the contents of SVG files (apple-darwin)"
@@ -15,9 +15,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('apple-darwin-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('99f294f874b13553e4ed49cd9465580ad0c9b92e29cdfa47b2e4096835c1e2e5')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('4a2aa7cae70a3156846655422b9ed884d8b08b3707b95858e49c7cf9afe5e7b0')
 _architectures='x86_64-apple-darwin15'
 _configurations+=('CONFIG+=static')
 _osxcrossprefix='/opt/osxcross'
diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD
index 58abc613..81a5aa00 100644
--- a/qt5-svg/mingw-w64/PKGBUILD
+++ b/qt5-svg/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtsvg
 pkgname="mingw-w64-qt5-svg"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)"
@@ -19,9 +19,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('ba96ebfbb60d2793547295b7122a127d21ba44cf586bfd3c8212c59d68661108')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('4a2aa7cae70a3156846655422b9ed884d8b08b3707b95858e49c7cf9afe5e7b0')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-tools/apple-darwin/PKGBUILD b/qt5-tools/apple-darwin/PKGBUILD
index 12299149..b9c9a3d7 100644
--- a/qt5-tools/apple-darwin/PKGBUILD
+++ b/qt5-tools/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qttools
 pkgname="apple-darwin-qt5-tools"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; apple-darwin)"
@@ -15,10 +15,10 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('apple-darwin-qt5')
 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"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Fix-linguist-macro.patch')
-sha256sums=('c4eb56cf24a75661b8317b566be37396c90357b4f6730ef12b8c97a7079ca0e8'
+sha256sums=('1ff5dc747b7935de85257673424dfdffb231f3409f09a5f833d37e2f625cfe32'
             'de1f0114b723d07f1c7a2c11c15e8c5b05852c690e3a36d3f65f3a411fd81127')
 _architectures='x86_64-apple-darwin15'
 _configurations+=('CONFIG+=static')
diff --git a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch
index 924cbd2e..0402cd05 100644
--- a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch
+++ b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch
@@ -1,4 +1,4 @@
-From 151ff9811016c842533b36a091fad2bcb804aa28 Mon Sep 17 00:00:00 2001
+From 03b30c2afe26f192890c741785b072671282caf4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:44:42 +0200
 Subject: [PATCH 1/2] Fix linguist macro
@@ -38,5 +38,5 @@ index 6013cc6e..2e797326 100644
              DEPENDS ${_abs_FILE} VERBATIM
          )
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-tools/mingw-w64/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch b/qt5-tools/mingw-w64/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch
index 048895c3..f2ab1de7 100644
--- a/qt5-tools/mingw-w64/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch
+++ b/qt5-tools/mingw-w64/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch
@@ -1,4 +1,4 @@
-From b9026077022561e57a47e69bab84dc547344d0ab Mon Sep 17 00:00:00 2001
+From 0521fdd2a6c98c63117345fcf320d1a868153373 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 15 Oct 2017 22:25:22 +0200
 Subject: [PATCH 2/2] Prevent linking qhelpconverter against static bearer
@@ -27,5 +27,5 @@ index d60aae7c..99943618 100644
  SOURCES += conversionwizard.cpp \
             inputpage.cpp \
 -- 
-2.14.2
+2.15.1
 
diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD
old mode 100644
new mode 100755
index a6ba5e2a..4fe00a66
--- a/qt5-tools/mingw-w64/PKGBUILD
+++ b/qt5-tools/mingw-w64/PKGBUILD
@@ -16,7 +16,7 @@
 
 _qt_module=qttools
 pkgname="mingw-w64-qt5-tools"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"
@@ -26,17 +26,17 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Fix-linguist-macro.patch'
         '0002-Prevent-linking-qhelpconverter-against-static-bearer.patch')
-sha256sums=('2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a'
-            '76cc91d9b26bc89365ab84bffa20a1ab1f92eb1771c3250914997ffa30628ba0'
-            'c04718ab919840800149d927d0741c27d8e0703a103f592806935323b75b775c')
+sha256sums=('1ff5dc747b7935de85257673424dfdffb231f3409f09a5f833d37e2f625cfe32'
+            'b56db6e1c9aae96ec1fa6949481155972bfd05f0c9b2ffff2ae2216efb459132'
+            '9395445dd8a9eba7f9b14b3643fdd7e2f0175aa92b1658c6aef9425cb303588c')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
-# can not use static MySQL plugin because mariadb-connector-c uses already OpenSSL 1.1 -> Qt 5.10 will fix this
-# for now, disable linking against that plugin (by adding other SQL plugins explicitely)
+# can not use static MySQL plugin because mariadb-connector-c comes with its own pthread implementation
+# which has conflicting symbols with the pthread library Qt uses
 [[ $NO_STATIC_LIBS ]] || \
   makedepends+=('mingw-w64-qt5-base-static') \
   optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
diff --git a/qt5-translations/apple-darwin/PKGBUILD b/qt5-translations/apple-darwin/PKGBUILD
index 7e4fc720..e4c82a5e 100644
--- a/qt5-translations/apple-darwin/PKGBUILD
+++ b/qt5-translations/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qttranslations
 pkgname='apple-darwin-qt5-translations'
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="A cross-platform application and UI framework (translations, apple-darwin)"
@@ -15,9 +15,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('apple-darwin-qt5')
 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")
-sha256sums=('4a12528a14ed77f31672bd7469cad30624e7b672f241b8f19ad59510298eb269')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('ec4dbd3601afe06d1814f4bc81af9cffbbe7de2b9f4aef4eb4595b049c8eb9be')
 _architectures='x86_64-apple-darwin15'
 _configurations+=('CONFIG+=static')
 _osxcrossprefix='/opt/osxcross'
diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD
index f9d1dbdb..9c52a87d 100644
--- a/qt5-translations/mingw-w64/PKGBUILD
+++ b/qt5-translations/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qttranslations
 pkgname="mingw-w64-qt5-translations"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="A cross-platform application and UI framework (translations, mingw-w64)"
@@ -19,9 +19,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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")
-sha256sums=('5df16ddf9da0f42a3040aef2a92ad7da67381e2e4c132632fddf3a7a8026d12f')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('ec4dbd3601afe06d1814f4bc81af9cffbbe7de2b9f4aef4eb4595b049c8eb9be')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD b/qt5-virtualkeyboard/mingw-w64/PKGBUILD
index 301413a7..a281a765 100644
--- a/qt5-virtualkeyboard/mingw-w64/PKGBUILD
+++ b/qt5-virtualkeyboard/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtvirtualkeyboard
 pkgname="mingw-w64-qt5-virtualkeyboard"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Virtual keyboard framework (translations, mingw-w64)"
@@ -20,9 +20,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3')
 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")
-sha256sums=('e836ca0348b21df28635e541713726444abed7b53a0acf3358cc90532e64c6fc')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('2c2ddd65a335ecdd15e9ff1032a1634330e0d2359760f2a968b21dbc9f4e0b57')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD
index a18eb18c..8aa9ffa9 100644
--- a/qt5-webchannel/mingw-w64/PKGBUILD
+++ b/qt5-webchannel/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtwebchannel
 pkgname=mingw-w64-qt5-webchannel
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)'
@@ -18,10 +18,10 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 groups=('mingw-w64-qt5')
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('9c1b4defecadd7f9ee15d5815d464abef0961fc565cc7831720fc7c0c0d13a26')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('f22424dc6235110bb7f587b01ce692738af1497fba2a9739fa90a5e57ba135a3')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-webengine/mingw-w64-git/PKGBUILD b/qt5-webengine/mingw-w64-git/PKGBUILD
index b6d953e1..6a73027a 100644
--- a/qt5-webengine/mingw-w64-git/PKGBUILD
+++ b/qt5-webengine/mingw-w64-git/PKGBUILD
@@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('LGPL3' 'LGPL2.1' 'BSD')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 groups=('mingw-w64-qt5')
 source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#branch=dev)
 md5sums=('SKIP')
diff --git a/qt5-webengine/mingw-w64/PKGBUILD b/qt5-webengine/mingw-w64/PKGBUILD
index a4595368..9d8985f8 100644
--- a/qt5-webengine/mingw-w64/PKGBUILD
+++ b/qt5-webengine/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtwebengine
 pkgname=mingw-w64-qt5-webengine
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)'
@@ -20,9 +20,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('LGPL3' 'LGPL2.1' 'BSD')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 groups=('mingw-w64-qt5')
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch')
 md5sums=('c90fba515fb33c091904fe2cadbb345a'
          '27e0f474f66f05f3911c71621b24636d')
diff --git a/qt5-webkit/mingw-w64/PKGBUILD b/qt5-webkit/mingw-w64/PKGBUILD
index da13e1f0..1b1db983 100644
--- a/qt5-webkit/mingw-w64/PKGBUILD
+++ b/qt5-webkit/mingw-w64/PKGBUILD
@@ -41,9 +41,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 groups=('mingw-w64-qt5')
-source=("https://download.qt.io/community_releases/${pkgver:0:3}/${pkgver}-final/${_pkgfqn}.tar.xz"
+source=("https://download.qt.io/community_releases/${pkgver%.*}/${pkgver}-final/${_pkgfqn}.tar.xz"
         '0001-Use-correct-ICU-libs.patch'
         '0002-Use-pkg-config.patch'
         '0003-Use-system-ANGLE-rather-than-bundled-version.patch'
diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD
index e5340ad0..823a66d5 100644
--- a/qt5-websockets/mingw-w64/PKGBUILD
+++ b/qt5-websockets/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtwebsockets
 pkgname="mingw-w64-qt5-websockets"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)"
@@ -19,9 +19,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' '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")
-sha256sums=('afddc1bd915ea47ccbec968a7af02e2a5405c717830e4671924fe35b55e81674')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('17ab0fa22007e5485bf98cb5fef5387628274548d5e96923f45d097838f49403')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-webview/default/PKGBUILD b/qt5-webview/default/PKGBUILD
index 407c2d46..9a226275 100644
--- a/qt5-webview/default/PKGBUILD
+++ b/qt5-webview/default/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qtwebview
 pkgname=qt5-webview
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Provides a way to display web content in an application by using native APIs'
@@ -13,7 +13,7 @@ depends=('qt5-quickcontrols' 'qt5-webengine')
 makedepends=('git')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 groups=('qt5')
 source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#tag=v$pkgver)
 md5sums=('15c4a903f692ab4ea1ffb7c0ddb58e7a')
diff --git a/qt5-webview/git/PKGBUILD b/qt5-webview/git/PKGBUILD
index 908bcc30..7e236f15 100644
--- a/qt5-webview/git/PKGBUILD
+++ b/qt5-webview/git/PKGBUILD
@@ -15,7 +15,7 @@ provides=(${pkgname%-git})
 conflicts=(${pkgname%-git})
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 groups=('qt5')
 source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#branch=dev)
 md5sums=('SKIP')
diff --git a/qt5-webview/mingw-w64-git/PKGBUILD b/qt5-webview/mingw-w64-git/PKGBUILD
index f6841902..6f36c153 100644
--- a/qt5-webview/mingw-w64-git/PKGBUILD
+++ b/qt5-webview/mingw-w64-git/PKGBUILD
@@ -18,7 +18,7 @@ conflicts=(${pkgname%-git})
 options=('!strip' '!buildflags' 'staticlibs')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 groups=('mingw-w64-qt5')
 source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#branch=dev)
 md5sums=('SKIP')
diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD
index 46c8909f..30215652 100644
--- a/qt5-winextras/mingw-w64/PKGBUILD
+++ b/qt5-winextras/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtwinextras
 pkgname="mingw-w64-qt5-winextras"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)"
@@ -19,9 +19,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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")
-sha256sums=('b4f6689871403c3abb8d2b8fe9bebedc95d69694bae3c301181442437b4e181f')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('cd136ede985b64ec883b1b24054b5ce308f43b64e28f9932c35c0d5861c4a5d7')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD
index 01de3166..b14c5a47 100644
--- a/qt5-xmlpatterns/mingw-w64/PKGBUILD
+++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtxmlpatterns
 pkgname="mingw-w64-qt5-xmlpatterns"
-pkgver=5.9.2
+pkgver=5.10.0
 pkgrel=1
 arch=('any')
 pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)"
@@ -19,9 +19,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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")
-sha256sums=('0aa6aa83087d5754cfefaa3d119454009fc2dd5f266c1eb2ea7a434cef22d34e')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('b08abca6227e942a128e478b2eb81416c40925418d89064ee151c155e3d203c3')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \