Make mingw-w64 compile flags configurable

* Sync configure and cmake with latest AUR versions * Get rid of -g by default * Not tested yet
2018-12-30 23:49:46 +01:00 · 2018-12-30 23:49:46 +01:00 · d35652e480
parent c457264551
commit d35652e480
144 changed files with 445 additions and 364 deletions
--- a/cmake/mingw-w64/PKGBUILD
+++ b/cmake/mingw-w64/PKGBUILD
@ -1,23 +1,27 @@

 pkgname=mingw-w64-cmake
 pkgver=1
-pkgrel=14.1
+pkgrel=23.1
 arch=('any')
-pkgdesc='CMake wrapper for MinGW (mingw-w64)'
+pkgdesc="CMake wrapper for MinGW (mingw-w64)"
 depends=('cmake' 'mingw-w64-gcc' 'mingw-w64-pkg-config')
-license=('GPL')
-url='http://fedoraproject.org/wiki/MinGW'
+optdepends=('mingw-w64-wine: runtime support')
+license=("GPL")
+url="http://fedoraproject.org/wiki/MinGW"
 source=("mingw-cmake.sh"
-        "toolchain-mingw.cmake"
-        "mingw-wine.sh")
-md5sums=('SKIP' 'SKIP' 'SKIP')
+        "mingw-cmake-py.sh"
+        "toolchain-mingw.cmake")
+sha256sums=('SKIP' 'SKIP' "SKIP")
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_python_versions="27 35 36 37"

 build() {
  for _arch in ${_architectures}; do
-    sed "s|@TRIPLE@|${_arch}|g" toolchain-mingw.cmake > toolchain-${_arch}.cmake
+    sed "s|@TRIPLE@|${_arch}|g;s|@PROCESSOR@|${_arch::-12}|g" toolchain-mingw.cmake > toolchain-${_arch}.cmake
    sed "s|@TRIPLE@|${_arch}|g" mingw-cmake.sh > ${_arch}-cmake
-    sed "s|@TRIPLE@|${_arch}|g" mingw-wine.sh > ${_arch}-wine
+    for _pyver in ${_python_versions}; do
+      sed "s|@TRIPLE@|${_arch}|g;s|@PYMAJMIN@|${_pyver}|g" mingw-cmake-py.sh > ${_arch}-cmake-py${_pyver}
+    done
  done
 }

@ -27,6 +31,9 @@ package() {
  for _arch in ${_architectures}; do
    install -m 644 toolchain-${_arch}.cmake "${pkgdir}"/usr/share/mingw/
    install -m 755 ${_arch}-cmake "${pkgdir}"/usr/bin/
-    install -m 755 ${_arch}-wine "${pkgdir}"/usr/bin/
+    for _pyver in ${_python_versions}; do
+      install -m 755 ${_arch}-cmake-py${_pyver} "${pkgdir}"/usr/bin/
+    done
  done
 }
+
--- a/cmake/mingw-w64/mingw-cmake-py.sh
+++ b/cmake/mingw-w64/mingw-cmake-py.sh
@ -0,0 +1,8 @@
+#!/bin/sh
+mingw_prefix=/usr/@TRIPLE@
+
+@TRIPLE@-cmake \
+    -DPYTHON_INCLUDE_DIR=${mingw_prefix}/include/python@PYMAJMIN@ \
+    -DPYTHON_LIBRARY=${mingw_prefix}/lib/libpython@PYMAJMIN@.dll.a \
+    -DPYTHON_EXECUTABLE=/usr/bin/@TRIPLE@-python@PYMAJMIN@-bin \
+    "$@"
--- a/cmake/mingw-w64/mingw-cmake.sh
+++ b/cmake/mingw-w64/mingw-cmake.sh
@ -3,24 +3,30 @@ mingw_prefix=/usr/@TRIPLE@

 export PKG_CONFIG_LIBDIR="${mingw_prefix}/lib/pkgconfig"

-mingw_flags="${CUSTOM_MINGW_FLAGS:--O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4}"
-export CFLAGS="$mingw_flags $CFLAGS"
-export CXXFLAGS="$mingw_flags $CXXFLAGS"
+default_mingw_pp_flags="-D_FORTIFY_SOURCE=2"
+default_mingw_compiler_flags="$default_mingw_pp_flags -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions --param=ssp-buffer-size=4"
+default_mingw_linker_flags="-Wl,-O1,--sort-common,--as-needed"

-additional_args=" \
-  -DCMAKE_INSTALL_PREFIX:PATH=${mingw_prefix} \
-  -DCMAKE_INSTALL_LIBDIR:PATH=${mingw_prefix}/lib \
-  -DINCLUDE_INSTALL_DIR:PATH=${mingw_prefix}/include \
-  -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \
-  -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \
-  -DLIB_INSTALL_DIR:PATH=${mingw_prefix}/lib \
-  -DSYSCONF_INSTALL_DIR:PATH=${mingw_prefix}/etc \
-  -DSHARE_INSTALL_DIR:PATH=${mingw_prefix}/share \
-  -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-@TRIPLE@.cmake \
-  -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/@TRIPLE@-wine"
+export CPPFLAGS="${MINGW_CPPFLAGS:-$default_mingw_pp_flags $CPPFLAGS}"
+export CFLAGS="${MINGW_CFLAGS:-$default_mingw_compiler_flags $CFLAGS}"
+export CXXFLAGS="${MINGW_CXXFLAGS:-$default_mingw_compiler_flags $CXXFLAGS}"
+export LDFLAGS="${MINGW_LDFLAGS:-$default_mingw_linker_flags $LDFLAGS}"

-[[ ! $PREVENT_FORCING_SHARED_LIBS ]] &&
-  additional_args+=' -DBUILD_SHARED_LIBS:BOOL=ON' ||
-  additional_args+=' -DBUILD_SHARED_LIBS:BOOL=OFF'
-
-PATH=${mingw_prefix}/bin:$PATH cmake $additional_args "$@"
+PATH=${mingw_prefix}/bin:$PATH cmake \
+    -DCMAKE_INSTALL_PREFIX:PATH=${mingw_prefix} \
+    -DCMAKE_INSTALL_LIBDIR:PATH=${mingw_prefix}/lib \
+    -DINCLUDE_INSTALL_DIR:PATH=${mingw_prefix}/include \
+    -DLIB_INSTALL_DIR:PATH=${mingw_prefix}/lib \
+    -DSYSCONF_INSTALL_DIR:PATH=${mingw_prefix}/etc \
+    -DSHARE_INSTALL_DIR:PATH=${mingw_prefix}/share \
+    -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \
+    -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-@TRIPLE@.cmake \
+    -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/@TRIPLE@-wine \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+    -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$LDFLAGS" \
+    -DCMAKE_EXE_LINKER_FLAGS_RELEASE="$LDFLAGS" \
+    "$@"
--- a/cmake/mingw-w64/toolchain-mingw.cmake
+++ b/cmake/mingw-w64/toolchain-mingw.cmake
@ -1,4 +1,5 @@
 set (CMAKE_SYSTEM_NAME Windows)
+set (CMAKE_SYSTEM_PROCESSOR @PROCESSOR@)

 # specify the cross compiler
 set (CMAKE_C_COMPILER @TRIPLE@-gcc)
@ -30,3 +31,4 @@ set (CMAKE_Fortran_COMPILER @TRIPLE@-gfortran)
 set (CMAKE_AR:FILEPATH @TRIPLE@-ar)
 set (CMAKE_RANLIB:FILEPATH @TRIPLE@-ranlib)

+
--- a/configure/mingw-w64/PKGBUILD
+++ b/configure/mingw-w64/PKGBUILD
@ -1,7 +1,7 @@

 pkgname=mingw-w64-configure
-pkgver=0.1
-pkgrel=2
+pkgver=0.1.1
+pkgrel=2.1
 arch=(any)
 pkgdesc="configure wrapper for MinGW (mingw-w64)"
 depends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
@ -24,3 +24,4 @@ package() {
    install -m 755 ${_arch}-configure "${pkgdir}"/usr/bin/
  done
 }
+
--- a/configure/mingw-w64/mingw-configure.sh
+++ b/configure/mingw-w64/mingw-configure.sh
@ -2,17 +2,22 @@

 # check if last arg is a path to configure, else use parent
 for last; do true; done
-if test -x "${last}/configure"
-then
+if test -x "${last}/configure"; then
  config_path="$last"
 else
  config_path=".."
 fi

-mingw_flags="${CUSTOM_MINGW_FLAGS:--O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4}"
-LDFLAGS=""
-export CFLAGS="$mingw_flags $CFLAGS"
-export CXXFLAGS="$mingw_flags $CXXFLAGS"
-${config_path}/configure --host=@TRIPLE@ --target=@TRIPLE@ --build="$CHOST" \
+default_mingw_pp_flags="-D_FORTIFY_SOURCE=2"
+default_mingw_compiler_flags="-O2 -pipe -fstack-protector-strong -fno-plt -fexceptions --param=ssp-buffer-size=4"
+default_mingw_linker_flags="-Wl,-O1,--sort-common,--as-needed"
+
+export CPPFLAGS="${MINGW_CPPFLAGS:-$default_mingw_pp_flags $CPPFLAGS}"
+export CFLAGS="${MINGW_CFLAGS:-$default_mingw_compiler_flags $CFLAGS}"
+export CXXFLAGS="${MINGW_CXXFLAGS:-$default_mingw_compiler_flags $CXXFLAGS}"
+export LDFLAGS="${MINGW_LDFLAGS:-$default_mingw_linker_flags $LDFLAGS}"
+
+${config_path}/configure \
+  --host=@TRIPLE@ --target=@TRIPLE@ --build="$CHOST" \
  --prefix=/usr/@TRIPLE@ --libdir=/usr/@TRIPLE@/lib --includedir=/usr/@TRIPLE@/include \
  --enable-shared --enable-static "$@"
--- a/devel/qt5/sync-mingw-w64-variants.sh
+++ b/devel/qt5/sync-mingw-w64-variants.sh
@ -1,2 +1,2 @@
 #!/usr/bin/bash -e
-../sync-variants.sh qt5-base mingw-w64 mingw-w64-{static,dynamic,angle}
+"$(dirname "$0")/../sync-variants.sh" qt5-base mingw-w64 mingw-w64-{static,dynamic,angle}
--- a/devel/sync-variants.sh
+++ b/devel/sync-variants.sh
@ -79,7 +79,7 @@ for variant_dir in "${variant_dirs[@]}"; do
    fi

    msg2 "Replace files"
-    if [ "$variant_dir/"* ]; then
+    if [ -z "$(ls -A "$variant_dir")" ]; then
        rm "$variant_dir/"* # clean existing files first (files might have been removed in master and we don't want any leftovers)
    fi
    cp "$master/"* "$variant_dir"
--- a/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,4 +1,4 @@
-From 916b6a82bc084162432f9ed36934940892679ebd Mon Sep 17 00:00:00 2001
+From ebb6744032ebe7ff6541ef1f1febe8c57a2a84c9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
@ -13,13 +13,13 @@ Also see the following issues:
 * https://github.com/Martchus/PKGBUILDs/issues/59
 * https://github.com/Martchus/PKGBUILDs/issues/60
 ---
- mkspecs/common/g++-win32.conf      | 53 ++++++++++++++++++++----------
+ mkspecs/common/g++-win32.conf      | 52 ++++++++++++++++++++----------
 mkspecs/win32-clang-g++/qmake.conf |  4 +--
 mkspecs/win32-g++/qmake.conf       |  4 +--
- 3 files changed, 40 insertions(+), 21 deletions(-)
+ 3 files changed, 39 insertions(+), 21 deletions(-)

 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index f0df324b64..48d1c49d44 100644
+index f0df324b64..07e2b6a88e 100644
 --- a/mkspecs/common/g++-win32.conf
 +++ b/mkspecs/common/g++-win32.conf
@@ -8,18 +8,24 @@
@ -58,11 +58,9 @@ index f0df324b64..48d1c49d44 100644
 
 QMAKE_INCDIR            =
 
-@@ -42,41 +49,53 @@ QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
- QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
+@@ -43,40 +50,51 @@ QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
-+QMAKE_LFLAGS            = -g
 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
 -QMAKE_LFLAGS_RELEASE    = -Wl,-s
 +QMAKE_LFLAGS_RELEASE    =
@ -127,7 +125,7 @@ index f0df324b64..48d1c49d44 100644
 -include(angle.conf)
 -include(windows-vulkan.conf)
 diff --git a/mkspecs/win32-clang-g++/qmake.conf b/mkspecs/win32-clang-g++/qmake.conf
-index 4630ec4602..4981a28736 100644
+index 4630ec4602..3f9fdc72b1 100644
 --- a/mkspecs/win32-clang-g++/qmake.conf
 +++ b/mkspecs/win32-clang-g++/qmake.conf
@@ -14,11 +14,11 @@ include(../common/g++-win32.conf)
@ -135,17 +133,17 @@ index 4630ec4602..4981a28736 100644
 
 QMAKE_CC                = $${CROSS_COMPILE}clang
 -QMAKE_CFLAGS           +=
-+QMAKE_CFLAGS           += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
+QMAKE_CFLAGS           += $${CROSS_COMPILE_CFLAGS}
 QMAKE_CFLAGS_WARN_ON   += -Wextra -Wno-ignored-attributes
 
 QMAKE_CXX               = $${CROSS_COMPILE}clang++
 -QMAKE_CXXFLAGS         +=
-+QMAKE_CXXFLAGS         += $${QMAKE_CFLAGS}
+QMAKE_CXXFLAGS         += $${CROSS_COMPILE_CXXFLAGS}
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
 
 QMAKE_LINK              = $${CROSS_COMPILE}clang++
 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
-index ed131c6823..b77d86cd6b 100644
+index ed131c6823..b8e08df0be 100644
 --- a/mkspecs/win32-g++/qmake.conf
 +++ b/mkspecs/win32-g++/qmake.conf
@@ -12,11 +12,11 @@ include(../common/g++-win32.conf)
@ -153,12 +151,12 @@ index ed131c6823..b77d86cd6b 100644
 
 QMAKE_CC                = $${CROSS_COMPILE}gcc
 -QMAKE_CFLAGS           += -fno-keep-inline-dllexport
-+QMAKE_CFLAGS           += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
+QMAKE_CFLAGS           += $${CROSS_COMPILE_CFLAGS}
 QMAKE_CFLAGS_WARN_ON   += -Wextra
 
 QMAKE_CXX               = $${CROSS_COMPILE}g++
 -QMAKE_CXXFLAGS         += -fno-keep-inline-dllexport
-+QMAKE_CXXFLAGS         += $${QMAKE_CFLAGS}
+QMAKE_CXXFLAGS         += $${CROSS_COMPILE_CXXFLAGS}
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
--- 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,4 +1,4 @@
-From cf9119f68b3e575ef07853ab177259f4ef044e0b Mon Sep 17 00:00:00 2001
+From 23c62d9404fec91a2dbc4fd249c24ac414c95150 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
--- 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,4 +1,4 @@
-From dcfdcfea110398d0ce98c184b975f59354d4528b Mon Sep 17 00:00:00 2001
+From 089a61fec96026f45584062423b2a09e757d654b 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
--- 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,4 +1,4 @@
-From 42ab8012488408bfb6ab77fb056b27f3400d40ce Mon Sep 17 00:00:00 2001
+From f541e6f3d425f2abd495f3964ed5e895e7719588 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
--- 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,4 +1,4 @@
-From 07fa0fe80bd49e335ff8663ee8c67aa6b0f042c8 Mon Sep 17 00:00:00 2001
+From 64e78255f007bf4949c440e3f6fb0bc48c467824 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
--- 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,4 +1,4 @@
-From f02b2a6ef057ac969eb813735a88e3dfedf924a2 Mon Sep 17 00:00:00 2001
+From 8d4415f5c848f4cb291282842a5fe7fbca509d59 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
--- 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,4 +1,4 @@
-From 941886c8d4ca7655cdd165eeb439d93abcf9eab2 Mon Sep 17 00:00:00 2001
+From cbcce4bff865989e893dfc8979730050517ee69e 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
--- 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,4 +1,4 @@
-From 00538d150502debca140f94c2057c1a541b8333f Mon Sep 17 00:00:00 2001
+From 4907c25ba7070ad0f58b038f0d4b9de904b17961 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
--- 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,4 +1,4 @@
-From 3acf388e10fd40909af87cfdba35768f2be26be6 Mon Sep 17 00:00:00 2001
+From 02a7c8481cb1d6f760307f34c6be4cd888fdc9ed 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
--- 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,4 +1,4 @@
-From 27a1638bad652da1e73bbe1533aca8b625eeda4d Mon Sep 17 00:00:00 2001
+From 6f001ca09fe5bb1aca85a3f532489b3aa412cd2a 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
--- 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,4 +1,4 @@
-From f4d9c0c1b22a122df1393b47d485a0f4416ad8bc Mon Sep 17 00:00:00 2001
+From e3e5bfb055f8f25db2c098b35d8376e956eed80e 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
--- 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,4 +1,4 @@
-From dbb80749d9fa50db27c240769aa9f59b24067f3f Mon Sep 17 00:00:00 2001
+From 7c369864f7ef939dd0bdbc805fe0951429e27405 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
--- 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,4 +1,4 @@
-From 4d4b4bede0fbdd326c41333e3605225cafd8861a Mon Sep 17 00:00:00 2001
+From cffd6d5675635e1d2d170f31dc4b70013437db7c 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
--- 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,4 +1,4 @@
-From c0ac12f99fde7a3a4d6355e68c631fbac5356f82 Mon Sep 17 00:00:00 2001
+From 23624432b529e988504650293351d77b5f19beb9 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
--- 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,4 +1,4 @@
-From e9810c35b4a294691ffea20dd51ba8ef2faf41ed Mon Sep 17 00:00:00 2001
+From 63e0fdf86c9ceaa4da247f35e7127cbab6a35c03 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
--- 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,4 +1,4 @@
-From 23c9fc7eaa3164d47e0c6049e61bfeec0bd30a0f Mon Sep 17 00:00:00 2001
+From b9f8213ea416663467061840443547a3b3412f9f 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
@ -12,10 +12,10 @@ Prevents conflict with mingw-w64-qt4 package
 4 files changed, 5 insertions(+), 5 deletions(-)

 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index 48d1c49d44..a011f681eb 100644
+index 07e2b6a88e..5bfbcfdca6 100644
 --- a/mkspecs/common/g++-win32.conf
 +++ b/mkspecs/common/g++-win32.conf
-@@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
+@@ -86,7 +86,7 @@ QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
 QMAKE_LIBS_OPENGL_ES2   = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
 QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
 QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
--- 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,4 +1,4 @@
-From 29f7e60d2712d9229d96d5aa1ec3fd0253075bca Mon Sep 17 00:00:00 2001
+From df4107f83f185cb4b621c128da8cc893fdf3745a 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
--- 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,4 +1,4 @@
-From 9baddb1d9432c91c6f4e7f8687d13fa7e38308d3 Mon Sep 17 00:00:00 2001
+From 1ca68e2ef175b6838027dc64bd5e32ff3c6eff29 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
--- 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,4 +1,4 @@
-From f844ba34e2c4d29613345477dee10fa883275fd4 Mon Sep 17 00:00:00 2001
+From 773170ab38b995464a3ee5430c7e7f8fdc84fd8d 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
--- a/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From 47c3ea27e0aba1475c450dcc590f01846b054a07 Mon Sep 17 00:00:00 2001
+From a73bf9a8194a2fdd68b531b501327cb72e6e2d36 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 20/33] Use *.dll.a as import lib extension
--- a/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From c14a296d3385a7d2aafbe793c7c1e49aa48d1b66 Mon Sep 17 00:00:00 2001
+From e362589c0413c036ee6c960f26a6aa610a085e2c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 21/33] Merge shared and static library trees
--- a/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From f3eab06f0fa50e140a96182b0b7a1555b5e4797c Mon Sep 17 00:00:00 2001
+From c7c3618a348b9cfc480f13bfb494dd6637035886 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
--- a/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From d5b5246f2422b82b55dd464964884ef31a7fa36c Mon Sep 17 00:00:00 2001
+From 7162658d8ae5a73ed35cd24287bae6c43be6cb93 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 23/33] Allow usage of static version with CMake
--- a/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From 9c26fcc555b4ff9cca74dec82dae355bb2bc0044 Mon Sep 17 00:00:00 2001
+From 9dbcc3874c61328503a15641bea40e3d28c082e6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 24/33] Adjust linker flags for static build with
--- a/qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From 5b7d7d07e4f92182bd3292dd63a043bb3fea9261 Mon Sep 17 00:00:00 2001
+From 6e5853cf115c82c9162811fad6d205e674676607 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 25/33] Use correct pkg-config --static flag
--- a/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From 4f58af1580449536e00792fa5e4051352ba8133a Mon Sep 17 00:00:00 2001
+From b7d5d4387f485ac954b6e3381f5bad3e3d8bf573 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
--- a/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From a674be4a5788536a25bc76e6a94e161a76ed9e51 Mon Sep 17 00:00:00 2001
+From ecd411d7f3b7e845a0a5feadd3a79998a18dc097 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 27/33] Ignore errors about missing feature static
--- a/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From 5872f3ae8556fa1dfd4be8155db37a86db715e20 Mon Sep 17 00:00:00 2001
+From e7e68d743e1aaf534374c5602bf6fc458b40dbd3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 28/33] Enable and fix use of iconv
--- a/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From 650000771fa6834dfb7faacddbabbc4dfb4830a9 Mon Sep 17 00:00:00 2001
+From 9764fb74d779be675d8cd6d1193bf3efb93ff2a7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 29/33] Ignore failing pkg-config test
--- a/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From 496054604431db3e647bf89d63a9140ce75d1001 Mon Sep 17 00:00:00 2001
+From c2951c79c8a228443daecfbc1683eee516412a01 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
--- a/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From e8047d9652035fc4ed438dbe3d4583af05d0535e Mon Sep 17 00:00:00 2001
+From b807729780fedcfd3848c7911ced8bd7913bb045 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
--- a/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From dc6f09599400e4e6a790ba8bdd8fce3b6dc419de Mon Sep 17 00:00:00 2001
+From d5cc5a64db0f04a4245febec2e4dae4dc1986d2a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 32/33] Fix linking against static plugins with qmake
--- a/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch
+++ b/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch
@ -1,4 +1,4 @@
-From a06c30c0f497e4dcef912b2c316f2d97a6f0f933 Mon Sep 17 00:00:00 2001
+From de2c6c9f865840b96921298c45171e71a8825227 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 May 2018 03:47:14 +0200
 Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
--- a/qt5-base/mingw-w64-angle/PKGBUILD
+++ b/qt5-base/mingw-w64-angle/PKGBUILD
@ -86,39 +86,39 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
        '0032-Fix-linking-against-static-plugins-with-qmake.patch'
        '0033-Disable-hardware-randomizer-for-32-bit.patch')
 sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb'
-            '5384b242223f2219c933c098397c287f387ef0b736633200c647c6feed69cc85'
-            '01e71d5375ff6fb214e0b4f623f3c007485885d8e1fdfc185a1d25b6d1ea615a'
-            'c2d68bcba25bd39f3d7f95271de99a28f0de33f98ae0a4f102728a48a58fa2b8'
-            'cbeb19172eab4d2faef020560fb83190ac975fa54acaaf006a7b720e45b4fa43'
-            '81f9e6a05b8c78392b0b8eb08535480cd9e0ebb6ed77ecffcf382f133482f55f'
-            'fbcb5b586ec3a6723ac19378c40f1b28d12e8f0745db1016e38e040e6aad5e7b'
-            'cffb2cc60dd4aed39dec14bef889e0e4a5fe8d1171297fdd0d31d65c58cb6591'
-            '971f0176651edf8bafb1cd5062f04f1e840cc703ee85fabc1d04face637368b2'
-            '6a2e839aa513a32a2f615fbd9a010a4e9db219fe5a35678b290d52ed4ebde9eb'
-            '7696e92e2b5d9c6be69d0ffe520f3539ee8b25d019b460319e7e6c1a90805b8f'
-            '4db1340b60add08de2eb9e365c2c9b45fbdbb9137a42c1631e6589527b66f197'
-            'a3ceba043bd7eb078a850a0189afe8e0c431e39a5d88c8c4f1609917388b8606'
-            '9471df45a4c536f83d51e2ec83bdfd3b1d6233b4fcaa992c48a1155cc31396cd'
-            'e2401d6cb5ccdd51406d0ff9abb8a75f28abcf0eeb5fa77cc7f02f9122f200b9'
-            '25be17392e2b73f7d8a8868d1d0671c52ab58c7d03011f3e4a9c186e9a6a2a9a'
-            '84fb80ff48e6146d57530df475532a94002812e4b11a04e49ee1537ad0c91242'
-            '0e3a3f2c2bbdf5c66d823a6a4c9afa88794d97901e97c927f0ee761a9bf11db6'
-            'bcef0c63c33e609098dd834e0a07e684eb75776ffd2f7db20edbc433b780fed0'
-            '6c23bc2a75720c3f66f23ecb1944d5c58ac39d6a87e1609b0d444d87a5b3df5d'
-            'df7a6f64dd5973a5208fc82ab2604be5e468c0460e78659a63649a9fe4bda865'
-            'e983f369f7bacb6ecacbe5964ddd09a07abe2e6ddb8b8be5abeb6f4a3b2510d6'
-            '86b494b28602b0c5228e3ab14f5d22c66e2d9f19b77bc6027eb991cd99b8c1e0'
-            '00ce0189c216b3baf3874d2ae2f9437c6e7ef117206cca1abcf6b1108c7b2ad9'
-            'e04105e95ecf5220f87dbf4d4bc4a5a09fb00a77a107679a63c9cbb62c84afae'
-            '03d97deef6266959afefc3cb4c39b9be15880b07a16bb6f5cf72c71c0ae2897f'
-            '4c1ce0fa776f7a7f62239e4c4ffd0270e99f9bd7545c3bf32c3ceb5276bede93'
-            '2bb0550e924d57da83ce586dab9b90180daee196d0f5303dce0af07a7e509e0b'
-            '73bfcc40a301521a5c977e0ed427e40d780ee7d1416f4fbb3c67d4e6c101bcd3'
-            'd252d96f69c41f3b3112304d53773ff7549cb95cbe0cde171a79e41ee55f89ab'
-            '9bb54043cc8a3b18aca222cea873d1651e881132985ad49402d63a69df518baa'
-            'e4ee1aabed10b1ea4192498b6e80998425ab581d7ad44a9d880066f7017d481e'
-            'a6640e6680f323f846e63e28f4ef343cfbec75397f7a103119b7b3415bcee260'
-            '7758fd6412d8007518099b351e6661b5157a59e253f328c94f42980e3f977260')
+            '9ec51628c255573f7c243efa23957fb0eaae7051e2e8f14c80004b53113843dd'
+            '0d78f4826dd41c4d6ee7d095c8f35b3546655d375fca0ece7974ed0cfd61b4ec'
+            '44679f37ed58b22297f7666e798c8f099af665ceb0725edf94ca5250f56df60b'
+            'bed019caedb56d1e9949bf227c17f3c62cf3f929e2ac5960f989ebd09031f70a'
+            '6591e1b6df919bd0054fc60c5cbef0ce9c5c99e7e792003af3337e6b58c17a5e'
+            'c70a8fe8243225d44532834eba25c849276131152791dd9c3f505ad3a07bd91e'
+            'ea17823807394adbffc74ef9a61613c7b134072ed081b370ecc9d0f1e0d61525'
+            'a19b79876793858af82c4f52fa3756d297059968b30b9e3a99c874ef5edd86d5'
+            '93803937c9d3d79738bd9098cadbc652d92811356d33cbc5694fd86636ea2cd6'
+            '07e5c641133c796ec10cb2259deb05e2c73e79d6dca61306c57c26be941de357'
+            'e737d0aaf73aeed0926420632718469549f339ba9246330232b4e0a7c2590542'
+            '99538cd36fbf5b850125b1f887bca7d9f244c00b1b1647251dd46576da666aa4'
+            '95b5da98388f36a10a811d9c11edb9ffecaaefeec55cd2d7dc33420410fcc691'
+            'b47c7760212833986820cce8face4eb3fe4a3a0f50dd89d9151fe59d771e18a3'
+            '609dfac8f60be7cc425638d1f5671a4a22cd8985ee5f08571444e6acae823a74'
+            'f58260547b4ed3a5f43fd4fc6b4b7716b9c4f8355ce00c89931e54763f88e5f9'
+            'e5bf5056b223f0fe6edd6326fc9a360428fdbfff22930090d5b5d192d50733ec'
+            'f8dd5e4f49b342ce4c5df2c677ecc63ea8df2730dd2101181a7ed56ff6b9ecaa'
+            'e497ff375a28d1d87f7b6d04c099df65fdb54bb6a4eb9fe4c638a042731cab61'
+            'c9122faeabd32285c5c1ed58d34ee52ae2b429089eb2d34a1d0ee2f017c57de1'
+            '2d249396a381c3b6348258ebcc52afc8d1be0a3f48554952ff0632c674c7dfde'
+            'a384a727dce6c1b823eb43d16a139d49835c7b9772b39e8ad0ff53ca3a2d4f02'
+            'd52dc5d9c0d7e58c08e42e84d8c566604137f95d036b324320f71b1fd34abeb8'
+            '3eae353c8dde508f328cdbb245c93423b365a414b3007b5720abb0396d053830'
+            '6a8f2a7a70f2f06ecbbfb7cae9f5728b7cdad19c9bd9496064c9440cf22df96d'
+            'bdcdb320de3b6da2925ca1ad76edf14ace5b2a1a51fbfc7ae9c89574a57c146c'
+            'e00e00695e9db071bea0c6f214d3561a58114b9211a8ffa94f09398bb2147b2a'
+            'bd0f5cfe2cf38218b12f979223b3286a6ae16fb17feb561695df0f155dd61a73'
+            'c41798441c49d3eb30d87fe5a2aae5d5a957e4694d76d1f6d11f8a926fd2c857'
+            'aac08c720053c206845bf0ee54c4ef833d7f3481d32522c23ece7b790f89af7d'
+            '301dfe13ab0dca5fc99f0a9ed9c62d145bf7e76ce1afe60adbbd0b7ec86d6ce3'
+            'd90088ce7f2fe633a9b46a4cfd097044bffc6c8e03d9244f08b82328b0b83737'
+            '7f9393c25dd4a4cd1fec292a8dbf98708990719d9dca8ca7d00b96d78d61969f')

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

@ -157,6 +157,19 @@ prepare() {

  # as well as our external PCRE library and zlib
  rm -rf src/3rdparty/{pcre,zlib}
+
+  # build qmake using mingw-w64 {C,LD}FLAGS
+  # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
+  CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}"
+  CFLAGS="${MINGW_CFLAGS:-$CPPFLAGS -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions --param=ssp-buffer-size=4}"
+  CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions --param=ssp-buffer-size=4}"
+  LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed}"
+  sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
+         -e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|"\
+         -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
+    mkspecs/common/gcc-base.conf
+  sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|" \
+    mkspecs/common/g++-unix.conf
 }

 build() {
@ -164,7 +177,8 @@ build() {

  # do not set any flags here, flags are configured via mkspec
  # (Setting flags here is not appropriate as it does not allow to
-  #  distinguish between flags for native compiler and cross compiler.)
+  #  distinguish between flags for native compiler and cross compiler.
+  #  See prepare() function.)
  unset CFLAGS
  unset CXXFLAGS
  unset LDFLAGS
@ -216,6 +230,7 @@ build() {

    # allows using ccache despite the use of pre-compile header (sloppiness must be set to pch_defines,time_macros in ccache config for this)
    qt_configure_args+=' -device-option CROSS_COMPILE_CFLAGS=-fpch-preprocess'
+    qt_configure_args+=' -device-option CROSS_COMPILE_CXXFLAGS=-fpch-preprocess'

    # add include directory of freetype2 and dbus manually (pkg-config detection in qmake doesn't work which is currently ignored via a patch)
    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2 dbus-1 | sed -e "s/-I\/usr\/${_arch}\/include //g")"
--- a/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,4 +1,4 @@
-From 916b6a82bc084162432f9ed36934940892679ebd Mon Sep 17 00:00:00 2001
+From ebb6744032ebe7ff6541ef1f1febe8c57a2a84c9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
@ -13,13 +13,13 @@ Also see the following issues:
 * https://github.com/Martchus/PKGBUILDs/issues/59
 * https://github.com/Martchus/PKGBUILDs/issues/60
 ---
- mkspecs/common/g++-win32.conf      | 53 ++++++++++++++++++++----------
+ mkspecs/common/g++-win32.conf      | 52 ++++++++++++++++++++----------
 mkspecs/win32-clang-g++/qmake.conf |  4 +--
 mkspecs/win32-g++/qmake.conf       |  4 +--
- 3 files changed, 40 insertions(+), 21 deletions(-)
+ 3 files changed, 39 insertions(+), 21 deletions(-)

 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index f0df324b64..48d1c49d44 100644
+index f0df324b64..07e2b6a88e 100644
 --- a/mkspecs/common/g++-win32.conf
 +++ b/mkspecs/common/g++-win32.conf
@@ -8,18 +8,24 @@
@ -58,11 +58,9 @@ index f0df324b64..48d1c49d44 100644
 
 QMAKE_INCDIR            =
 
-@@ -42,41 +49,53 @@ QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
- QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
+@@ -43,40 +50,51 @@ QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
-+QMAKE_LFLAGS            = -g
 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
 -QMAKE_LFLAGS_RELEASE    = -Wl,-s
 +QMAKE_LFLAGS_RELEASE    =
@ -127,7 +125,7 @@ index f0df324b64..48d1c49d44 100644
 -include(angle.conf)
 -include(windows-vulkan.conf)
 diff --git a/mkspecs/win32-clang-g++/qmake.conf b/mkspecs/win32-clang-g++/qmake.conf
-index 4630ec4602..4981a28736 100644
+index 4630ec4602..3f9fdc72b1 100644
 --- a/mkspecs/win32-clang-g++/qmake.conf
 +++ b/mkspecs/win32-clang-g++/qmake.conf
@@ -14,11 +14,11 @@ include(../common/g++-win32.conf)
@ -135,17 +133,17 @@ index 4630ec4602..4981a28736 100644
 
 QMAKE_CC                = $${CROSS_COMPILE}clang
 -QMAKE_CFLAGS           +=
-+QMAKE_CFLAGS           += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
+QMAKE_CFLAGS           += $${CROSS_COMPILE_CFLAGS}
 QMAKE_CFLAGS_WARN_ON   += -Wextra -Wno-ignored-attributes
 
 QMAKE_CXX               = $${CROSS_COMPILE}clang++
 -QMAKE_CXXFLAGS         +=
-+QMAKE_CXXFLAGS         += $${QMAKE_CFLAGS}
+QMAKE_CXXFLAGS         += $${CROSS_COMPILE_CXXFLAGS}
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
 
 QMAKE_LINK              = $${CROSS_COMPILE}clang++
 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
-index ed131c6823..b77d86cd6b 100644
+index ed131c6823..b8e08df0be 100644
 --- a/mkspecs/win32-g++/qmake.conf
 +++ b/mkspecs/win32-g++/qmake.conf
@@ -12,11 +12,11 @@ include(../common/g++-win32.conf)
@ -153,12 +151,12 @@ index ed131c6823..b77d86cd6b 100644
 
 QMAKE_CC                = $${CROSS_COMPILE}gcc
 -QMAKE_CFLAGS           += -fno-keep-inline-dllexport
-+QMAKE_CFLAGS           += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
+QMAKE_CFLAGS           += $${CROSS_COMPILE_CFLAGS}
 QMAKE_CFLAGS_WARN_ON   += -Wextra
 
 QMAKE_CXX               = $${CROSS_COMPILE}g++
 -QMAKE_CXXFLAGS         += -fno-keep-inline-dllexport
-+QMAKE_CXXFLAGS         += $${QMAKE_CFLAGS}
+QMAKE_CXXFLAGS         += $${CROSS_COMPILE_CXXFLAGS}
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
--- 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,4 +1,4 @@
-From cf9119f68b3e575ef07853ab177259f4ef044e0b Mon Sep 17 00:00:00 2001
+From 23c62d9404fec91a2dbc4fd249c24ac414c95150 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
--- 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,4 +1,4 @@
-From dcfdcfea110398d0ce98c184b975f59354d4528b Mon Sep 17 00:00:00 2001
+From 089a61fec96026f45584062423b2a09e757d654b 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
--- 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,4 +1,4 @@
-From 42ab8012488408bfb6ab77fb056b27f3400d40ce Mon Sep 17 00:00:00 2001
+From f541e6f3d425f2abd495f3964ed5e895e7719588 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
--- 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,4 +1,4 @@
-From 07fa0fe80bd49e335ff8663ee8c67aa6b0f042c8 Mon Sep 17 00:00:00 2001
+From 64e78255f007bf4949c440e3f6fb0bc48c467824 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
--- 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,4 +1,4 @@
-From f02b2a6ef057ac969eb813735a88e3dfedf924a2 Mon Sep 17 00:00:00 2001
+From 8d4415f5c848f4cb291282842a5fe7fbca509d59 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
--- 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,4 +1,4 @@
-From 941886c8d4ca7655cdd165eeb439d93abcf9eab2 Mon Sep 17 00:00:00 2001
+From cbcce4bff865989e893dfc8979730050517ee69e 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
--- 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,4 +1,4 @@
-From 00538d150502debca140f94c2057c1a541b8333f Mon Sep 17 00:00:00 2001
+From 4907c25ba7070ad0f58b038f0d4b9de904b17961 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
--- 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,4 +1,4 @@
-From 3acf388e10fd40909af87cfdba35768f2be26be6 Mon Sep 17 00:00:00 2001
+From 02a7c8481cb1d6f760307f34c6be4cd888fdc9ed 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
--- 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,4 +1,4 @@
-From 27a1638bad652da1e73bbe1533aca8b625eeda4d Mon Sep 17 00:00:00 2001
+From 6f001ca09fe5bb1aca85a3f532489b3aa412cd2a 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
--- 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,4 +1,4 @@
-From f4d9c0c1b22a122df1393b47d485a0f4416ad8bc Mon Sep 17 00:00:00 2001
+From e3e5bfb055f8f25db2c098b35d8376e956eed80e 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
--- 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,4 +1,4 @@
-From dbb80749d9fa50db27c240769aa9f59b24067f3f Mon Sep 17 00:00:00 2001
+From 7c369864f7ef939dd0bdbc805fe0951429e27405 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
--- 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,4 +1,4 @@
-From 4d4b4bede0fbdd326c41333e3605225cafd8861a Mon Sep 17 00:00:00 2001
+From cffd6d5675635e1d2d170f31dc4b70013437db7c 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
--- 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,4 +1,4 @@
-From c0ac12f99fde7a3a4d6355e68c631fbac5356f82 Mon Sep 17 00:00:00 2001
+From 23624432b529e988504650293351d77b5f19beb9 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
--- 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,4 +1,4 @@
-From e9810c35b4a294691ffea20dd51ba8ef2faf41ed Mon Sep 17 00:00:00 2001
+From 63e0fdf86c9ceaa4da247f35e7127cbab6a35c03 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
--- 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,4 +1,4 @@
-From 23c9fc7eaa3164d47e0c6049e61bfeec0bd30a0f Mon Sep 17 00:00:00 2001
+From b9f8213ea416663467061840443547a3b3412f9f 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
@ -12,10 +12,10 @@ Prevents conflict with mingw-w64-qt4 package
 4 files changed, 5 insertions(+), 5 deletions(-)

 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index 48d1c49d44..a011f681eb 100644
+index 07e2b6a88e..5bfbcfdca6 100644
 --- a/mkspecs/common/g++-win32.conf
 +++ b/mkspecs/common/g++-win32.conf
-@@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
+@@ -86,7 +86,7 @@ QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
 QMAKE_LIBS_OPENGL_ES2   = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
 QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
 QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
--- 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,4 +1,4 @@
-From 29f7e60d2712d9229d96d5aa1ec3fd0253075bca Mon Sep 17 00:00:00 2001
+From df4107f83f185cb4b621c128da8cc893fdf3745a 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
--- 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,4 +1,4 @@
-From 9baddb1d9432c91c6f4e7f8687d13fa7e38308d3 Mon Sep 17 00:00:00 2001
+From 1ca68e2ef175b6838027dc64bd5e32ff3c6eff29 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
--- 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,4 +1,4 @@
-From f844ba34e2c4d29613345477dee10fa883275fd4 Mon Sep 17 00:00:00 2001
+From 773170ab38b995464a3ee5430c7e7f8fdc84fd8d 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
--- a/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From 47c3ea27e0aba1475c450dcc590f01846b054a07 Mon Sep 17 00:00:00 2001
+From a73bf9a8194a2fdd68b531b501327cb72e6e2d36 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 20/33] Use *.dll.a as import lib extension
--- a/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From c14a296d3385a7d2aafbe793c7c1e49aa48d1b66 Mon Sep 17 00:00:00 2001
+From e362589c0413c036ee6c960f26a6aa610a085e2c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 21/33] Merge shared and static library trees
--- a/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From f3eab06f0fa50e140a96182b0b7a1555b5e4797c Mon Sep 17 00:00:00 2001
+From c7c3618a348b9cfc480f13bfb494dd6637035886 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
--- a/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From d5b5246f2422b82b55dd464964884ef31a7fa36c Mon Sep 17 00:00:00 2001
+From 7162658d8ae5a73ed35cd24287bae6c43be6cb93 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 23/33] Allow usage of static version with CMake
--- a/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From 9c26fcc555b4ff9cca74dec82dae355bb2bc0044 Mon Sep 17 00:00:00 2001
+From 9dbcc3874c61328503a15641bea40e3d28c082e6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 24/33] Adjust linker flags for static build with
--- a/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From 5b7d7d07e4f92182bd3292dd63a043bb3fea9261 Mon Sep 17 00:00:00 2001
+From 6e5853cf115c82c9162811fad6d205e674676607 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 25/33] Use correct pkg-config --static flag
--- a/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From 4f58af1580449536e00792fa5e4051352ba8133a Mon Sep 17 00:00:00 2001
+From b7d5d4387f485ac954b6e3381f5bad3e3d8bf573 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
--- a/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From a674be4a5788536a25bc76e6a94e161a76ed9e51 Mon Sep 17 00:00:00 2001
+From ecd411d7f3b7e845a0a5feadd3a79998a18dc097 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 27/33] Ignore errors about missing feature static
--- a/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From 5872f3ae8556fa1dfd4be8155db37a86db715e20 Mon Sep 17 00:00:00 2001
+From e7e68d743e1aaf534374c5602bf6fc458b40dbd3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 28/33] Enable and fix use of iconv
--- a/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From 650000771fa6834dfb7faacddbabbc4dfb4830a9 Mon Sep 17 00:00:00 2001
+From 9764fb74d779be675d8cd6d1193bf3efb93ff2a7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 29/33] Ignore failing pkg-config test
--- a/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From 496054604431db3e647bf89d63a9140ce75d1001 Mon Sep 17 00:00:00 2001
+From c2951c79c8a228443daecfbc1683eee516412a01 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
--- a/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From e8047d9652035fc4ed438dbe3d4583af05d0535e Mon Sep 17 00:00:00 2001
+From b807729780fedcfd3848c7911ced8bd7913bb045 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
--- a/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From dc6f09599400e4e6a790ba8bdd8fce3b6dc419de Mon Sep 17 00:00:00 2001
+From d5cc5a64db0f04a4245febec2e4dae4dc1986d2a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 32/33] Fix linking against static plugins with qmake
--- a/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch
+++ b/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch
@ -1,4 +1,4 @@
-From a06c30c0f497e4dcef912b2c316f2d97a6f0f933 Mon Sep 17 00:00:00 2001
+From de2c6c9f865840b96921298c45171e71a8825227 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 May 2018 03:47:14 +0200
 Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
--- a/qt5-base/mingw-w64-dynamic/PKGBUILD
+++ b/qt5-base/mingw-w64-dynamic/PKGBUILD
@ -86,39 +86,39 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
        '0032-Fix-linking-against-static-plugins-with-qmake.patch'
        '0033-Disable-hardware-randomizer-for-32-bit.patch')
 sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb'
-            '5384b242223f2219c933c098397c287f387ef0b736633200c647c6feed69cc85'
-            '01e71d5375ff6fb214e0b4f623f3c007485885d8e1fdfc185a1d25b6d1ea615a'
-            'c2d68bcba25bd39f3d7f95271de99a28f0de33f98ae0a4f102728a48a58fa2b8'
-            'cbeb19172eab4d2faef020560fb83190ac975fa54acaaf006a7b720e45b4fa43'
-            '81f9e6a05b8c78392b0b8eb08535480cd9e0ebb6ed77ecffcf382f133482f55f'
-            'fbcb5b586ec3a6723ac19378c40f1b28d12e8f0745db1016e38e040e6aad5e7b'
-            'cffb2cc60dd4aed39dec14bef889e0e4a5fe8d1171297fdd0d31d65c58cb6591'
-            '971f0176651edf8bafb1cd5062f04f1e840cc703ee85fabc1d04face637368b2'
-            '6a2e839aa513a32a2f615fbd9a010a4e9db219fe5a35678b290d52ed4ebde9eb'
-            '7696e92e2b5d9c6be69d0ffe520f3539ee8b25d019b460319e7e6c1a90805b8f'
-            '4db1340b60add08de2eb9e365c2c9b45fbdbb9137a42c1631e6589527b66f197'
-            'a3ceba043bd7eb078a850a0189afe8e0c431e39a5d88c8c4f1609917388b8606'
-            '9471df45a4c536f83d51e2ec83bdfd3b1d6233b4fcaa992c48a1155cc31396cd'
-            'e2401d6cb5ccdd51406d0ff9abb8a75f28abcf0eeb5fa77cc7f02f9122f200b9'
-            '25be17392e2b73f7d8a8868d1d0671c52ab58c7d03011f3e4a9c186e9a6a2a9a'
-            '84fb80ff48e6146d57530df475532a94002812e4b11a04e49ee1537ad0c91242'
-            '0e3a3f2c2bbdf5c66d823a6a4c9afa88794d97901e97c927f0ee761a9bf11db6'
-            'bcef0c63c33e609098dd834e0a07e684eb75776ffd2f7db20edbc433b780fed0'
-            '6c23bc2a75720c3f66f23ecb1944d5c58ac39d6a87e1609b0d444d87a5b3df5d'
-            'df7a6f64dd5973a5208fc82ab2604be5e468c0460e78659a63649a9fe4bda865'
-            'e983f369f7bacb6ecacbe5964ddd09a07abe2e6ddb8b8be5abeb6f4a3b2510d6'
-            '86b494b28602b0c5228e3ab14f5d22c66e2d9f19b77bc6027eb991cd99b8c1e0'
-            '00ce0189c216b3baf3874d2ae2f9437c6e7ef117206cca1abcf6b1108c7b2ad9'
-            'e04105e95ecf5220f87dbf4d4bc4a5a09fb00a77a107679a63c9cbb62c84afae'
-            '03d97deef6266959afefc3cb4c39b9be15880b07a16bb6f5cf72c71c0ae2897f'
-            '4c1ce0fa776f7a7f62239e4c4ffd0270e99f9bd7545c3bf32c3ceb5276bede93'
-            '2bb0550e924d57da83ce586dab9b90180daee196d0f5303dce0af07a7e509e0b'
-            '73bfcc40a301521a5c977e0ed427e40d780ee7d1416f4fbb3c67d4e6c101bcd3'
-            'd252d96f69c41f3b3112304d53773ff7549cb95cbe0cde171a79e41ee55f89ab'
-            '9bb54043cc8a3b18aca222cea873d1651e881132985ad49402d63a69df518baa'
-            'e4ee1aabed10b1ea4192498b6e80998425ab581d7ad44a9d880066f7017d481e'
-            'a6640e6680f323f846e63e28f4ef343cfbec75397f7a103119b7b3415bcee260'
-            '7758fd6412d8007518099b351e6661b5157a59e253f328c94f42980e3f977260')
+            '9ec51628c255573f7c243efa23957fb0eaae7051e2e8f14c80004b53113843dd'
+            '0d78f4826dd41c4d6ee7d095c8f35b3546655d375fca0ece7974ed0cfd61b4ec'
+            '44679f37ed58b22297f7666e798c8f099af665ceb0725edf94ca5250f56df60b'
+            'bed019caedb56d1e9949bf227c17f3c62cf3f929e2ac5960f989ebd09031f70a'
+            '6591e1b6df919bd0054fc60c5cbef0ce9c5c99e7e792003af3337e6b58c17a5e'
+            'c70a8fe8243225d44532834eba25c849276131152791dd9c3f505ad3a07bd91e'
+            'ea17823807394adbffc74ef9a61613c7b134072ed081b370ecc9d0f1e0d61525'
+            'a19b79876793858af82c4f52fa3756d297059968b30b9e3a99c874ef5edd86d5'
+            '93803937c9d3d79738bd9098cadbc652d92811356d33cbc5694fd86636ea2cd6'
+            '07e5c641133c796ec10cb2259deb05e2c73e79d6dca61306c57c26be941de357'
+            'e737d0aaf73aeed0926420632718469549f339ba9246330232b4e0a7c2590542'
+            '99538cd36fbf5b850125b1f887bca7d9f244c00b1b1647251dd46576da666aa4'
+            '95b5da98388f36a10a811d9c11edb9ffecaaefeec55cd2d7dc33420410fcc691'
+            'b47c7760212833986820cce8face4eb3fe4a3a0f50dd89d9151fe59d771e18a3'
+            '609dfac8f60be7cc425638d1f5671a4a22cd8985ee5f08571444e6acae823a74'
+            'f58260547b4ed3a5f43fd4fc6b4b7716b9c4f8355ce00c89931e54763f88e5f9'
+            'e5bf5056b223f0fe6edd6326fc9a360428fdbfff22930090d5b5d192d50733ec'
+            'f8dd5e4f49b342ce4c5df2c677ecc63ea8df2730dd2101181a7ed56ff6b9ecaa'
+            'e497ff375a28d1d87f7b6d04c099df65fdb54bb6a4eb9fe4c638a042731cab61'
+            'c9122faeabd32285c5c1ed58d34ee52ae2b429089eb2d34a1d0ee2f017c57de1'
+            '2d249396a381c3b6348258ebcc52afc8d1be0a3f48554952ff0632c674c7dfde'
+            'a384a727dce6c1b823eb43d16a139d49835c7b9772b39e8ad0ff53ca3a2d4f02'
+            'd52dc5d9c0d7e58c08e42e84d8c566604137f95d036b324320f71b1fd34abeb8'
+            '3eae353c8dde508f328cdbb245c93423b365a414b3007b5720abb0396d053830'
+            '6a8f2a7a70f2f06ecbbfb7cae9f5728b7cdad19c9bd9496064c9440cf22df96d'
+            'bdcdb320de3b6da2925ca1ad76edf14ace5b2a1a51fbfc7ae9c89574a57c146c'
+            'e00e00695e9db071bea0c6f214d3561a58114b9211a8ffa94f09398bb2147b2a'
+            'bd0f5cfe2cf38218b12f979223b3286a6ae16fb17feb561695df0f155dd61a73'
+            'c41798441c49d3eb30d87fe5a2aae5d5a957e4694d76d1f6d11f8a926fd2c857'
+            'aac08c720053c206845bf0ee54c4ef833d7f3481d32522c23ece7b790f89af7d'
+            '301dfe13ab0dca5fc99f0a9ed9c62d145bf7e76ce1afe60adbbd0b7ec86d6ce3'
+            'd90088ce7f2fe633a9b46a4cfd097044bffc6c8e03d9244f08b82328b0b83737'
+            '7f9393c25dd4a4cd1fec292a8dbf98708990719d9dca8ca7d00b96d78d61969f')

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

@ -157,6 +157,19 @@ prepare() {

  # as well as our external PCRE library and zlib
  rm -rf src/3rdparty/{pcre,zlib}
+
+  # build qmake using mingw-w64 {C,LD}FLAGS
+  # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
+  CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}"
+  CFLAGS="${MINGW_CFLAGS:-$CPPFLAGS -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions --param=ssp-buffer-size=4}"
+  CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions --param=ssp-buffer-size=4}"
+  LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed}"
+  sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
+         -e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|"\
+         -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
+    mkspecs/common/gcc-base.conf
+  sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|" \
+    mkspecs/common/g++-unix.conf
 }

 build() {
@ -164,7 +177,8 @@ build() {

  # do not set any flags here, flags are configured via mkspec
  # (Setting flags here is not appropriate as it does not allow to
-  #  distinguish between flags for native compiler and cross compiler.)
+  #  distinguish between flags for native compiler and cross compiler.
+  #  See prepare() function.)
  unset CFLAGS
  unset CXXFLAGS
  unset LDFLAGS
@ -216,6 +230,7 @@ build() {

    # allows using ccache despite the use of pre-compile header (sloppiness must be set to pch_defines,time_macros in ccache config for this)
    qt_configure_args+=' -device-option CROSS_COMPILE_CFLAGS=-fpch-preprocess'
+    qt_configure_args+=' -device-option CROSS_COMPILE_CXXFLAGS=-fpch-preprocess'

    # add include directory of freetype2 and dbus manually (pkg-config detection in qmake doesn't work which is currently ignored via a patch)
    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2 dbus-1 | sed -e "s/-I\/usr\/${_arch}\/include //g")"
--- a/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,4 +1,4 @@
-From 916b6a82bc084162432f9ed36934940892679ebd Mon Sep 17 00:00:00 2001
+From ebb6744032ebe7ff6541ef1f1febe8c57a2a84c9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
@ -13,13 +13,13 @@ Also see the following issues:
 * https://github.com/Martchus/PKGBUILDs/issues/59
 * https://github.com/Martchus/PKGBUILDs/issues/60
 ---
- mkspecs/common/g++-win32.conf      | 53 ++++++++++++++++++++----------
+ mkspecs/common/g++-win32.conf      | 52 ++++++++++++++++++++----------
 mkspecs/win32-clang-g++/qmake.conf |  4 +--
 mkspecs/win32-g++/qmake.conf       |  4 +--
- 3 files changed, 40 insertions(+), 21 deletions(-)
+ 3 files changed, 39 insertions(+), 21 deletions(-)

 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index f0df324b64..48d1c49d44 100644
+index f0df324b64..07e2b6a88e 100644
 --- a/mkspecs/common/g++-win32.conf
 +++ b/mkspecs/common/g++-win32.conf
@@ -8,18 +8,24 @@
@ -58,11 +58,9 @@ index f0df324b64..48d1c49d44 100644
 
 QMAKE_INCDIR            =
 
-@@ -42,41 +49,53 @@ QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
- QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
+@@ -43,40 +50,51 @@ QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
-+QMAKE_LFLAGS            = -g
 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
 -QMAKE_LFLAGS_RELEASE    = -Wl,-s
 +QMAKE_LFLAGS_RELEASE    =
@ -127,7 +125,7 @@ index f0df324b64..48d1c49d44 100644
 -include(angle.conf)
 -include(windows-vulkan.conf)
 diff --git a/mkspecs/win32-clang-g++/qmake.conf b/mkspecs/win32-clang-g++/qmake.conf
-index 4630ec4602..4981a28736 100644
+index 4630ec4602..3f9fdc72b1 100644
 --- a/mkspecs/win32-clang-g++/qmake.conf
 +++ b/mkspecs/win32-clang-g++/qmake.conf
@@ -14,11 +14,11 @@ include(../common/g++-win32.conf)
@ -135,17 +133,17 @@ index 4630ec4602..4981a28736 100644
 
 QMAKE_CC                = $${CROSS_COMPILE}clang
 -QMAKE_CFLAGS           +=
-+QMAKE_CFLAGS           += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
+QMAKE_CFLAGS           += $${CROSS_COMPILE_CFLAGS}
 QMAKE_CFLAGS_WARN_ON   += -Wextra -Wno-ignored-attributes
 
 QMAKE_CXX               = $${CROSS_COMPILE}clang++
 -QMAKE_CXXFLAGS         +=
-+QMAKE_CXXFLAGS         += $${QMAKE_CFLAGS}
+QMAKE_CXXFLAGS         += $${CROSS_COMPILE_CXXFLAGS}
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
 
 QMAKE_LINK              = $${CROSS_COMPILE}clang++
 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
-index ed131c6823..b77d86cd6b 100644
+index ed131c6823..b8e08df0be 100644
 --- a/mkspecs/win32-g++/qmake.conf
 +++ b/mkspecs/win32-g++/qmake.conf
@@ -12,11 +12,11 @@ include(../common/g++-win32.conf)
@ -153,12 +151,12 @@ index ed131c6823..b77d86cd6b 100644
 
 QMAKE_CC                = $${CROSS_COMPILE}gcc
 -QMAKE_CFLAGS           += -fno-keep-inline-dllexport
-+QMAKE_CFLAGS           += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
+QMAKE_CFLAGS           += $${CROSS_COMPILE_CFLAGS}
 QMAKE_CFLAGS_WARN_ON   += -Wextra
 
 QMAKE_CXX               = $${CROSS_COMPILE}g++
 -QMAKE_CXXFLAGS         += -fno-keep-inline-dllexport
-+QMAKE_CXXFLAGS         += $${QMAKE_CFLAGS}
+QMAKE_CXXFLAGS         += $${CROSS_COMPILE_CXXFLAGS}
 QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
--- 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,4 +1,4 @@
-From cf9119f68b3e575ef07853ab177259f4ef044e0b Mon Sep 17 00:00:00 2001
+From 23c62d9404fec91a2dbc4fd249c24ac414c95150 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
--- 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,4 +1,4 @@
-From dcfdcfea110398d0ce98c184b975f59354d4528b Mon Sep 17 00:00:00 2001
+From 089a61fec96026f45584062423b2a09e757d654b 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
--- 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,4 +1,4 @@
-From 42ab8012488408bfb6ab77fb056b27f3400d40ce Mon Sep 17 00:00:00 2001
+From f541e6f3d425f2abd495f3964ed5e895e7719588 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
--- 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,4 +1,4 @@
-From 07fa0fe80bd49e335ff8663ee8c67aa6b0f042c8 Mon Sep 17 00:00:00 2001
+From 64e78255f007bf4949c440e3f6fb0bc48c467824 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
--- 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,4 +1,4 @@
-From f02b2a6ef057ac969eb813735a88e3dfedf924a2 Mon Sep 17 00:00:00 2001
+From 8d4415f5c848f4cb291282842a5fe7fbca509d59 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
--- 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,4 +1,4 @@
-From 941886c8d4ca7655cdd165eeb439d93abcf9eab2 Mon Sep 17 00:00:00 2001
+From cbcce4bff865989e893dfc8979730050517ee69e 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
--- 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,4 +1,4 @@
-From 00538d150502debca140f94c2057c1a541b8333f Mon Sep 17 00:00:00 2001
+From 4907c25ba7070ad0f58b038f0d4b9de904b17961 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
--- 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,4 +1,4 @@
-From 3acf388e10fd40909af87cfdba35768f2be26be6 Mon Sep 17 00:00:00 2001
+From 02a7c8481cb1d6f760307f34c6be4cd888fdc9ed 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
--- 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,4 +1,4 @@
-From 27a1638bad652da1e73bbe1533aca8b625eeda4d Mon Sep 17 00:00:00 2001
+From 6f001ca09fe5bb1aca85a3f532489b3aa412cd2a 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
--- 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,4 +1,4 @@
-From f4d9c0c1b22a122df1393b47d485a0f4416ad8bc Mon Sep 17 00:00:00 2001
+From e3e5bfb055f8f25db2c098b35d8376e956eed80e 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
--- 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,4 +1,4 @@
-From dbb80749d9fa50db27c240769aa9f59b24067f3f Mon Sep 17 00:00:00 2001
+From 7c369864f7ef939dd0bdbc805fe0951429e27405 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
--- 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,4 +1,4 @@
-From 4d4b4bede0fbdd326c41333e3605225cafd8861a Mon Sep 17 00:00:00 2001
+From cffd6d5675635e1d2d170f31dc4b70013437db7c 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
--- 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,4 +1,4 @@
-From c0ac12f99fde7a3a4d6355e68c631fbac5356f82 Mon Sep 17 00:00:00 2001
+From 23624432b529e988504650293351d77b5f19beb9 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
--- 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,4 +1,4 @@
-From e9810c35b4a294691ffea20dd51ba8ef2faf41ed Mon Sep 17 00:00:00 2001
+From 63e0fdf86c9ceaa4da247f35e7127cbab6a35c03 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
--- 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,4 +1,4 @@
-From 23c9fc7eaa3164d47e0c6049e61bfeec0bd30a0f Mon Sep 17 00:00:00 2001
+From b9f8213ea416663467061840443547a3b3412f9f 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
@ -12,10 +12,10 @@ Prevents conflict with mingw-w64-qt4 package
 4 files changed, 5 insertions(+), 5 deletions(-)

 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index 48d1c49d44..a011f681eb 100644
+index 07e2b6a88e..5bfbcfdca6 100644
 --- a/mkspecs/common/g++-win32.conf
 +++ b/mkspecs/common/g++-win32.conf
-@@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
+@@ -86,7 +86,7 @@ QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
 QMAKE_LIBS_OPENGL_ES2   = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
 QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
 QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
--- 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,4 +1,4 @@
-From 29f7e60d2712d9229d96d5aa1ec3fd0253075bca Mon Sep 17 00:00:00 2001
+From df4107f83f185cb4b621c128da8cc893fdf3745a 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
--- 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,4 +1,4 @@
-From 9baddb1d9432c91c6f4e7f8687d13fa7e38308d3 Mon Sep 17 00:00:00 2001
+From 1ca68e2ef175b6838027dc64bd5e32ff3c6eff29 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
--- 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,4 +1,4 @@
-From f844ba34e2c4d29613345477dee10fa883275fd4 Mon Sep 17 00:00:00 2001
+From 773170ab38b995464a3ee5430c7e7f8fdc84fd8d 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
--- a/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From 47c3ea27e0aba1475c450dcc590f01846b054a07 Mon Sep 17 00:00:00 2001
+From a73bf9a8194a2fdd68b531b501327cb72e6e2d36 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 20/33] Use *.dll.a as import lib extension
--- a/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From c14a296d3385a7d2aafbe793c7c1e49aa48d1b66 Mon Sep 17 00:00:00 2001
+From e362589c0413c036ee6c960f26a6aa610a085e2c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 21/33] Merge shared and static library trees
--- a/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From f3eab06f0fa50e140a96182b0b7a1555b5e4797c Mon Sep 17 00:00:00 2001
+From c7c3618a348b9cfc480f13bfb494dd6637035886 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
--- a/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From d5b5246f2422b82b55dd464964884ef31a7fa36c Mon Sep 17 00:00:00 2001
+From 7162658d8ae5a73ed35cd24287bae6c43be6cb93 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 23/33] Allow usage of static version with CMake
--- a/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From 9c26fcc555b4ff9cca74dec82dae355bb2bc0044 Mon Sep 17 00:00:00 2001
+From 9dbcc3874c61328503a15641bea40e3d28c082e6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 24/33] Adjust linker flags for static build with
--- a/Show More
+++ b/Show More