summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO76
-rw-r--r--0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch6
-rw-r--r--0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch6
-rw-r--r--0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch6
-rw-r--r--0004-Make-sure-.pc-files-are-installed-correctly.patch12
-rw-r--r--0005-Don-t-add-resource-files-to-LIBS-parameter.patch6
-rw-r--r--0006-Prevent-debug-library-names-in-pkg-config-files.patch10
-rw-r--r--0007-Fix-linking-against-shared-static-libpng.patch6
-rw-r--r--0008-Fix-linking-against-static-D-Bus.patch6
-rw-r--r--0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch6
-rw-r--r--0010-Fix-linking-against-static-freetype2.patch6
-rw-r--r--0011-Fix-linking-against-static-harfbuzz.patch6
-rw-r--r--0012-Fix-linking-against-static-pcre.patch6
-rw-r--r--0013-Fix-linking-against-shared-static-MariaDB.patch6
-rw-r--r--0014-Fix-linking-against-shared-static-PostgreSQL.patch6
-rw-r--r--0015-Rename-qtmain-to-qt5main.patch10
-rw-r--r--0016-Enable-rpath-for-build-tools.patch6
-rw-r--r--0017-Use-system-zlib-for-build-tools.patch6
-rw-r--r--0018-Merge-shared-and-static-library-trees.patch18
-rw-r--r--0019-Use-.dll.a-as-import-lib-extension.patch10
-rw-r--r--0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch35
-rw-r--r--0021-Allow-usage-of-static-version-with-CMake.patch56
-rw-r--r--0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch6
-rw-r--r--0023-Use-correct-pkg-config-static-flag.patch10
-rw-r--r--0024-Fix-macro-invoking-moc-rcc-and-uic.patch6
-rw-r--r--0025-Ignore-errors-about-missing-feature-static.patch6
-rw-r--r--0026-Enable-and-fix-use-of-iconv.patch8
-rw-r--r--0027-Ignore-failing-pkg-config-test.patch6
-rw-r--r--0028-Prevent-qmake-from-messing-static-lib-dependencies.patch6
-rw-r--r--0029-Hardcode-linker-flags-for-platform-plugins.patch6
-rw-r--r--0030-Fix-linking-against-static-plugins-with-qmake.patch6
-rw-r--r--0031-Disable-hardware-randomizer-for-32-bit.patch49
-rw-r--r--0031-Prevent-static-build-to-prefer-dynamic-libraries.patch (renamed from 0032-Prevent-static-build-to-prefer-dynamic-libraries.patch)8
-rw-r--r--0032-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch (renamed from 0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch)6
-rw-r--r--PKGBUILD74
35 files changed, 230 insertions, 278 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ecb48217ca2..26b5872040a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-base-angle
pkgdesc = A cross-platform application and UI framework (mingw-w64)
- pkgver = 5.13.1
+ pkgver = 5.13.2
pkgrel = 1
url = https://www.qt.io/
arch = i686
@@ -37,7 +37,7 @@ pkgbase = mingw-w64-qt5-base-angle
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://download.qt.io/official_releases/qt/5.13/5.13.1/submodules/qtbase-everywhere-src-5.13.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtbase-everywhere-src-5.13.2.tar.xz
source = 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
source = 0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -68,43 +68,41 @@ pkgbase = mingw-w64-qt5-base-angle
source = 0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
source = 0029-Hardcode-linker-flags-for-platform-plugins.patch
source = 0030-Fix-linking-against-static-plugins-with-qmake.patch
- source = 0031-Disable-hardware-randomizer-for-32-bit.patch
- source = 0032-Prevent-static-build-to-prefer-dynamic-libraries.patch
- source = 0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
- sha256sums = 110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab
- sha256sums = 52f473398f93d9446a22ddd806d70ed3c530e4592013b0070f55fa6cb5dd024f
- sha256sums = a88f6a3246993a46ddda334f0b0a0f8969be3a4420fff17fe810399ab709fd4a
- sha256sums = da99200b82fd866b950de2fc5a0e633af12cce1b86168fdb5d91a269437af80c
- sha256sums = d1c962fdcf6974da877c6c94083f9a4c32b3565faa09b92fe4045df97add7fc2
- sha256sums = 704bf70f29fcd19863fdb0d1a5be62b4fa9de9c8e0bdc5b9cea4a7ed2def0908
- sha256sums = 560c2ad8dc492cd512da18ec66f5dd28892b589810f0e1de436a5e94fd28a52c
- sha256sums = b106f03cc8976ece37cbd3095707ae6d6e41b62e90d0ae6d34f96ebd8eb62a5a
- sha256sums = acaa96d5354c4c7bac6009a78e276b2f756c5557fb9016449af983f5cac896b1
- sha256sums = dc2ee63858c9b8e46a065fb430fb4563448e3d5b493c425939085c3290e1987d
- sha256sums = cddf9ff3f26661142fe9f895fde0ab587639b4bb8d6279e8de2e201e6f637cbf
- sha256sums = d9271e94b596bfdc2901af1ebd8a8284ef421e7a99d46dd3c65daed8a121d6d2
- sha256sums = f073aaf27b8b089cff3d3f54bec0e38229deaa999aff2dcc203656f8b7994cb6
- sha256sums = f6ef098372e051e234d979bd5f5467b81d89b2f803d4316f64564e16e12cbb52
- sha256sums = b001fc1b29d6b3db975d417d1ad9746fd0cabd7692b12a35d473399951f75111
- sha256sums = f9dda213747f49c13414a89a5ac3a57064a06798e92106cc3f2f227d5674450d
- sha256sums = a49459c9ed2a7fc29a82a94ab43459ff510c6763da73da46ccae5d51ff1f16bc
- sha256sums = e25f22a835b9e8ad12aa869222259024fff3d26bf9fe05ce4cc8d0f2f6f4a5e6
- sha256sums = 9940d363b3f8dc10b0151845711ba445c98e850c9fe413f52abb7f8c84eb9b50
- sha256sums = d068d378b108ebe4dc645a7cacb89c69acd6b06346bcb0b47563e8cdb9f60c46
- sha256sums = e1d4f534beb22b08cc9b70163a871281723aff19a14911f25f522c2a31de944e
- sha256sums = e7584630ea69fc8c4e937106268cbf38258550cb26d33a6a38feea0a71aa6edc
- sha256sums = 6193e9b1baa63819dca331f9a62a483c50150ee0fb64e1199b0c1fd3c6388ac3
- sha256sums = 473101992df6f30fb50b2a0be45e55f2391021c01bc2bdf6a97fd7d3067f8fe6
- sha256sums = 809214ea4afccba045c7dd41902b160cf5ec7e4a501457b79b0f51def73e6de4
- sha256sums = 565a7b7aa93c8fd57cc4e6da69246110cce82663718078b8d08952a2c4038aac
- sha256sums = a4347a60524b83a77c82aaa0502d8561dc9fb8012d676073a4211100404309ad
- sha256sums = 392608b8d6cf513f4e67ef1748e0b92e33808a16670db6346974ebc62977f762
- sha256sums = b74e5960f131866c3fb74fc756da9574e0d03227044a8b80ad7ad6716777035c
- sha256sums = 9dd9393ea601eee07b23222278369909291f1077ea7a14a790260f7b7a8da4c3
- sha256sums = 6ac3bf6b0c447804f8a3b2acebe7e432e2f2dfc6180501ff1a96d0174e4edbe8
- sha256sums = 5c37923453bc13b06a37f9e916883516c83fdcd3dcae893beb97d2b52e6b77df
- sha256sums = 536cd9405a0a7a825768388f9e761e8c257e7e6e64406c9a3cce3c9cf1f48474
- sha256sums = a0e20cc3bc60f9b7a3a7281b2f778362ce7cdb16d89478039f1c76896b3383bf
+ source = 0031-Prevent-static-build-to-prefer-dynamic-libraries.patch
+ source = 0032-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+ sha256sums = 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
+ sha256sums = 35196184205cb58bdb1ade09c02bfc660679ed4af6dc1d807a24f1c52999545e
+ sha256sums = 4c66ecd2e2e215afb7f53382139b5a3a9cc87bfec2dd75af3ab8111ce3556378
+ sha256sums = dcc5acb3e160b99101b967bd696dd48a099c65754b3908c16b46c1703f134e08
+ sha256sums = 586bea4aa870423778eb497df48479819aa50de8d07977327eb1a0f84565813a
+ sha256sums = b5363b325198c3cfaba6437d21cc2cde6c5843d33475fc559f9eae4b20e0c867
+ sha256sums = 9f835025a78ab4d7dd08b1a2cb5d499790b8e01a3039741f50c93bc6722f3c71
+ sha256sums = 5217bae23859289898060a05769cc6088852f09206d7fc681cdcb492353be219
+ sha256sums = 39d32e743984904c878616afb8ffd16ad5421bc2e67606831a4245b9ef924c7b
+ sha256sums = f5fc4b36f288bb59d662c58b49a15de84f60be05d13e89719342893138f9a903
+ sha256sums = 48f5efe578913656ab79a35f899e15bd09fde58cc10adf8f7f5dbdc0a5022b7d
+ sha256sums = f89779100c07431fee063e0f40bcb0006662794afa522e9c5a57ac1eca24f621
+ sha256sums = f5ea9cc35754556045dd2dc07745bca89f677ade9b8566539c717d35f4ae0bd1
+ sha256sums = 212aeb8f2f287108d2d884c17c2f55177b8f3c39e10357e36c2f1ef2e582a12a
+ sha256sums = 2e7145b8a8fca349ce5838d4241d29059dd421c8722260cda5d063b75ffe3b5f
+ sha256sums = c0eff682bbc11e2258c5c40591d0222e88af0d2c136b3cede8e4792a7efba2d3
+ sha256sums = 8d3879a05e0fe574671bb8952393a4e7ca44183e8116053dbf01776b2d6ad4cf
+ sha256sums = 8b06afd5adab795a47520f1dfdb8827507f8d451eb98a02dbf1b57ede08fa6e2
+ sha256sums = 21f7e13919ec7d6ae88835ce34185f7d3ff3c541a1a7bad25e4354fac0201723
+ sha256sums = 5e08c43b1a4bfc1dfe93330119cfb85d5de873b8642cbf920d4cfbdad05a7ce5
+ sha256sums = ee0412e276bac12f57f1019807f678818cc3b166afaa2523e6d3cfbcc6baf5bf
+ sha256sums = f5f57e3b1e6314203bb3a98d7ad47c46b4894651b7d4e74749df6b7f0f7548f5
+ sha256sums = 22bdbef1d761426c0388a5335c2b80be52aa75e83c75f1d134eba70091de59ed
+ sha256sums = fd37d3c487790922e6dede40964d6a8abab9908d674413748c37672863374a65
+ sha256sums = 1c4b6e6bbc985b742e4d2124b7be002948b2cb43be4524b8b713253f2afebe96
+ sha256sums = 94de3861dedd76133bd3e42793f3db3a1e8b52a921095ff853038cb5b4064a5f
+ sha256sums = cd4c07f83cad7b8b1fb2995a398a3ac2ed9b4606efc0154231821db7f793676c
+ sha256sums = b15f3a0d0dd1c14c5728444ad449f2753f6c668e73e6e2ad0477fab405c338e9
+ sha256sums = 45af95f6f2e228f04ee3e39756cf752a04a0e58da5ed445ab79dbac0c8c7472f
+ sha256sums = 29ded7cd3b82e31660d4559f0d2cefde8e18af8c4cea34fd816096946ad72189
+ sha256sums = 13aa6ba82a4a28099c0219060deab3d3023424a8c5dcf8df6b105f3831a9a184
+ sha256sums = 095a39a517844a3c3ce9282a44f39478dc6d5661b6be7f5b8517f195f0fe1b14
+ sha256sums = f8aa4f1a129d0fd98f71e9a108513ff9ca78b3d86a80554e830cf6f1ba5edb00
pkgname = mingw-w64-qt5-base-angle
diff --git a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
index 6b13408f7ed..bddf956c825 100644
--- a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@@ -1,7 +1,7 @@
-From a378fa39cd0e8100c8c3ee0a5906868663158bbf Mon Sep 17 00:00:00 2001
+From e04f26325dae3daefcdfcb8f744e262faee0c508 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
+Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with
mingw-w64
Adding a new, separate mkspec instead of patching the existing one
@@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644
QMAKE_LINK = $${CROSS_COMPILE}g++
--
-2.23.0
+2.24.0
diff --git a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
index 353bce3af59..d5e043920d0 100644
--- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,7 +1,7 @@
-From 1e4ae2deeb92c2bff530bf77e02d9409d47b95cb Mon Sep 17 00:00:00 2001
+From 66aaead6f7f57adf266115ac9764c21839c8505c 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/32] Ensure GLdouble is defined when using dynamic OpenGL
FIXME: Not sure whether this is still required
---
@@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
-2.23.0
+2.24.0
diff --git a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
index d10014a9132..4e63f417299 100644
--- a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -1,7 +1,7 @@
-From dc9fb928edeae31a253b27dc6536117b1ec3ed0d Mon Sep 17 00:00:00 2001
+From 493c7f41180718b024b773cca1c23a4b0c7a8213 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 03/33] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 03/32] 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 24758afdeb..aa04b4a672 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
-2.23.0
+2.24.0
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch
index fdb82a4ef54..572c8a08dc1 100644
--- a/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,7 +1,7 @@
-From 7d3c1a5d57a996c8eaef937486df04ad0c2559cd Mon Sep 17 00:00:00 2001
+From f72528e215897c6064ec0ae1132b6b103efaf69b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 04/33] Make sure *.pc files are installed correctly
+Subject: [PATCH 04/32] Make sure *.pc files are installed correctly
---
qmake/generators/makefile.cpp | 8 ++++++--
@@ -10,10 +10,10 @@ Subject: [PATCH 04/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 a45b676d5f..6065ca4c77 100644
+index 22ac7bf534..003ad2baf2 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -3240,7 +3240,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3245,7 +3245,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
}
QString
@@ -22,7 +22,7 @@ index a45b676d5f..6065ca4c77 100644
{
QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
if (ret.isEmpty()) {
-@@ -3265,7 +3265,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3270,7 +3270,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
if(fixify) {
if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
ret.prepend(project->first("DESTDIR").toQString());
@@ -62,5 +62,5 @@ index 266bae7e64..8222854cfc 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
-2.23.0
+2.24.0
diff --git a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
index 8442eeac8c8..76170a23709 100644
--- a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,7 +1,7 @@
-From cd4400120aa04adcc40f36f29ae395589a511409 Mon Sep 17 00:00:00 2001
+From e9a7328ecd61bf62730661b4af1e4bf9548cbc08 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 05/33] Don't add resource files to LIBS parameter
+Subject: [PATCH 05/32] Don't add resource files to LIBS parameter
Solves an issue where the generated pkg-config
files contained invalid Libs.private references
@@ -24,5 +24,5 @@ index 2175841264..c565d44e67 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
-2.23.0
+2.24.0
diff --git a/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
index d76b797812e..20206734640 100644
--- a/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,7 +1,7 @@
-From 46d434d6d978b96beae9493ea638d96065ee968f Mon Sep 17 00:00:00 2001
+From 1bef9ba7bb4cab5b5b1c245eca79f1cbfdfb55a1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 06/33] Prevent debug library names in pkg-config files
+Subject: [PATCH 06/32] Prevent debug library names in pkg-config files
qmake generates the pkgconfig .pc files two times, once for the
release build and once for the debug build (which we're not actually
@@ -15,10 +15,10 @@ files for the debug build an unique file name.
1 file changed, 3 insertions(+)
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 6065ca4c77..8a47d584c3 100644
+index 003ad2baf2..5c6e7e1281 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -3254,6 +3254,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3259,6 +3259,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
if (dot != -1)
ret = ret.left(dot);
}
@@ -29,5 +29,5 @@ index 6065ca4c77..8a47d584c3 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.23.0
+2.24.0
diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch
index 1591064bda7..c3e6ef8af00 100644
--- a/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/0007-Fix-linking-against-shared-static-libpng.patch
@@ -1,7 +1,7 @@
-From 41f5e197d8624e713d48a5a800de3211ba7df7e5 Mon Sep 17 00:00:00 2001
+From f2c9c83b1eea3e85bb03b2b2f8fde9d0376e041f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 07/33] Fix linking against shared/static libpng
+Subject: [PATCH 07/32] Fix linking against shared/static libpng
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
---
@@ -26,5 +26,5 @@ index 6280b4dfa2..36325920cd 100644
],
"use": [
--
-2.23.0
+2.24.0
diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch
index a4725b1d1d8..4cdbb7ef429 100644
--- a/0008-Fix-linking-against-static-D-Bus.patch
+++ b/0008-Fix-linking-against-static-D-Bus.patch
@@ -1,7 +1,7 @@
-From f6e638c4058335603797e7cd451fc71e89866b7e Mon Sep 17 00:00:00 2001
+From edebe4b52babc03509ff5d2037bcf59f48da21c5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 08/33] Fix linking against static D-Bus
+Subject: [PATCH 08/32] Fix linking against static D-Bus
---
configure.json | 9 +++++++--
@@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
# include <dbus/dbus.h>
#else
--
-2.23.0
+2.24.0
diff --git a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
index a0dbe248902..28af89b7240 100644
--- a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,7 +1,7 @@
-From b1d7eb0ed7121c1ec287b68c183e185836069057 Mon Sep 17 00:00:00 2001
+From 8961310da06333af92430ce142dc588d11be9773 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
-Subject: [PATCH 09/33] Don't try to use debug version of D-Bus library
+Subject: [PATCH 09/32] 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
@@ -25,5 +25,5 @@ index 370c27af5b..36545a593b 100644
},
"condition": "config.win32 && features.shared"
--
-2.23.0
+2.24.0
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
index a0b99788a05..c564452c640 100644
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ b/0010-Fix-linking-against-static-freetype2.patch
@@ -1,7 +1,7 @@
-From 4bc1016e6268e57a5b8c9c3ae067166e41d10420 Mon Sep 17 00:00:00 2001
+From b093b965b4f245488c6c6cb4ac97125e65a4ec63 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 10/33] Fix linking against static freetype2
+Subject: [PATCH 10/32] Fix linking against static freetype2
---
src/gui/configure.json | 7 +++++--
@@ -26,5 +26,5 @@ index 36325920cd..972f9914ea 100644
{ "libs": "-lfreetype" }
],
--
-2.23.0
+2.24.0
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch
index 950e299228e..5f31b0691e2 100644
--- a/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/0011-Fix-linking-against-static-harfbuzz.patch
@@ -1,7 +1,7 @@
-From 41de800407436106116940c9da87841f01322b14 Mon Sep 17 00:00:00 2001
+From 9249ae7ad76508798e6af05cb1bf8cc1915afd82 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 11/33] Fix linking against static harfbuzz
+Subject: [PATCH 11/32] Fix linking against static harfbuzz
---
src/gui/configure.json | 6 +++++-
@@ -25,5 +25,5 @@ index 972f9914ea..894c10259d 100644
},
"imf": {
--
-2.23.0
+2.24.0
diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch
index 33b6bb9f202..8f3a71f3132 100644
--- a/0012-Fix-linking-against-static-pcre.patch
+++ b/0012-Fix-linking-against-static-pcre.patch
@@ -1,7 +1,7 @@
-From a17a279ab36a4f71bbe63ada089d85fc6789a7b5 Mon Sep 17 00:00:00 2001
+From 31912a713ce6b8dfc4c19ce46137e2b62d368a72 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 12/33] Fix linking against static pcre
+Subject: [PATCH 12/32] Fix linking against static pcre
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
---
@@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644
#include <pcre2.h>
--
-2.23.0
+2.24.0
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch
index e627daebe56..d79bc4383ac 100644
--- a/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0013-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,7 +1,7 @@
-From 5bb7b2f2d9c9cc02dc064c8b64b6a10a15ab0d22 Mon Sep 17 00:00:00 2001
+From f20041cf701ce3b8918ddb4bc00d89fbc223eabf Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 13/33] Fix linking against shared/static MariaDB
+Subject: [PATCH 13/32] Fix linking against shared/static MariaDB
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
---
@@ -22,5 +22,5 @@ index cd20eef1df..babd0465ce 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
-2.23.0
+2.24.0
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
index 7304961e216..86c604c5b7b 100644
--- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,7 +1,7 @@
-From 638327519b9b04f3c105280f49f29e509c06a9ce Mon Sep 17 00:00:00 2001
+From 1df4822044b7883c15f2daffe0f31785fffdeda1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL
---
src/plugins/sqldrivers/configure.json | 4 ++--
@@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644
]
},
--
-2.23.0
+2.24.0
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index fad58795f3c..98ed6d98b21 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,7 +1,7 @@
-From a612704b7c2144f2074f7b98ceaed47aa8470dce Mon Sep 17 00:00:00 2001
+From 6d78391d7d88a4726926383c1fcadd85a85131c8 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 15/33] Rename qtmain to qt5main
+Subject: [PATCH 15/32] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
---
@@ -25,10 +25,10 @@ index 5208d22bd6..1a058b787f 100644
QMAKE_IDL = $${CROSS_COMPILE}widl
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 376a7ded5d..4fe2ef2326 100644
+index 314cd5cc67..a3cb474b67 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
-@@ -270,8 +270,8 @@ mac {
+@@ -271,8 +271,8 @@ mac {
CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
mingw {
@@ -68,5 +68,5 @@ index 9cb6ab0c59..4327ba365e 100644
CONFIG += static
--
-2.23.0
+2.24.0
diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch
index 830542acf2a..f78249bba3c 100644
--- a/0016-Enable-rpath-for-build-tools.patch
+++ b/0016-Enable-rpath-for-build-tools.patch
@@ -1,7 +1,7 @@
-From 2ed621b725a48cf41a4fd39cbb0723de1724b519 Mon Sep 17 00:00:00 2001
+From ee81a9edd185e6b452a93de51fc5963a6dfce71f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 16/33] Enable rpath for build tools
+Subject: [PATCH 16/32] 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 8354f30eea..30e8cf18c5 100644
INSTALLS += target
--
-2.23.0
+2.24.0
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch
index 6a8df34f215..28a2fc1fd2c 100644
--- a/0017-Use-system-zlib-for-build-tools.patch
+++ b/0017-Use-system-zlib-for-build-tools.patch
@@ -1,7 +1,7 @@
-From 0e4aad7814d0b407d92b34e8fcc9fba70d9bd765 Mon Sep 17 00:00:00 2001
+From 7819e3f236674e2bfb22f07bd91eaef0e0c7926e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 17/33] Use system zlib for build tools
+Subject: [PATCH 17/32] Use system zlib for build tools
---
src/tools/bootstrap/bootstrap.pro | 4 +++-
@@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644
} else {
CONFIG += no_core_dep
--
-2.23.0
+2.24.0
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch
index 27015bd4d5a..1f2db1e8417 100644
--- a/0018-Merge-shared-and-static-library-trees.patch
+++ b/0018-Merge-shared-and-static-library-trees.patch
@@ -1,7 +1,7 @@
-From 24a7b52b579fb5f0787d9738668841392c8bd649 Mon Sep 17 00:00:00 2001
+From fbda1fcb3f3bd84852a594f2bf8805db93e27294 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 18/33] Merge shared and static library trees
+Subject: [PATCH 18/32] Merge shared and static library trees
Allow installation of shared and static build in the same prefix
---
@@ -15,10 +15,10 @@ Allow installation of shared and static build in the same prefix
7 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/configure.pri b/configure.pri
-index 7b8dee0953..5477c264eb 100644
+index 3778ece180..c108b2843c 100644
--- a/configure.pri
+++ b/configure.pri
-@@ -676,7 +676,12 @@ defineTest(qtConfOutput_machineTuple) {
+@@ -652,7 +652,12 @@ defineTest(qtConfOutput_machineTuple) {
defineTest(qtConfOutput_commitOptions) {
# qdevice.pri needs to be written early, because the compile tests require it.
@@ -32,7 +32,7 @@ index 7b8dee0953..5477c264eb 100644
}
# type (empty or 'host'), option name, default value
-@@ -1369,3 +1374,12 @@ defineTest(createConfigStatus) {
+@@ -1342,3 +1347,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@@ -137,10 +137,10 @@ index 51ea3a8321..275e080ae4 100644
QMAKE_EXT_YACC = .y
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 8a47d584c3..b158bb9b52 100644
+index 5c6e7e1281..0eeeb5fb5e 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -3257,6 +3257,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3262,6 +3262,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
if (project->isActiveConfig("debug")) {
ret += "d";
}
@@ -150,7 +150,7 @@ index 8a47d584c3..b158bb9b52 100644
ret += Option::pkgcfg_ext;
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
-@@ -3433,11 +3436,11 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3438,11 +3441,11 @@ MakefileGenerator::writePkgConfigFile()
t << endl;
// requires
@@ -202,5 +202,5 @@ index c0ce0972ef..5a2deaf31d 100644
mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
INSTALLS += mkspecs
--
-2.23.0
+2.24.0
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch
index 013911c8b7a..3ecfa27f6af 100644
--- a/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/0019-Use-.dll.a-as-import-lib-extension.patch
@@ -1,7 +1,7 @@
-From ad61d1712db4cdd3389e808d46fbfcb26a2509e3 Mon Sep 17 00:00:00 2001
+From ddbf905975bdeb1e34a6e59262ad154562ccaf9a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 19/33] Use *.dll.a as import lib extension
+Subject: [PATCH 19/32] Use *.dll.a as import lib extension
The variables used here are provided by
g++-win32.conf
@@ -12,10 +12,10 @@ g++-win32.conf
3 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 4fe2ef2326..7cb27b716a 100644
+index a3cb474b67..8539bd928f 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
-@@ -281,8 +281,9 @@ mac {
+@@ -282,8 +282,9 @@ mac {
CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
} else {
@@ -92,5 +92,5 @@ index 8222854cfc..17592c2492 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
-2.23.0
+2.24.0
diff --git a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index 2255c51fb12..a74087dc240 100644
--- a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,7 +1,7 @@
-From 890e47124906afd97de44bc40520338bde5dc5d3 Mon Sep 17 00:00:00 2001
+From bf63f766c525dfb28c26f981397ad4fdfb171900 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 20/33] Pull dependencies of static libraries in CMake modules
+Subject: [PATCH 20/32] 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
@@ -20,16 +20,18 @@ e.g. to use QMAKE_PRL_LIBS instead of QMAKE_PRL_LIBS_FOR_CMAKE.
See https://github.com/Martchus/PKGBUILDs/issues/86#issuecomment-476840055
for further details on 2.
+
+Change-Id: Id818ed54ff2bfb86bfefee6e39ebc791e8343d3a
---
.../data/cmake/Qt5BasicConfig.cmake.in | 192 ++++++++++++------
.../data/cmake/Qt5PluginTarget.cmake.in | 11 +-
2 files changed, 136 insertions(+), 67 deletions(-)
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d4fd057682..838279515c 100644
+index f4a34d6e48..88ea04ce2c 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -53,10 +53,18 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+@@ -53,6 +53,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
set(_lib_deps)
set(_link_flags)
@@ -37,7 +39,10 @@ index d4fd057682..838279515c 100644
+ set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib)
+ set(CMAKE_FIND_LIBRARY_PREFIXES lib \"\")
+
- get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
+ !!ELSE
+@@ -61,6 +65,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
if(EXISTS \"${prl_file_location}\")
file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\")
@@ -48,7 +53,7 @@ index d4fd057682..838279515c 100644
# file(STRINGS) replaces all semicolons read from the file with backslash semicolons.
# We need to do a reverse transformation in CMake. For that we replace all backslash
-@@ -75,7 +83,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+@@ -79,7 +87,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
# Handle normal libraries passed as -lfoo
set(_lib \"${CMAKE_MATCH_1}\")
foreach(_standard_library ${_standard_libraries})
@@ -57,7 +62,7 @@ index d4fd057682..838279515c 100644
set(_lib_is_default_linked TRUE)
break()
endif()
-@@ -116,6 +124,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+@@ -120,6 +128,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
set(${lib_deps} ${_lib_deps} PARENT_SCOPE)
set(${link_flags} \"SHELL:${_link_flags}\" PARENT_SCOPE)
endfunction()
@@ -95,7 +100,7 @@ index d4fd057682..838279515c 100644
!!ENDIF
!!IF !equals(TEMPLATE, aux)
-@@ -129,52 +168,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -133,52 +172,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
!!ENDIF
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
@@ -166,7 +171,7 @@ index d4fd057682..838279515c 100644
!!ENDIF
!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
-@@ -191,6 +217,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -195,6 +221,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
endif()
!!ENDIF
endmacro()
@@ -182,7 +187,7 @@ index d4fd057682..838279515c 100644
!!ENDIF
if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-@@ -360,13 +395,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -364,13 +399,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
@@ -200,7 +205,7 @@ index d4fd057682..838279515c 100644
!!IF !equals(TEMPLATE, aux)
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -381,6 +418,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -385,6 +422,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
@@ -257,7 +262,7 @@ index d4fd057682..838279515c 100644
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
-@@ -399,9 +486,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -403,9 +490,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
endif()
endforeach()
@@ -271,7 +276,7 @@ index d4fd057682..838279515c 100644
endif()
!!IF !equals(TEMPLATE, aux)
-@@ -471,9 +562,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -475,9 +566,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
!!ENDIF
@@ -285,7 +290,7 @@ index d4fd057682..838279515c 100644
!!ENDIF // CMAKE_RELEASE_TYPE
!!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -484,33 +577,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -488,33 +581,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
)
!!ENDIF // TEMPLATE != aux
@@ -343,5 +348,5 @@ index 5baf0fdb10..ec5f3cc437 100644
+
+endif()
--
-2.23.0
+2.24.0
diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch
index f2a8f3b69d9..4249ddf7b16 100644
--- a/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/0021-Allow-usage-of-static-version-with-CMake.patch
@@ -1,7 +1,7 @@
-From 6bdfbfedf65c6883b74ac47a4385148bbafb4438 Mon Sep 17 00:00:00 2001
+From 2ded2c5cfa1619460df020409ab4328f38de31cd Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Aug 2017 21:14:26 +0200
-Subject: [PATCH 21/33] Allow usage of static version with CMake
+Subject: [PATCH 21/32] Allow usage of static version with CMake
Allow selecting between dynamic and static Qt versions
installed in the same prefix
@@ -22,7 +22,7 @@ installed in the same prefix
create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 7cb27b716a..7d8ac191db 100644
+index 8539bd928f..f8b37533a3 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -65,7 +65,7 @@ split_incpath {
@@ -122,7 +122,7 @@ index 7cb27b716a..7d8ac191db 100644
!isEmpty(CMAKE_STATIC_TYPE) {
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -273,35 +286,33 @@ mac {
+@@ -274,35 +287,33 @@ mac {
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
@@ -177,7 +177,7 @@ index 7cb27b716a..7d8ac191db 100644
!isEmpty(CMAKE_STATIC_TYPE) {
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -321,12 +332,12 @@ mac {
+@@ -322,12 +333,12 @@ mac {
INSTALLS += cmake_qt5_module_files
cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@@ -192,7 +192,7 @@ index 7cb27b716a..7d8ac191db 100644
!build_pass:QMAKE_SUBSTITUTES += \
cmake_config_file \
-@@ -336,11 +347,29 @@ cmake_qt5_module_files.files = \
+@@ -337,11 +348,29 @@ cmake_qt5_module_files.files = \
$$cmake_config_file.output \
$$cmake_config_version_file.output
@@ -223,7 +223,7 @@ index 7cb27b716a..7d8ac191db 100644
!build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
-@@ -352,7 +381,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -353,7 +382,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
exists($$cmake_macros_file.input) {
CMAKE_MODULE_MACROS = "true"
@@ -232,7 +232,7 @@ index 7cb27b716a..7d8ac191db 100644
cmake_macros_file.CONFIG = verbatim
!build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -360,7 +389,7 @@ exists($$cmake_macros_file.input) {
+@@ -361,7 +390,7 @@ exists($$cmake_macros_file.input) {
cmake_qt5_module_files.files += $$cmake_macros_file.output
}
@@ -242,7 +242,7 @@ index 7cb27b716a..7d8ac191db 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake,
# so we require automatic tests to be available. The only module which should
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 838279515c..811c11a666 100644
+index 88ea04ce2c..316a87aa85 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
@@ -305,7 +305,7 @@ index 838279515c..811c11a666 100644
but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location.
* An install or uninstall procedure did not complete successfully.
-@@ -155,19 +186,50 @@ if(NOT COMMAND _qt5_add_dependencies)
+@@ -159,19 +190,50 @@ if(NOT COMMAND _qt5_add_dependencies)
endif()
endfunction()
endif()
@@ -358,7 +358,7 @@ index 838279515c..811c11a666 100644
set(_deps
${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}
-@@ -179,15 +241,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -183,15 +245,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
# FIXME: handle IsDebugAndRelease like in official version
!!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -377,7 +377,7 @@ index 838279515c..811c11a666 100644
\"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\"
)
endif()
-@@ -209,9 +271,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -213,9 +275,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
!!ELSE
set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
!!ENDIF
@@ -392,7 +392,7 @@ index 838279515c..811c11a666 100644
\"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
)
endif()
-@@ -228,8 +294,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P
+@@ -232,8 +298,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P
endmacro()
!!ENDIF
@@ -402,7 +402,7 @@ index 838279515c..811c11a666 100644
!!IF !no_module_headers
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -237,46 +302,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -241,46 +306,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\"
)
!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
@@ -467,7 +467,7 @@ index 838279515c..811c11a666 100644
endforeach()
!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -285,16 +354,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -289,16 +358,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
if (NOT _check_private STREQUAL -1)
foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@@ -491,7 +491,7 @@ index 838279515c..811c11a666 100644
!!ENDIF // TEMPLATE != aux
set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
-@@ -302,10 +375,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -306,10 +379,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
!!ENDIF
@@ -504,7 +504,7 @@ index 838279515c..811c11a666 100644
set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
endif()
set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -313,17 +386,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -317,17 +390,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
endif()
set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
@@ -526,7 +526,7 @@ index 838279515c..811c11a666 100644
$$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -331,28 +404,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -335,28 +408,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
)
endif()
@@ -571,7 +571,7 @@ index 838279515c..811c11a666 100644
!!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\")
-@@ -363,13 +440,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -367,13 +444,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!IF !isEmpty(CMAKE_DEBUG_TYPE)
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
@@ -587,7 +587,7 @@ index 838279515c..811c11a666 100644
_Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
_Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
)
-@@ -379,13 +456,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -383,13 +460,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
@@ -603,7 +603,7 @@ index 838279515c..811c11a666 100644
_Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
_Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
)
-@@ -393,30 +470,44 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -397,30 +474,44 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ENDIF
endif()
@@ -658,7 +658,7 @@ index 838279515c..811c11a666 100644
# Find plugin targets
file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -430,7 +521,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -434,7 +525,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endforeach()
endif()
@@ -670,7 +670,7 @@ index 838279515c..811c11a666 100644
set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -438,7 +533,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -442,7 +537,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
!!ENDIF
@@ -682,7 +682,7 @@ index 838279515c..811c11a666 100644
set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
\"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
)
-@@ -469,16 +568,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -473,16 +572,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endif()
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@@ -703,7 +703,7 @@ index 838279515c..811c11a666 100644
)
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -487,69 +586,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -491,69 +590,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endif()
endforeach()
!!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -799,7 +799,7 @@ index 838279515c..811c11a666 100644
if (EXISTS
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -562,7 +664,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -566,7 +668,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
!!ENDIF
@@ -808,7 +808,7 @@ index 838279515c..811c11a666 100644
endif()
!!ENDIF // CMAKE_STATIC_TYPE
-@@ -572,19 +674,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -576,19 +678,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ENDIF // CMAKE_DEBUG_TYPE
!!ELSE // TEMPLATE != aux
@@ -1010,5 +1010,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
-2.23.0
+2.24.0
diff --git a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index a3ea8d8c1b3..e5bdc2cc3a5 100644
--- a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,7 +1,7 @@
-From e0a0aa6f1ae106e0ffda362a7a22c8dd3f41acb3 Mon Sep 17 00:00:00 2001
+From afef15710db64b5892939103c7b95076b926703f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
-Subject: [PATCH 22/33] Adjust linker flags for static build with
+Subject: [PATCH 22/32] Adjust linker flags for static build with
cmake/mingw-w64
Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
@@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644
+unset(_isExe)
+!!ENDIF
--
-2.23.0
+2.24.0
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index 74f2ba2c2d1..64106dcb674 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,17 +1,17 @@
-From ce7eb8c86dd0a1b7534067df6ec3fb6b408fdcc4 Mon Sep 17 00:00:00 2001
+From a618febf21e6118164eac2d0548e278bc2992941 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 23/33] Use correct pkg-config --static flag
+Subject: [PATCH 23/32] Use correct pkg-config --static flag
---
configure.pri | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure.pri b/configure.pri
-index 5477c264eb..6d117f4c4f 100644
+index c108b2843c..9525dd6336 100644
--- a/configure.pri
+++ b/configure.pri
-@@ -369,6 +369,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -345,6 +345,9 @@ defineTest(qtConfTest_detectPkgConfig) {
qtLog("Found pkg-config from path: $$pkgConfig")
}
}
@@ -22,5 +22,5 @@ index 5477c264eb..6d117f4c4f 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
-2.23.0
+2.24.0
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
index a3f2eb871e5..99cf9aea76c 100644
--- a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,7 +1,7 @@
-From ce0f25c8d3725c9c65874c46a169a9581d5c2fcc Mon Sep 17 00:00:00 2001
+From 66b806863d218a367f67b8d0a75610b614ff13b3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic
* Otherwise the arguments aren't passed correctly leading to errors like
```
@@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
-2.23.0
+2.24.0
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index d8d6d587813..8cfe19d0b2f 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,7 +1,7 @@
-From 2c8b96ba9881f3e26bfd6f191b69186c463e9991 Mon Sep 17 00:00:00 2001
+From b5fccc2c7f1da12f76fa55d15f32f2c0d80f820c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 25/33] Ignore errors about missing feature static
+Subject: [PATCH 25/32] Ignore errors about missing feature static
Not sure why this error occurs, let's hope for the best
---
@@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
-2.23.0
+2.24.0
diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch
index fae9949bcd1..ab235be98f6 100644
--- a/0026-Enable-and-fix-use-of-iconv.patch
+++ b/0026-Enable-and-fix-use-of-iconv.patch
@@ -1,7 +1,7 @@
-From b2969090dbc4f3db4964541a31a8ce69c5998d2d Mon Sep 17 00:00:00 2001
+From 302e9b9cc7d031079f174d4cede3f9407a254b29 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 26/33] Enable and fix use of iconv
+Subject: [PATCH 26/32] Enable and fix use of iconv
Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
---
@@ -49,7 +49,7 @@ index 9c39727946..cc14036b25 100644
#else
char **inBytesPtr = &inBytes;
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index b7eefb58c8..fef7ac57de 100644
+index 1b01b2b817..4247c10b03 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -72,7 +72,7 @@
@@ -74,5 +74,5 @@ index b7eefb58c8..fef7ac57de 100644
},
"icu": {
--
-2.23.0
+2.24.0
diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch
index 0feaeb05d32..0988bde57ec 100644
--- a/0027-Ignore-failing-pkg-config-test.patch
+++ b/0027-Ignore-failing-pkg-config-test.patch
@@ -1,7 +1,7 @@
-From 436242b03a054ab2699b629d819a807f37e152c3 Mon Sep 17 00:00:00 2001
+From 548b80f87af82a5ce41400748c0492769821657d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 27/33] Ignore failing pkg-config test
+Subject: [PATCH 27/32] Ignore failing pkg-config test
Didn't investigate why it fails, let's hope for the best
---
@@ -21,5 +21,5 @@ index 36545a593b..087c2f6419 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
-2.23.0
+2.24.0
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 7103fb1229b..91cf089e372 100644
--- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,7 +1,7 @@
-From 22a94d0575482106bd10c562f35b04f13781cc09 Mon Sep 17 00:00:00 2001
+From 27693312f0cd1911215e23fd6d20ed1022b247e3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 28/33] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies
In particular, it messes resolving cyclic dependency between
static freetype2 and harfbuzz
@@ -39,5 +39,5 @@ index 17592c2492..26f3f5cd82 100644
int libidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
--
-2.23.0
+2.24.0
diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch
index 13670f4ec3f..8754a4dbd98 100644
--- a/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,7 +1,7 @@
-From 96aed122b16085b36ffe3c369f858c39f7691137 Mon Sep 17 00:00:00 2001
+From 4956ef34ebadffb50a27e5d81762d7e349be5339 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 29/33] Hardcode linker flags for platform plugins
+Subject: [PATCH 29/32] Hardcode linker flags for platform plugins
Otherwise incorrect order of libs leads to errors
when building libqminimal.dll, libqoffscreen.dll,
@@ -149,5 +149,5 @@ index 174bc7b609..285d90c6d3 100644
include(windows.pri)
--
-2.23.0
+2.24.0
diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch
index 994f4ca903a..540405268dc 100644
--- a/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/0030-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,7 +1,7 @@
-From 5af3c721d89c0008e8bbefa4dbe60ea3ddce4b3e Mon Sep 17 00:00:00 2001
+From ef72bc6a1e58813a89587ca11bb27e039cba2fc5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 25 Aug 2017 17:07:17 +0200
-Subject: [PATCH 30/33] Fix linking against static plugins with qmake
+Subject: [PATCH 30/32] 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 d6299d8eed..5311748953 100644
# Check if the plugin is known to Qt. We can use this to determine
# the plugin path. Unknown plugins must rely on the default link path.
--
-2.23.0
+2.24.0
diff --git a/0031-Disable-hardware-randomizer-for-32-bit.patch b/0031-Disable-hardware-randomizer-for-32-bit.patch
deleted file mode 100644
index f0048681b1a..00000000000
--- a/0031-Disable-hardware-randomizer-for-32-bit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5d5e7070268d2ce1e9df60754dbbec218a82974b Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sat, 26 May 2018 03:47:14 +0200
-Subject: [PATCH 31/33] Disable hardware randomizer for 32-bit
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise it fails to compile src/corelib/global/qrandom.cpp:
-```
-during RTL pass: ira
-/build/mingw-w64-qt5-base/src/qtbase-everywhere-src-5.11.0/src/corelib/global/qrandom.cpp: In function ‘qsizetype qt_random_cpu(void*, qsizetype)’:
-/build/mingw-w64-qt5-base/src/qtbase-everywhere-src-5.11.0/src/corelib/global/qrandom.cpp:121:1: internal compiler error: in ix86_compute_frame_layout, at config/i386/i386.c:11693
- }
-```
----
- src/corelib/global/qrandom.cpp | 2 +-
- src/corelib/global/qrandom_p.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
-index bf01b7ae2a..0663949352 100644
---- a/src/corelib/global/qrandom.cpp
-+++ b/src/corelib/global/qrandom.cpp
-@@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
-
- QT_BEGIN_NAMESPACE
-
--#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
-+#if defined(Q_PROCESSOR_X86_64) && QT_COMPILER_SUPPORTS_HERE(RDRND)
- static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW;
-
- # ifdef Q_PROCESSOR_X86_64
-diff --git a/src/corelib/global/qrandom_p.h b/src/corelib/global/qrandom_p.h
-index 917a91098e..c770a3e19b 100644
---- a/src/corelib/global/qrandom_p.h
-+++ b/src/corelib/global/qrandom_p.h
-@@ -81,7 +81,7 @@ enum { qt_randomdevice_control = 0 };
-
- inline bool qt_has_hwrng()
- {
--#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
-+#if defined(Q_PROCESSOR_X86_64) && QT_COMPILER_SUPPORTS_HERE(RDRND)
- return qCpuHasFeature(RDRND);
- #else
- return false;
---
-2.23.0
-
diff --git a/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch b/0031-Prevent-static-build-to-prefer-dynamic-libraries.patch
index fbdd0fb0fec..6b262a3f648 100644
--- a/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch
+++ b/0031-Prevent-static-build-to-prefer-dynamic-libraries.patch
@@ -1,7 +1,7 @@
-From 7b32e9b9f45a8fd6e1b2a8ac9a70ab68741f370f Mon Sep 17 00:00:00 2001
+From 51a0ac0ff3a726f88af9e8cd472779b33117d304 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 3 Feb 2019 14:34:42 +0100
-Subject: [PATCH 32/33] Prevent static build to prefer dynamic libraries
+Subject: [PATCH 31/32] Prevent static build to prefer dynamic libraries
The static build should not attempt to link against dynamic libraries
in order to get a fully statically linked binary in the end.
@@ -10,7 +10,7 @@ in order to get a fully statically linked binary in the end.
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
-index 9be4fb6f1f..6a006b3586 100644
+index 81110e9f6d..61f7cf27d1 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -577,12 +577,12 @@ defineTest(qtConfResolveLibs) {
@@ -33,5 +33,5 @@ index 9be4fb6f1f..6a006b3586 100644
lcan += $${lib}.lib
}
--
-2.23.0
+2.24.0
diff --git a/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0032-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
index 3e2bb0106f5..8c18ed6c0b9 100644
--- a/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/0032-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@@ -1,7 +1,7 @@
-From a21352b369e9218d49e0f4e29ae30a5a58566953 Mon Sep 17 00:00:00 2001
+From 371d6eafd848635479a988a20e16d05d0a72db77 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 24 Jun 2019 13:51:02 +0200
-Subject: [PATCH 33/33] Prevent 'Cannot find feature windows_vulkan_sdk'
+Subject: [PATCH 32/32] Prevent 'Cannot find feature windows_vulkan_sdk'
See https://bugreports.qt.io/browse/QTBUG-76660
---
@@ -33,5 +33,5 @@ index 64faa4f215..f899792e4e 100644
LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
for (nu, LD_USES) {
--
-2.23.0
+2.24.0
diff --git a/PKGBUILD b/PKGBUILD
index 92a0ab5287e..c9417af74f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ isNoOpenGL() {
}
pkgname=mingw-w64-qt5-base-angle
-pkgver=5.13.1
+pkgver=5.13.2
pkgrel=1
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
# The static variant doesn't contain any executables which need to be executed on the build machine
@@ -85,43 +85,41 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
'0028-Prevent-qmake-from-messing-static-lib-dependencies.patch'
'0029-Hardcode-linker-flags-for-platform-plugins.patch'
'0030-Fix-linking-against-static-plugins-with-qmake.patch'
- '0031-Disable-hardware-randomizer-for-32-bit.patch'
- '0032-Prevent-static-build-to-prefer-dynamic-libraries.patch'
- '0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
-sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab'
- '52f473398f93d9446a22ddd806d70ed3c530e4592013b0070f55fa6cb5dd024f'
- 'a88f6a3246993a46ddda334f0b0a0f8969be3a4420fff17fe810399ab709fd4a'
- 'da99200b82fd866b950de2fc5a0e633af12cce1b86168fdb5d91a269437af80c'
- 'd1c962fdcf6974da877c6c94083f9a4c32b3565faa09b92fe4045df97add7fc2'
- '704bf70f29fcd19863fdb0d1a5be62b4fa9de9c8e0bdc5b9cea4a7ed2def0908'
- '560c2ad8dc492cd512da18ec66f5dd28892b589810f0e1de436a5e94fd28a52c'
- 'b106f03cc8976ece37cbd3095707ae6d6e41b62e90d0ae6d34f96ebd8eb62a5a'
- 'acaa96d5354c4c7bac6009a78e276b2f756c5557fb9016449af983f5cac896b1'
- 'dc2ee63858c9b8e46a065fb430fb4563448e3d5b493c425939085c3290e1987d'
- 'cddf9ff3f26661142fe9f895fde0ab587639b4bb8d6279e8de2e201e6f637cbf'
- 'd9271e94b596bfdc2901af1ebd8a8284ef421e7a99d46dd3c65daed8a121d6d2'
- 'f073aaf27b8b089cff3d3f54bec0e38229deaa999aff2dcc203656f8b7994cb6'
- 'f6ef098372e051e234d979bd5f5467b81d89b2f803d4316f64564e16e12cbb52'
- 'b001fc1b29d6b3db975d417d1ad9746fd0cabd7692b12a35d473399951f75111'
- 'f9dda213747f49c13414a89a5ac3a57064a06798e92106cc3f2f227d5674450d'
- 'a49459c9ed2a7fc29a82a94ab43459ff510c6763da73da46ccae5d51ff1f16bc'
- 'e25f22a835b9e8ad12aa869222259024fff3d26bf9fe05ce4cc8d0f2f6f4a5e6'
- '9940d363b3f8dc10b0151845711ba445c98e850c9fe413f52abb7f8c84eb9b50'
- 'd068d378b108ebe4dc645a7cacb89c69acd6b06346bcb0b47563e8cdb9f60c46'
- 'e1d4f534beb22b08cc9b70163a871281723aff19a14911f25f522c2a31de944e'
- 'e7584630ea69fc8c4e937106268cbf38258550cb26d33a6a38feea0a71aa6edc'
- '6193e9b1baa63819dca331f9a62a483c50150ee0fb64e1199b0c1fd3c6388ac3'
- '473101992df6f30fb50b2a0be45e55f2391021c01bc2bdf6a97fd7d3067f8fe6'
- '809214ea4afccba045c7dd41902b160cf5ec7e4a501457b79b0f51def73e6de4'
- '565a7b7aa93c8fd57cc4e6da69246110cce82663718078b8d08952a2c4038aac'
- 'a4347a60524b83a77c82aaa0502d8561dc9fb8012d676073a4211100404309ad'
- '392608b8d6cf513f4e67ef1748e0b92e33808a16670db6346974ebc62977f762'
- 'b74e5960f131866c3fb74fc756da9574e0d03227044a8b80ad7ad6716777035c'
- '9dd9393ea601eee07b23222278369909291f1077ea7a14a790260f7b7a8da4c3'
- '6ac3bf6b0c447804f8a3b2acebe7e432e2f2dfc6180501ff1a96d0174e4edbe8'
- '5c37923453bc13b06a37f9e916883516c83fdcd3dcae893beb97d2b52e6b77df'
- '536cd9405a0a7a825768388f9e761e8c257e7e6e64406c9a3cce3c9cf1f48474'
- 'a0e20cc3bc60f9b7a3a7281b2f778362ce7cdb16d89478039f1c76896b3383bf')
+ '0031-Prevent-static-build-to-prefer-dynamic-libraries.patch'
+ '0032-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
+sha256sums=('26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121'
+ '35196184205cb58bdb1ade09c02bfc660679ed4af6dc1d807a24f1c52999545e'
+ '4c66ecd2e2e215afb7f53382139b5a3a9cc87bfec2dd75af3ab8111ce3556378'
+ 'dcc5acb3e160b99101b967bd696dd48a099c65754b3908c16b46c1703f134e08'
+ '586bea4aa870423778eb497df48479819aa50de8d07977327eb1a0f84565813a'
+ 'b5363b325198c3cfaba6437d21cc2cde6c5843d33475fc559f9eae4b20e0c867'
+ '9f835025a78ab4d7dd08b1a2cb5d499790b8e01a3039741f50c93bc6722f3c71'
+ '5217bae23859289898060a05769cc6088852f09206d7fc681cdcb492353be219'
+ '39d32e743984904c878616afb8ffd16ad5421bc2e67606831a4245b9ef924c7b'
+ 'f5fc4b36f288bb59d662c58b49a15de84f60be05d13e89719342893138f9a903'
+ '48f5efe578913656ab79a35f899e15bd09fde58cc10adf8f7f5dbdc0a5022b7d'
+ 'f89779100c07431fee063e0f40bcb0006662794afa522e9c5a57ac1eca24f621'
+ 'f5ea9cc35754556045dd2dc07745bca89f677ade9b8566539c717d35f4ae0bd1'
+ '212aeb8f2f287108d2d884c17c2f55177b8f3c39e10357e36c2f1ef2e582a12a'
+ '2e7145b8a8fca349ce5838d4241d29059dd421c8722260cda5d063b75ffe3b5f'
+ 'c0eff682bbc11e2258c5c40591d0222e88af0d2c136b3cede8e4792a7efba2d3'
+ '8d3879a05e0fe574671bb8952393a4e7ca44183e8116053dbf01776b2d6ad4cf'
+ '8b06afd5adab795a47520f1dfdb8827507f8d451eb98a02dbf1b57ede08fa6e2'
+ '21f7e13919ec7d6ae88835ce34185f7d3ff3c541a1a7bad25e4354fac0201723'
+ '5e08c43b1a4bfc1dfe93330119cfb85d5de873b8642cbf920d4cfbdad05a7ce5'
+ 'ee0412e276bac12f57f1019807f678818cc3b166afaa2523e6d3cfbcc6baf5bf'
+ 'f5f57e3b1e6314203bb3a98d7ad47c46b4894651b7d4e74749df6b7f0f7548f5'
+ '22bdbef1d761426c0388a5335c2b80be52aa75e83c75f1d134eba70091de59ed'
+ 'fd37d3c487790922e6dede40964d6a8abab9908d674413748c37672863374a65'
+ '1c4b6e6bbc985b742e4d2124b7be002948b2cb43be4524b8b713253f2afebe96'
+ '94de3861dedd76133bd3e42793f3db3a1e8b52a921095ff853038cb5b4064a5f'
+ 'cd4c07f83cad7b8b1fb2995a398a3ac2ed9b4606efc0154231821db7f793676c'
+ 'b15f3a0d0dd1c14c5728444ad449f2753f6c668e73e6e2ad0477fab405c338e9'
+ '45af95f6f2e228f04ee3e39756cf752a04a0e58da5ed445ab79dbac0c8c7472f'
+ '29ded7cd3b82e31660d4559f0d2cefde8e18af8c4cea34fd816096946ad72189'
+ '13aa6ba82a4a28099c0219060deab3d3023424a8c5dcf8df6b105f3831a9a184'
+ '095a39a517844a3c3ce9282a44f39478dc6d5661b6be7f5b8517f195f0fe1b14'
+ 'f8aa4f1a129d0fd98f71e9a108513ff9ca78b3d86a80554e830cf6f1ba5edb00')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'