summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2020-04-04 13:35:50 +0200
committerMartchus2020-04-04 13:35:50 +0200
commit1f090a0ac13d6b54b7a8f46d740ca58d65ece4a9 (patch)
treea340e8b741a65d6a70764ff1bbbc7cdcdb50b829
parent9338171ab5df2cfa016f829757ee65985b45a8bb (diff)
downloadaur-1f090a0ac13d6b54b7a8f46d740ca58d65ece4a9.tar.gz
Update to 5.14.2
-rw-r--r--.SRCINFO68
-rw-r--r--0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch10
-rw-r--r--0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch4
-rw-r--r--0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch4
-rw-r--r--0004-Make-sure-.pc-files-are-installed-correctly.patch8
-rw-r--r--0005-Don-t-add-resource-files-to-LIBS-parameter.patch4
-rw-r--r--0006-Prevent-debug-library-names-in-pkg-config-files.patch4
-rw-r--r--0007-Fix-linking-against-shared-static-libpng.patch4
-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.patch4
-rw-r--r--0011-Fix-linking-against-static-harfbuzz.patch4
-rw-r--r--0012-Fix-linking-against-static-pcre.patch6
-rw-r--r--0013-Fix-linking-against-shared-static-MariaDB.patch4
-rw-r--r--0014-Fix-linking-against-shared-static-PostgreSQL.patch8
-rw-r--r--0015-Rename-qtmain-to-qt5main.patch32
-rw-r--r--0016-Enable-rpath-for-build-tools.patch4
-rw-r--r--0017-Use-system-zlib-for-build-tools.patch4
-rw-r--r--0018-Merge-shared-and-static-library-trees.patch6
-rw-r--r--0019-Use-.dll.a-as-import-lib-extension.patch32
-rw-r--r--0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch6
-rw-r--r--0021-Allow-usage-of-static-version-with-CMake.patch106
-rw-r--r--0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch4
-rw-r--r--0023-Use-correct-pkg-config-static-flag.patch4
-rw-r--r--0024-Fix-macro-invoking-moc-rcc-and-uic.patch12
-rw-r--r--0025-Ignore-errors-about-missing-feature-static.patch8
-rw-r--r--0026-Enable-and-fix-use-of-iconv.patch4
-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.patch4
-rw-r--r--0030-Fix-linking-against-static-plugins-with-qmake.patch4
-rw-r--r--0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch4
-rw-r--r--PKGBUILD67
-rw-r--r--qtbase-sha256.txt2
34 files changed, 227 insertions, 232 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 312152d5a3f..100e4e62203 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-base
pkgdesc = A cross-platform application and UI framework (mingw-w64)
- pkgver = 5.14.1
+ pkgver = 5.14.2
pkgrel = 1
url = https://www.qt.io/
arch = i686
@@ -32,7 +32,7 @@ pkgbase = mingw-w64-qt5-base
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtbase-everywhere-src-5.14.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.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
@@ -64,38 +64,38 @@ pkgbase = mingw-w64-qt5-base
source = 0029-Hardcode-linker-flags-for-platform-plugins.patch
source = 0030-Fix-linking-against-static-plugins-with-qmake.patch
source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
- sha256sums = d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7
- sha256sums = 4a57615e58ba06eb42d3723fd18e834cb8e5bd75e43bc855d17b553844490f4b
- sha256sums = 41bb9278778ea4b8115ce4aa0472435d5499c537fd9dc7d1faf99fed3c25ac07
- sha256sums = 91bc8d8e8eac2dddec9cac471f058f451d44bb0b8d45b6228b86d6e9de97f0a6
- sha256sums = 350321acfb5bc2c5e6cc78672728be35f223cbc7b632b389d799bdba9160eab7
- sha256sums = 5b8287a017d9397ffd1f60865bd8ba758ef340945f62c87ad2aafc9fbeb3b4b2
- sha256sums = cf2a2b1e9c685592d059009aa8ffa3c834019213575ce7afed57037ea45dda3c
- sha256sums = d9a11c90f9b0bbf82d1b9f7733b9fab1b33f3ddb4ffd7edf721c692538aa2649
- sha256sums = d0965fa68ef531dea7e92328912e210cbe678a84b0447ecc86f2c259bd819615
- sha256sums = 9a23154796e229b0f25994a191cf0eca916d2b2cafd9a1e77915a1157ef02ad2
- sha256sums = 146648c3dcff2537661b2cef9d092e0c9105deb185cf3d7f367c45c0e46df566
- sha256sums = ba29f00bec8bfb3467168b824efd729bd942d34c8da6ac3e428bd11f889da646
- sha256sums = 934998c9cb40896d41ce4e15b50d5705183da6aaca3ad65750b43984ccf12c10
- sha256sums = ad3f2deb37b057a85a3897a283515c8e2a9336cd3a1d9dbca463b9a74806c4f9
- sha256sums = e1662059f05f4caa744224fb8cbc02671983dd333227c9499307720e24be9ba1
- sha256sums = 4fd714fea42b27b763c7af8e1135b6e54b2b46b7d2cc8c71d2798c9c4fafd407
- sha256sums = dce71cf64d40481a16b08395a5e01aa80938a08e358da18d010add9606da29a8
- sha256sums = e787db710bd5e3ab77f173d5160fe879b971d3586bc88ed9f94d36d537e805db
- sha256sums = c75152ebecdeb94e59c9471944fe800805086f98ae6c54392542686aae9ed7c4
- sha256sums = 1910adf8ddba8b81a6dab9231752bbf0d391419241611ad903441f9d1f968340
- sha256sums = 6c9d9164b24222ea63e2bb98254dd66a9eb1ad377589a91437f8bccbb149e757
- sha256sums = 1e587e871fc6b8fbc5e47e73eaa4b8b484823c771d5d2ebc67396730d7deffe7
- sha256sums = 4f45f035d0c12e30cabcf57058d206458999f09582486f79c485d00f3b57f53b
- sha256sums = bd659e9867b1ec6c96c9602d9bb022b78a29e87f9690e9190c44a25967ede298
- sha256sums = 3204a14c839c2e37a46688e93ba0e3f00f32995a6b8fbf53dbff6d7e48040775
- sha256sums = 6745e3e157d6fb9db2f7147b5ab6cd40eb7ef4654cf0f9e0b59d2f90fc0abbbc
- sha256sums = 214fa36eccef5a3a1b448ac9c8a2ddc230e3ef21638e424cfeff25d705e45cb9
- sha256sums = 4d1ab6a03b65dddc2028177699e0cb5278d4a481a10a28690ec2347b3e7fa46e
- sha256sums = 85c32d151741f2fa42ab5ed16c2c85dd9e2f373dad2c8d09f7a22fbd1e1e3d72
- sha256sums = 6c163ddc1912544930d9984adcb54b6d50deb7c4a6d5bd26f6dad252748e5b92
- sha256sums = 73fa679c14c9976923cd9605ab3b838a5bce4f23d3d61f47266915296346a771
- sha256sums = d006ec483d8d7ab0e42e086f3827e4074b78dad8a098aa98aa90dcfe0e6d300c
+ sha256sums = 48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a
+ sha256sums = c758e9ec290052a3ea029f40e5d5cfaadd2135ad7841366393449a4c71d84a88
+ sha256sums = a0280ed9dd31b2cdffa1c7ae25f9a6cb3a4164c76b7fa07c4e2eaa8cc01e6762
+ sha256sums = 9a3c591e2645997a94d30687adfc08f1ea7f64597fef78c777ed7137071de02f
+ sha256sums = 1d7fe2ef6be292e9ec84f313e4ba543f1b368a1ee0915f858d54615be93cf794
+ sha256sums = 3099b7210a873ee12374d452fb98204d046a2d5c6b1a330d32d45ae59c95cd86
+ sha256sums = c2a8f4a7536ad0293bdab882d01e0055bc7d4a3e97794f7c304d01d1daa24bf7
+ sha256sums = 3b7e90637b3a0671fac0f8607d613bf0f3f9a73cc62e43848049125c7a925a52
+ sha256sums = 2e08efe5160c91899ac549303f888c5872e1d198068c5a00c3a34d7040f5410f
+ sha256sums = 82764b7047b65a262f7c49305dee6579171a5e179fa85f8801d121e03937576e
+ sha256sums = 27dd7df0721e8d4d3f4f4c30c8e9ca8793f50a04f983b3489ff1227aae996f43
+ sha256sums = 4f0754277a14bdd8682b5d3701871f8901d2dd9f00ef8318bf6d62e9d4a26171
+ sha256sums = d4b3fb742c973119d1c98a34063fcc29861fa6325481a8baf5dfac13c32db597
+ sha256sums = d70ce95ddaa3dac7bdf273c3a8926df6b41771d75f17c68e205a1b9bb80a77e1
+ sha256sums = 0366353ce1e4da4e800be55b457d649b0c3e6ba83a2d53dc8c6e3e08dd82637f
+ sha256sums = 4632228567fd25ffb75de6750120c0ceea1d2c4ce2e91ef214a39b54ee7b56fc
+ sha256sums = ab79617e34dbc8bcefb63f0ff59a3efc5da2d313284aa3e690f8c6025a9cb090
+ sha256sums = b4f68710feda5c11dc2c3b4fdc755bb2186599046a8443c6f61ff9d369357193
+ sha256sums = a4656c1d3ec12ad50b2c92382775619d435e49a392bb08be5cbc8a654248f3dd
+ sha256sums = 36e3520481ef8d58e7595195c0eb230df80034590c27622836a38199abf7721c
+ sha256sums = 640ac515c0453def45cdaf2d5813d1ae95ce953014aeacb78cb1747fa2c0da3e
+ sha256sums = 612b95a477b9956e61ac1557c0e885a7dd2ae0aa56ef69e29116cafcbc7b0d50
+ sha256sums = 2bfb7e8400b0e14b5e8c14413d67b9fa437fe920fa9ffc458f769ea22b2bed29
+ sha256sums = 26473b4a55ce4b764354ff54b40a6dcc6d93aea41b7175afeb1a030cb118f3a8
+ sha256sums = 98058d1696ff05af14d10017062d697839736cf8cfef94ac77d6cefb6c46f311
+ sha256sums = 30d2cf6c309c4922ebc4a5822aab76161950f7036666dc18489da22315ef214d
+ sha256sums = 692c3e1679aa82c6aa395d75a06f02f0d1a0b05230197ef19fe4ef7c7b3b888e
+ sha256sums = c285e9900a63d67a01accd6d7a798c5f2476e90f3d8ea8ffb0f272d90d942141
+ sha256sums = fbd28eeed43e451240c52582f675e5f5ba069450ee20488bf993b33e76e8275c
+ sha256sums = 1709f452c4986f6b7366412bc906b52e4a01d412e20d3fda561b7fa090ed8890
+ sha256sums = 245af9755b5637200ea1d678e0ac1a493ed0fbcb9c25dc2a79c0a5e3c007a19a
+ sha256sums = 810255e443f940b57e90f4934e4317c050d3edf3593cd0a30c1e2b5a35cf7f68
pkgname = mingw-w64-qt5-base
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 0b9bca52e3b..7e41b92d932 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,4 +1,4 @@
-From 5a6b36b853699f49504173ca35a1c47c9a54d56f Mon Sep 17 00:00:00 2001
+From c416378bd70ab26f9ce9e34fe72a364dd19bae73 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with
@@ -21,7 +21,7 @@ Change-Id: I4c9b3c170ed13943abe0d8b397a8cb9e360538b6
3 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index 6369436863..17d2a5efec 100644
+index c3a1f3a373..5208d22bd6 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -8,18 +8,24 @@
@@ -43,10 +43,10 @@ index 6369436863..17d2a5efec 100644
MAKEFILE_GENERATOR = MINGW
QMAKE_PLATFORM = win32 mingw
--CONFIG += precompile_header
+-CONFIG += debug_and_release debug_and_release_target precompile_header
-DEFINES += UNICODE _UNICODE WIN32 MINGW_HAS_SECURE_API=1
-QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32
-+CONFIG += precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG}
++CONFIG += debug_and_release debug_and_release_target precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG}
+DEFINES += UNICODE _UNICODE MINGW_HAS_SECURE_API=1
+QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 WIN32
# can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for
@@ -163,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644
QMAKE_LINK = $${CROSS_COMPILE}g++
--
-2.25.0
+2.26.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 2b043cf6f8f..d100924ae25 100644
--- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,4 +1,4 @@
-From 236c97172a05e530ab98153c0d16a4ddf59cd33c Mon Sep 17 00:00:00 2001
+From 06380a45c2cb2f6882e7102fdd46bcdd9e4aba48 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
@@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
-2.25.0
+2.26.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 c57dff18a38..eec82f7c5a3 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,4 +1,4 @@
-From 160ef19acaa0504bb04a8f5ffc22229102c3ec9b Mon Sep 17 00:00:00 2001
+From 40b1ebaa7481c339b437e976e760bf099df5c594 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 03/31] Fix too many sections assemler error in OpenGL factory
@@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
-2.25.0
+2.26.0
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch
index c46d359c265..9122c11e926 100644
--- a/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,4 +1,4 @@
-From d758e71cb38b4fec2f012121605185bf395206cf Mon Sep 17 00:00:00 2001
+From f1122d1929e271162eb062aad43097ad69c7159e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
@@ -49,10 +49,10 @@ index ab970c966f..01f97c61d4 100644
void writePkgConfigFile(); // for pkg-config
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 86d10c213c..c1b28a52e9 100644
+index 3ec2704625..f33edb5bd9 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
-@@ -761,7 +761,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -775,7 +775,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
}
if(!ret.isEmpty())
ret += "\n\t";
@@ -62,5 +62,5 @@ index 86d10c213c..c1b28a52e9 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
-2.25.0
+2.26.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 e8eee6e2bb8..d303224b47d 100644
--- a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,4 +1,4 @@
-From c38954b7d8c29530a5290c52f7981d7a784e7a4f Mon Sep 17 00:00:00 2001
+From dc9860e99a09a4dc54cfe60959a34e06a288f7d6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
Subject: [PATCH 05/31] Don't add resource files to LIBS parameter
@@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
-2.25.0
+2.26.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 29efcc8c40d..36345b944c1 100644
--- a/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From 8b73190855f699bd7c1ff67c753fe3d17996f43b Mon Sep 17 00:00:00 2001
+From 2cfd0a32516ba85f0c608fb81341090c28209750 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 06/31] Prevent debug library names in pkg-config files
@@ -29,5 +29,5 @@ index f9532e0db9..9c65f21ac0 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.25.0
+2.26.0
diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch
index 177aee0dcfd..3425b12a945 100644
--- a/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/0007-Fix-linking-against-shared-static-libpng.patch
@@ -1,4 +1,4 @@
-From 99c07cf7413a04cd7297a4c18e4ebf73351c8720 Mon Sep 17 00:00:00 2001
+From 3e1b4e602c5a2569d9a337990a2e38e3ef82f251 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 07/31] Fix linking against shared/static libpng
@@ -26,5 +26,5 @@ index 0202f17b21..099c11da95 100644
],
"use": [
--
-2.25.0
+2.26.0
diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch
index 61bf7cf5a67..a2de09a6272 100644
--- a/0008-Fix-linking-against-static-D-Bus.patch
+++ b/0008-Fix-linking-against-static-D-Bus.patch
@@ -1,4 +1,4 @@
-From 3a5c4c981dade3223099630a16a874ba083ecd55 Mon Sep 17 00:00:00 2001
+From d54fefe4a033a39ba628858c18ab0a95520069f2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 08/31] Fix linking against static D-Bus
@@ -9,7 +9,7 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
-index 62d78f8dc6..f7d169f053 100644
+index 868f15db13..147cf9eb00 100644
--- a/configure.json
+++ b/configure.json
@@ -188,18 +188,23 @@
@@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
# include <dbus/dbus.h>
#else
--
-2.25.0
+2.26.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 3156e48a391..2b435f7f93e 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,4 +1,4 @@
-From e1a1979b15712954adfca6d44f45dad99357286e Mon Sep 17 00:00:00 2001
+From 012e5b2dfbc5de85412bb450970d0320e369da30 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 09/31] Don't try to use debug version of D-Bus library
@@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
-index f7d169f053..846cb678c9 100644
+index 147cf9eb00..a481e54b8d 100644
--- a/configure.json
+++ b/configure.json
@@ -201,7 +201,7 @@
@@ -25,5 +25,5 @@ index f7d169f053..846cb678c9 100644
},
"condition": "config.win32 && features.shared"
--
-2.25.0
+2.26.0
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
index 4b6cf4e43cb..f5effe21a1e 100644
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ b/0010-Fix-linking-against-static-freetype2.patch
@@ -1,4 +1,4 @@
-From 3c9bf1e7fcd5f965d9f3a91d05d762d6f4061a5e Mon Sep 17 00:00:00 2001
+From ca204fd0ed444fdf4e478540f8b5d88cb345be75 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 10/31] Fix linking against static freetype2
@@ -26,5 +26,5 @@ index 099c11da95..872deb3ad3 100644
{ "libs": "-lfreetype" }
],
--
-2.25.0
+2.26.0
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch
index d078ef3096a..b8515a3462f 100644
--- a/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/0011-Fix-linking-against-static-harfbuzz.patch
@@ -1,4 +1,4 @@
-From c7515aea498a46c8d2291b8590989d6092ab3404 Mon Sep 17 00:00:00 2001
+From 483ae9b6bfc1f40e3617d8b6cd58ef93985cf397 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 11/31] Fix linking against static harfbuzz
@@ -25,5 +25,5 @@ index 872deb3ad3..7daaaa5a11 100644
},
"imf": {
--
-2.25.0
+2.26.0
diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch
index 0410f124f0d..a0f3ac3571e 100644
--- a/0012-Fix-linking-against-static-pcre.patch
+++ b/0012-Fix-linking-against-static-pcre.patch
@@ -1,4 +1,4 @@
-From d3f6ecda90e28aabf58cbb4a92f22e803551ac05 Mon Sep 17 00:00:00 2001
+From 0c26bfba6773298fd314fc38ec1be7cb58a5d752 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 12/31] Fix linking against static pcre
@@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
1 file changed, 4 insertions(+)
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index 67be67c243..0bc4c5157c 100644
+index 59d21e0a23..518f91d753 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -53,6 +53,10 @@
@@ -24,5 +24,5 @@ index 67be67c243..0bc4c5157c 100644
#include <pcre2.h>
--
-2.25.0
+2.26.0
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch
index a05f283032c..3249f32fbb3 100644
--- a/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0013-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,4 +1,4 @@
-From e6dde84ed7cc286a9e195b96e609f244654b4540 Mon Sep 17 00:00:00 2001
+From 2852ac7e9e087b8374daa044dba1885d5c2bbac5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 13/31] Fix linking against shared/static MariaDB
@@ -22,5 +22,5 @@ index cd20eef1df..babd0465ce 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
-2.25.0
+2.26.0
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
index 505b633ec1e..f6ada4e2bf3 100644
--- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,4 +1,4 @@
-From 44ddb94b2cab4338b0c4c941f5e3f8130a076530 Mon Sep 17 00:00:00 2001
+From 5f3fb54d36009c5eced4335e79437b5d8eecdf08 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL
@@ -8,7 +8,7 @@ Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index babd0465ce..b4b3bdec6b 100644
+index babd0465ce..37e25881f0 100644
--- a/src/plugins/sqldrivers/configure.json
+++ b/src/plugins/sqldrivers/configure.json
@@ -88,9 +88,9 @@
@@ -18,11 +18,11 @@ index babd0465ce..b4b3bdec6b 100644
- { "type": "pkgConfig", "args": "libpq" },
{ "type": "psqlConfig" },
- { "type": "psqlEnv", "libs": "-llibpq -lws2_32 -ladvapi32", "condition": "config.win32" },
-+ { "type": "psqlEnv", "libs": "-lpq -lintl -lssl -lcrypto -lshell32 -lws2_32 -lsecur32 -liconv", "condition": "config.win32 && !features.shared" },
++ { "type": "psqlEnv", "libs": "-lpq -lpgcommon -lpgport -lintl -lssl -lcrypto -lshell32 -lws2_32 -lsecur32 -liconv", "condition": "config.win32 && !features.shared" },
+ { "type": "psqlEnv", "libs": "-lpq", "condition": "config.win32 && features.shared" },
{ "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" }
]
},
--
-2.25.0
+2.26.0
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index e4ee2ef0542..10faeb3add3 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,20 +1,18 @@
-From 27a910a4727d8d33ea9f2f70d572512365dde3e9 Mon Sep 17 00:00:00 2001
+From d61af2077d70356fc0f69aeb27e82bed66f8d52e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 15/31] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
-
-Change-Id: I1a1533bb37d5c87b3f8e9534f67aa76026c44aed
---
mkspecs/common/g++-win32.conf | 2 +-
- mkspecs/features/create_cmake.prf | 4 ++--
+ mkspecs/features/create_cmake.prf | 8 ++++----
mkspecs/features/win32/windows.prf | 4 ++--
src/winmain/winmain.pro | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
+ 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index 17d2a5efec..2975d371e3 100644
+index 5208d22bd6..1a058b787f 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -84,7 +84,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
@@ -27,20 +25,28 @@ index 17d2a5efec..2975d371e3 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 4aa5dad467..fa8c142ec5 100644
+index 0e71fd0015..0e8d41c685 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
-@@ -321,8 +321,8 @@ mac {
- CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
- CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
+@@ -325,14 +325,14 @@ mac {
+ }
+ mingw {
- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
- !isEmpty(CMAKE_STATIC_TYPE) {
- CMAKE_STATIC_WINDOWS_BUILD = "true"
+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
+ } else {
+- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
+- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
++ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib
++ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib
+
+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf
index 272170d428..17f3ef9c2d 100644
--- a/mkspecs/features/win32/windows.prf
@@ -70,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
CONFIG += static
--
-2.25.0
+2.26.0
diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch
index 60af13a090d..715e6716933 100644
--- a/0016-Enable-rpath-for-build-tools.patch
+++ b/0016-Enable-rpath-for-build-tools.patch
@@ -1,4 +1,4 @@
-From be3b19afd1ebff11fa14ddf7d91accd06a35afbe Mon Sep 17 00:00:00 2001
+From f24d3dd8face31fb7b522ca383b8515ba2913911 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 16/31] Enable rpath for build tools
@@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
INSTALLS += target
--
-2.25.0
+2.26.0
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch
index 9feb4242f7f..2a946c4aeb1 100644
--- a/0017-Use-system-zlib-for-build-tools.patch
+++ b/0017-Use-system-zlib-for-build-tools.patch
@@ -1,4 +1,4 @@
-From e7c872f9a7e09ac30e4ea4b236630df96af1b601 Mon Sep 17 00:00:00 2001
+From 3b9033c42d77fba36734f8268f042e2c0154c2b5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 17/31] Use system zlib for build tools
@@ -23,5 +23,5 @@ index 9863ff5e69..02329611bc 100644
} else {
CONFIG += no_core_dep
--
-2.25.0
+2.26.0
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch
index fd999942857..df15800f626 100644
--- a/0018-Merge-shared-and-static-library-trees.patch
+++ b/0018-Merge-shared-and-static-library-trees.patch
@@ -1,4 +1,4 @@
-From 56291bee2a83d3a267bb1dab7625afd37a17d178 Mon Sep 17 00:00:00 2001
+From 5756d20ee409d114a355bd07051311757af46fa4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 18/31] Merge shared and static library trees
@@ -48,7 +48,7 @@ index 81c84b28ef..910e59188f 100644
+ CONFIG += no_smart_library_merge
+}
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
-index 0e41b825ec..4c4b6dd12a 100644
+index 1d79f5c958..48f6e710b6 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -1,5 +1,16 @@
@@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
INSTALLS += mkspecs
--
-2.25.0
+2.26.0
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch
index 3864595bc49..f811de33a05 100644
--- a/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/0019-Use-.dll.a-as-import-lib-extension.patch
@@ -1,4 +1,4 @@
-From 9388b61efd236a365cf12218bfc24f2ba7b24e2f Mon Sep 17 00:00:00 2001
+From e21df21893a3071ea5908c9cc19becda0287a231 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 19/31] Use *.dll.a as import lib extension
@@ -6,7 +6,7 @@ Subject: [PATCH 19/31] Use *.dll.a as import lib extension
The variables used here are provided by
g++-win32.conf
-Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764
+Change-Id: I40acb56685628ed52b3e6b89aab7f53f9a872b1a
---
mkspecs/features/create_cmake.prf | 5 +++--
mkspecs/features/qt.prf | 15 ++++++++++++---
@@ -14,21 +14,21 @@ Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764
3 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index fa8c142ec5..e023f39a5d 100644
+index 0e8d41c685..a94f443de6 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
-@@ -332,8 +332,9 @@ mac {
- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl
- CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
- } else {
-- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
-- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
-+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB}
-+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
- }
+@@ -328,8 +328,9 @@ mac {
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
+
+- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
+- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
++ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
++ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB}
++ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
} else {
- CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index bbada46c29..d6299d8eed 100644
--- a/mkspecs/features/qt.prf
@@ -59,7 +59,7 @@ index bbada46c29..d6299d8eed 100644
}
}
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index c1b28a52e9..3b4372ad05 100644
+index f33edb5bd9..3a75986257 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -99,9 +99,13 @@ private:
@@ -94,5 +94,5 @@ index c1b28a52e9..3b4372ad05 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
-2.25.0
+2.26.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 6ff538d1060..36f759ea958 100644
--- a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,4 +1,4 @@
-From 987965be28fab78041880dfbede4be209e142b26 Mon Sep 17 00:00:00 2001
+From 181461364ddf790c194108c4d6130cdd117c3a0a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules
@@ -34,7 +34,7 @@ Change-Id: I6566d42d7e27d4cd23d261a0eacca9efad9ce6df
2 files changed, 135 insertions(+), 190 deletions(-)
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 50364765fb..357c8b9cba 100644
+index 1099a761ce..a82e6a886f 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -53,6 +53,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
@@ -484,5 +484,5 @@ index 7b70cfed09..25f2162fe6 100644
-set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\")
-set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\")
--
-2.25.0
+2.26.0
diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch
index ea31373ccf8..bf9ea9af21b 100644
--- a/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/0021-Allow-usage-of-static-version-with-CMake.patch
@@ -1,4 +1,4 @@
-From 5be3611a84819a60ac3cb3ad9dd440b7af07c34f Mon Sep 17 00:00:00 2001
+From f92560dca3a5ade9c23dc6f5cf84ec0ab6404080 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Aug 2017 21:14:26 +0200
Subject: [PATCH 21/31] Allow usage of static version with CMake
@@ -11,20 +11,20 @@ installed in the same prefix
- Set USE_STATIC_QT_BY_DEFAULT to use static version
via regular find_package(Qt5Core)
-Change-Id: Ib9411a9edbad2a82414b1af61075172a797f4318
+Change-Id: I339c8ef3a6ab96a3a6b85f7c8b93f1a5ee38cd71
---
- mkspecs/features/create_cmake.prf | 108 ++++---
+ mkspecs/features/create_cmake.prf | 96 ++++--
.../data/cmake/Qt5BasicConfig.cmake.in | 304 ++++++++++++------
.../data/cmake/Qt5PluginTarget.cmake.in | 22 +-
.../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 +
src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +-
src/gui/Qt5GuiConfigExtras.cmake.in | 8 +-
src/testlib/Qt5TestConfigExtras.cmake.in | 2 +-
- 7 files changed, 319 insertions(+), 160 deletions(-)
+ 7 files changed, 320 insertions(+), 147 deletions(-)
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 e023f39a5d..b2594d9921 100644
+index a94f443de6..a0166e4230 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -68,7 +68,7 @@ split_incpath {
@@ -45,23 +45,24 @@ index e023f39a5d..b2594d9921 100644
internal_module {
CMAKE_INTERNAL_MODULE = true
-@@ -214,23 +216,25 @@ contains(CONFIG, plugin) {
+@@ -214,20 +216,25 @@ contains(CONFIG, plugin) {
win32 {
!mingw|qtConfig(debug_and_release): debug_suffix="d"
+- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
+- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
+-
- isEmpty(CMAKE_STATIC_TYPE) {
+ mingw {
CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll
CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.dll
-+ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a
-+ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a
- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
- } else:mingw {
- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a
- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a
-- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl
-- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.prl
++ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a
++ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a
++ CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
+ CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.static.prl
+ CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.static.prl
} else { # MSVC static
@@ -69,15 +70,15 @@ index e023f39a5d..b2594d9921 100644
CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib
+ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.lib
+ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib
- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
++ CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
}
} else {
+ # this branch is broken by the patch, only apply when building for Windows
mac {
isEmpty(CMAKE_STATIC_TYPE): CMAKE_PLUGIN_EXT = .dylib
else: CMAKE_PLUGIN_EXT = .a
-@@ -250,9 +254,9 @@ contains(CONFIG, plugin) {
+@@ -247,9 +254,9 @@ contains(CONFIG, plugin) {
}
}
cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
@@ -89,7 +90,7 @@ index e023f39a5d..b2594d9921 100644
!build_pass {
QMAKE_SUBSTITUTES += cmake_target_file
-@@ -261,7 +265,7 @@ contains(CONFIG, plugin) {
+@@ -258,7 +265,7 @@ contains(CONFIG, plugin) {
cmake_qt5_plugin_file.files = $$cmake_target_file.output
static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output
@@ -98,7 +99,7 @@ index e023f39a5d..b2594d9921 100644
INSTALLS += cmake_qt5_plugin_file
return()
-@@ -274,26 +278,34 @@ mod_deps =
+@@ -271,26 +278,34 @@ mod_deps =
lib_deps =
aux_mod_deps =
aux_lib_deps =
@@ -137,17 +138,24 @@ index e023f39a5d..b2594d9921 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
-@@ -324,18 +336,17 @@ mac {
+@@ -317,13 +332,6 @@ mac {
+ CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
+ CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
+
+- !isEmpty(CMAKE_STATIC_TYPE) {
+- CMAKE_STATIC_WINDOWS_BUILD = "true"
+-
+- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl
+- CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl
+- }
+-
+ mingw {
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
-
-- !isEmpty(CMAKE_STATIC_TYPE) {
-- CMAKE_STATIC_WINDOWS_BUILD = "true"
-- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
-- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = dll.a
-+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB}
-+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
+@@ -331,14 +339,30 @@ mac {
+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB}
+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
+ CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl
+ CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl
+
@@ -155,36 +163,16 @@ index e023f39a5d..b2594d9921 100644
+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = lib$${CMAKE_QT_STEM}.a
+ CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl
+ CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.static.prl
-
-- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl
-- CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
-- } else {
-- isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
-- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB}
-- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
-- }
++
} else {
- CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
- CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
-@@ -343,19 +354,18 @@ mac {
- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
-
-- !isEmpty(CMAKE_STATIC_TYPE) {
-- CMAKE_STATIC_WINDOWS_BUILD = "true"
-- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
-- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
-+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
-+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib
+
+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
+ CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl
+ CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl
-
-- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl
-- CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl
-- } else {
-- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
-- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
-- }
++
+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.lib
+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.lib
+ CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl
@@ -195,7 +183,7 @@ index e023f39a5d..b2594d9921 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
-@@ -375,12 +385,12 @@ mac {
+@@ -358,12 +382,12 @@ mac {
INSTALLS += cmake_qt5_module_files
cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@@ -210,7 +198,7 @@ index e023f39a5d..b2594d9921 100644
!build_pass:QMAKE_SUBSTITUTES += \
cmake_config_file \
-@@ -390,11 +400,29 @@ cmake_qt5_module_files.files = \
+@@ -373,11 +397,29 @@ cmake_qt5_module_files.files = \
$$cmake_config_file.output \
$$cmake_config_version_file.output
@@ -241,7 +229,7 @@ index e023f39a5d..b2594d9921 100644
!build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
-@@ -406,7 +434,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -389,7 +431,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
exists($$cmake_macros_file.input) {
CMAKE_MODULE_MACROS = "true"
@@ -250,7 +238,7 @@ index e023f39a5d..b2594d9921 100644
cmake_macros_file.CONFIG = verbatim
!build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -414,7 +442,7 @@ exists($$cmake_macros_file.input) {
+@@ -397,7 +439,7 @@ exists($$cmake_macros_file.input) {
cmake_qt5_module_files.files += $$cmake_macros_file.output
}
@@ -260,7 +248,7 @@ index e023f39a5d..b2594d9921 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 357c8b9cba..38109b0182 100644
+index a82e6a886f..270d5c1c75 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)
@@ -1061,5 +1049,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
-2.25.0
+2.26.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 d4e2c7c4cca..004cb394a78 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,4 +1,4 @@
-From 37aba0f5c23f1f71126e7472ad54ade6885137dc Mon Sep 17 00:00:00 2001
+From d214392ab20e45037c817c0150c5086993358e9f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 22/31] Adjust linker flags for static build with
@@ -25,5 +25,5 @@ index 58d1d5b366..967dc64a19 100644
+unset(_isExe)
+!!ENDIF
--
-2.25.0
+2.26.0
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index 55c7fcb9190..01b005cca27 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From 623d8969b98de1c286aef4b94d54ddf38dbe6238 Mon Sep 17 00:00:00 2001
+From 58af82ed3fefd7b230341376c20dc8be84c913a3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 23/31] Use correct pkg-config --static flag
@@ -22,5 +22,5 @@ index 910e59188f..aaa4123f4c 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
-2.25.0
+2.26.0
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
index 2aafe2b53a9..2aa74f4c976 100644
--- a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,4 +1,4 @@
-From 27a3b8f6185d125e39267456483abdde1f53ba44 Mon Sep 17 00:00:00 2001
+From b14162daa442d61ba3747a68aff6b0a33677e606 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic
@@ -18,10 +18,10 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
-index 84c75401b1..3a35e30777 100644
+index 02f49a4b1e..581dbeac50 100644
--- a/src/corelib/Qt5CoreMacros.cmake
+++ b/src/corelib/Qt5CoreMacros.cmake
-@@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
+@@ -139,8 +139,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
endif()
set(_moc_extra_parameters_file @${_moc_parameters_file})
@@ -32,7 +32,7 @@ index 84c75401b1..3a35e30777 100644
DEPENDS ${infile} ${moc_depends}
${_moc_working_dir}
VERBATIM)
-@@ -248,8 +249,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
+@@ -255,8 +256,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
set(rc_depends ${rc_depends} ${_rc_depends})
endforeach()
@@ -43,7 +43,7 @@ index 84c75401b1..3a35e30777 100644
ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles}
DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM)
add_custom_target(${target} ALL DEPENDS ${rcc_destination})
-@@ -281,8 +283,9 @@ function(QT5_ADD_RESOURCES outfiles )
+@@ -288,8 +290,9 @@ function(QT5_ADD_RESOURCES outfiles )
_QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
@@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
-2.25.0
+2.26.0
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index 085d7ec53ac..546d9b49a19 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From 4da7840c0167fba67d57c7879291b996b094ca0b Mon Sep 17 00:00:00 2001
+From b01de5ed0031d69b552b980214d4bfe6ce8ee52d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 25/31] Ignore errors about missing feature static
@@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
-index 8273ba3fe1..4cdb55d4b3 100644
+index 511b158b91..39760d5ce4 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
-@@ -150,5 +150,5 @@ defineTest(qtConfig) {
+@@ -153,5 +153,5 @@ defineTest(qtConfig) {
contains(QT.$${module}.disabled_features, $$1): \
return(false)
}
@@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
-2.25.0
+2.26.0
diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch
index 470a8cbe466..4ad59c2ac2d 100644
--- a/0026-Enable-and-fix-use-of-iconv.patch
+++ b/0026-Enable-and-fix-use-of-iconv.patch
@@ -1,4 +1,4 @@
-From fe813fad22868934acf9f628d28eb9ebc8f1b944 Mon Sep 17 00:00:00 2001
+From e2636a2a9b11a10ba86ce55a11d29623feca0c28 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
Subject: [PATCH 26/31] Enable and fix use of iconv
@@ -74,5 +74,5 @@ index ae360239c6..5fd57a1a66 100644
},
"icu": {
--
-2.25.0
+2.26.0
diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch
index 11fff5fb448..5f363544ab5 100644
--- a/0027-Ignore-failing-pkg-config-test.patch
+++ b/0027-Ignore-failing-pkg-config-test.patch
@@ -1,4 +1,4 @@
-From 30363a160959be31f59f2b3a07f2a1b0d0295937 Mon Sep 17 00:00:00 2001
+From 8aad5efe320b053525a8cdcf5dd498c349cd5050 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 27/31] Ignore failing pkg-config test
@@ -9,7 +9,7 @@ Didn't investigate why it fails, let's hope for the best
1 file changed, 1 deletion(-)
diff --git a/configure.json b/configure.json
-index 846cb678c9..c39adc981f 100644
+index a481e54b8d..34cac288a7 100644
--- a/configure.json
+++ b/configure.json
@@ -755,7 +755,6 @@
@@ -21,5 +21,5 @@ index 846cb678c9..c39adc981f 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
-2.25.0
+2.26.0
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 3bb514e1d30..4729b820f64 100644
--- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,4 +1,4 @@
-From 818b881fa3b76f914565d61c77845bdf4607aa18 Mon Sep 17 00:00:00 2001
+From 90787e1baa580ced40a79a20c8624ecdeee3aad4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies
@@ -27,7 +27,7 @@ index f7bd6dc663..b76c444012 100644
int libidx = 0, fwidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 3b4372ad05..cd10225e99 100644
+index 3a75986257..34e7776e44 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -106,6 +106,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
@@ -41,5 +41,5 @@ index 3b4372ad05..cd10225e99 100644
int libidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
--
-2.25.0
+2.26.0
diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch
index 2c599cdb698..f20b64b193a 100644
--- a/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,4 +1,4 @@
-From 5b7476e45f7ee7d513045582757d0de8874dcf17 Mon Sep 17 00:00:00 2001
+From 437223bd0628fc9f1081dc332412007df267e3fd Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 29/31] Hardcode linker flags for platform plugins
@@ -152,5 +152,5 @@ index 50a3bb41a9..285d90c6d3 100644
include(windows.pri)
--
-2.25.0
+2.26.0
diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch
index 252d8c70fcb..cfeb79257b2 100644
--- a/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/0030-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,4 +1,4 @@
-From 8138905dc5c2fa0dd00267fd5c8f26c2236d44b4 Mon Sep 17 00:00:00 2001
+From 3888a84625dae5abbf387498fe5f39166eab17e4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 25 Aug 2017 17:07:17 +0200
Subject: [PATCH 30/31] Fix linking against static plugins with qmake
@@ -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.25.0
+2.26.0
diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
index 16208a1a15c..c8711729fe5 100644
--- a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@@ -1,4 +1,4 @@
-From 7a33424a70724ff3a404d4f8a5d537fd6d6b4895 Mon Sep 17 00:00:00 2001
+From 68a2b716616ba060e856840cebb5601c61d60773 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 24 Jun 2019 13:51:02 +0200
Subject: [PATCH 31/31] Prevent 'Cannot find feature windows_vulkan_sdk'
@@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
for (nu, LD_USES) {
--
-2.25.0
+2.26.0
diff --git a/PKGBUILD b/PKGBUILD
index 8db3040d997..d3bd31a501b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ isNoOpenGL() {
}
pkgname=mingw-w64-qt5-base
-pkgver=5.14.1
+pkgver=5.14.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
@@ -86,38 +86,38 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
'0029-Hardcode-linker-flags-for-platform-plugins.patch'
'0030-Fix-linking-against-static-plugins-with-qmake.patch'
'0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
-sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
- '4a57615e58ba06eb42d3723fd18e834cb8e5bd75e43bc855d17b553844490f4b'
- '41bb9278778ea4b8115ce4aa0472435d5499c537fd9dc7d1faf99fed3c25ac07'
- '91bc8d8e8eac2dddec9cac471f058f451d44bb0b8d45b6228b86d6e9de97f0a6'
- '350321acfb5bc2c5e6cc78672728be35f223cbc7b632b389d799bdba9160eab7'
- '5b8287a017d9397ffd1f60865bd8ba758ef340945f62c87ad2aafc9fbeb3b4b2'
- 'cf2a2b1e9c685592d059009aa8ffa3c834019213575ce7afed57037ea45dda3c'
- 'd9a11c90f9b0bbf82d1b9f7733b9fab1b33f3ddb4ffd7edf721c692538aa2649'
- 'd0965fa68ef531dea7e92328912e210cbe678a84b0447ecc86f2c259bd819615'
- '9a23154796e229b0f25994a191cf0eca916d2b2cafd9a1e77915a1157ef02ad2'
- '146648c3dcff2537661b2cef9d092e0c9105deb185cf3d7f367c45c0e46df566'
- 'ba29f00bec8bfb3467168b824efd729bd942d34c8da6ac3e428bd11f889da646'
- '934998c9cb40896d41ce4e15b50d5705183da6aaca3ad65750b43984ccf12c10'
- 'ad3f2deb37b057a85a3897a283515c8e2a9336cd3a1d9dbca463b9a74806c4f9'
- 'e1662059f05f4caa744224fb8cbc02671983dd333227c9499307720e24be9ba1'
- '4fd714fea42b27b763c7af8e1135b6e54b2b46b7d2cc8c71d2798c9c4fafd407'
- 'dce71cf64d40481a16b08395a5e01aa80938a08e358da18d010add9606da29a8'
- 'e787db710bd5e3ab77f173d5160fe879b971d3586bc88ed9f94d36d537e805db'
- 'c75152ebecdeb94e59c9471944fe800805086f98ae6c54392542686aae9ed7c4'
- '1910adf8ddba8b81a6dab9231752bbf0d391419241611ad903441f9d1f968340'
- '6c9d9164b24222ea63e2bb98254dd66a9eb1ad377589a91437f8bccbb149e757'
- '1e587e871fc6b8fbc5e47e73eaa4b8b484823c771d5d2ebc67396730d7deffe7'
- '4f45f035d0c12e30cabcf57058d206458999f09582486f79c485d00f3b57f53b'
- 'bd659e9867b1ec6c96c9602d9bb022b78a29e87f9690e9190c44a25967ede298'
- '3204a14c839c2e37a46688e93ba0e3f00f32995a6b8fbf53dbff6d7e48040775'
- '6745e3e157d6fb9db2f7147b5ab6cd40eb7ef4654cf0f9e0b59d2f90fc0abbbc'
- '214fa36eccef5a3a1b448ac9c8a2ddc230e3ef21638e424cfeff25d705e45cb9'
- '4d1ab6a03b65dddc2028177699e0cb5278d4a481a10a28690ec2347b3e7fa46e'
- '85c32d151741f2fa42ab5ed16c2c85dd9e2f373dad2c8d09f7a22fbd1e1e3d72'
- '6c163ddc1912544930d9984adcb54b6d50deb7c4a6d5bd26f6dad252748e5b92'
- '73fa679c14c9976923cd9605ab3b838a5bce4f23d3d61f47266915296346a771'
- 'd006ec483d8d7ab0e42e086f3827e4074b78dad8a098aa98aa90dcfe0e6d300c')
+sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
+ 'c758e9ec290052a3ea029f40e5d5cfaadd2135ad7841366393449a4c71d84a88'
+ 'a0280ed9dd31b2cdffa1c7ae25f9a6cb3a4164c76b7fa07c4e2eaa8cc01e6762'
+ '9a3c591e2645997a94d30687adfc08f1ea7f64597fef78c777ed7137071de02f'
+ '1d7fe2ef6be292e9ec84f313e4ba543f1b368a1ee0915f858d54615be93cf794'
+ '3099b7210a873ee12374d452fb98204d046a2d5c6b1a330d32d45ae59c95cd86'
+ 'c2a8f4a7536ad0293bdab882d01e0055bc7d4a3e97794f7c304d01d1daa24bf7'
+ '3b7e90637b3a0671fac0f8607d613bf0f3f9a73cc62e43848049125c7a925a52'
+ '2e08efe5160c91899ac549303f888c5872e1d198068c5a00c3a34d7040f5410f'
+ '82764b7047b65a262f7c49305dee6579171a5e179fa85f8801d121e03937576e'
+ '27dd7df0721e8d4d3f4f4c30c8e9ca8793f50a04f983b3489ff1227aae996f43'
+ '4f0754277a14bdd8682b5d3701871f8901d2dd9f00ef8318bf6d62e9d4a26171'
+ 'd4b3fb742c973119d1c98a34063fcc29861fa6325481a8baf5dfac13c32db597'
+ 'd70ce95ddaa3dac7bdf273c3a8926df6b41771d75f17c68e205a1b9bb80a77e1'
+ '0366353ce1e4da4e800be55b457d649b0c3e6ba83a2d53dc8c6e3e08dd82637f'
+ '4632228567fd25ffb75de6750120c0ceea1d2c4ce2e91ef214a39b54ee7b56fc'
+ 'ab79617e34dbc8bcefb63f0ff59a3efc5da2d313284aa3e690f8c6025a9cb090'
+ 'b4f68710feda5c11dc2c3b4fdc755bb2186599046a8443c6f61ff9d369357193'
+ 'a4656c1d3ec12ad50b2c92382775619d435e49a392bb08be5cbc8a654248f3dd'
+ '36e3520481ef8d58e7595195c0eb230df80034590c27622836a38199abf7721c'
+ '640ac515c0453def45cdaf2d5813d1ae95ce953014aeacb78cb1747fa2c0da3e'
+ '612b95a477b9956e61ac1557c0e885a7dd2ae0aa56ef69e29116cafcbc7b0d50'
+ '2bfb7e8400b0e14b5e8c14413d67b9fa437fe920fa9ffc458f769ea22b2bed29'
+ '26473b4a55ce4b764354ff54b40a6dcc6d93aea41b7175afeb1a030cb118f3a8'
+ '98058d1696ff05af14d10017062d697839736cf8cfef94ac77d6cefb6c46f311'
+ '30d2cf6c309c4922ebc4a5822aab76161950f7036666dc18489da22315ef214d'
+ '692c3e1679aa82c6aa395d75a06f02f0d1a0b05230197ef19fe4ef7c7b3b888e'
+ 'c285e9900a63d67a01accd6d7a798c5f2476e90f3d8ea8ffb0f272d90d942141'
+ 'fbd28eeed43e451240c52582f675e5f5ba069450ee20488bf993b33e76e8275c'
+ '1709f452c4986f6b7366412bc906b52e4a01d412e20d3fda561b7fa090ed8890'
+ '245af9755b5637200ea1d678e0ac1a493ed0fbcb9c25dc2a79c0a5e3c007a19a'
+ '810255e443f940b57e90f4934e4317c050d3edf3593cd0a30c1e2b5a35cf7f68')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@@ -327,6 +327,7 @@ package() {
"${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FontDatabaseSupport" \
"${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5PlatformCompositorSupport" \
"${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5ThemeSupport" \
+ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5OpenGLExtensions*" \
"${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5WindowsUIAutomationSupport" \
"${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5VulkanSupport" \
"${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5Bootstrap" \
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index 8105d678b68..4b5ee578d56 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7
+48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a