diff options
34 files changed, 196 insertions, 188 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt5-base-static pkgdesc = A cross-platform application and UI framework, native OpenGL backend (mingw-w64) - pkgver = 5.15.2 + pkgver = 5.15.2+kde+r172 pkgrel = 1 url = https://www.qt.io/ arch = any @@ -15,6 +15,7 @@ pkgbase = mingw-w64-qt5-base-static makedepends = mingw-w64-vulkan-headers makedepends = mingw-w64-pkg-config makedepends = mingw-w64-environment + makedepends = git depends = mingw-w64-crt depends = mingw-w64-zlib depends = mingw-w64-libjpeg-turbo @@ -32,7 +33,7 @@ pkgbase = mingw-w64-qt5-base-static options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz + source = git+https://invent.kde.org/qt/qt/qtbase#commit=cfa90a94f95510711e25920e7742b37faa2f4843 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 +65,38 @@ pkgbase = mingw-w64-qt5-base-static 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 = 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 - sha256sums = b3b49e5580f296f993a0aba0b34bd5ae2399f8d1809456878c1881451b14c27e - sha256sums = 833b8fc2dd8f0bb4a914fb7f5018b28954752b2d54cec2388332885c929a9266 - sha256sums = e49f91d9f8f56afc856a9e143feb4ad9cf54c804f773374e5ccb6d1fc264a7bc - sha256sums = 944288f57ac8cc9063a75a3a6b421c20a3e8b02a5fd5294f7da7df28c840302b - sha256sums = b421b77303f6f03682c04f1bd1c2c63e07b120dc724de93a9248330d0080ee26 - sha256sums = 595fe18bbefb6f7e271a9daeefbd008d6350ef44b16b4b72c4d3183ba14509ee - sha256sums = 238900f33394be14378b58445abe28dcd66343ed4f0760c8f944508c02ae831b - sha256sums = bbde0b8ac3a9639a90e2937367deb769ea39ee55b036995a253ec8fdd1d2bd2c - sha256sums = 859c065f54819266b33bab6b57f76f8c21065a48ff36104b191e218e31f20f9e - sha256sums = 896c0b0d346f271f90609c6b49490ee86d3076ae620af1127503ee397a7664bb - sha256sums = 15c69cd06b6e28100ad118ed045abef670acd41609351cd8e2652f1aeec9c8c4 - sha256sums = 499b3a1177e2340b5063553452b0a9a44f232e47839f03087939f52da38d0548 - sha256sums = bbe45a397cbc4c0303125937710e305c6dbb0e4a8713b4a520ff820208295ea8 - sha256sums = 3fedd43cccc7000271766f7b4ff85efafc9c65ce3b9f40f4c443a0f352518631 - sha256sums = 2b4854083457f85a82e8f05c23d3983095ff8aa1d1e0ea5cfe1f7e9731b061f8 - sha256sums = 6d4dc98c2b9e0ed743332797e1511262bda3b240e4685c2150a40415650c78f0 - sha256sums = 27b0eb4795713e1c6804dbb446970684c19cc2797f9e371eb2605c852d404b05 - sha256sums = 0fa5c3b49425cfb357e9d04bf993e065174d8b44e450dd134aa24187ed66e0e1 - sha256sums = d990f99f04dcf52cae5d7f6dd4394aae778683c2d9ebcb41b485129af8c2cf2f - sha256sums = 7a395f7e9f26a650e09ad4b35563d5cb46c34dfae1c7de2f4dcf0e86f9dd1927 - sha256sums = d38cbc2d4566a3915475fa29ae2982173cd1339abdbff292f5cd520c7c741039 - sha256sums = 2b90d5b001da77692805a8fc9f6ac77ed8d3bfce48f52c89be1b13e915b5ef7c - sha256sums = 5b973e490c3bbbc3aba7bf2b4fa704c38f92601c7736b483334025e2fc913285 - sha256sums = 73683e5bc8672c09c7c4e86b4787bbb5792570a511768509db6c7a7f45a58109 - sha256sums = cc8d458974c5168a7956d4682a63b0c15f9918256820ae908b88e5dd18d95811 - sha256sums = 3cb99ad9d910bad53ad8565d0be2fb6bb4a0d1075dbb73fd85cb2ffbe404d73e - sha256sums = ea31c31ccbd47f6d77a1cf00768a9c247b368d79e3ba19dca4854c29f1a69a69 - sha256sums = e6ed01492dacf7367d8f444eb00e2bcdae1fc3b3f1648858e6e379b1565f8943 - sha256sums = d4cd03c966a6a1c37ce21f9e6bbd9deaadbb62f31a1a652ac12cd48a651fc47d - sha256sums = d9f55e93cfde4bd6d46744697ae846490912342bdb84ad8c4ba0cf7689b472ab - sha256sums = d5478d6cbcb1067bf1b8e3e52210f1416d734303e387facb165b92f281789436 + sha256sums = SKIP + sha256sums = 07ca76c848991c2e34e021626374812aad040e210413c84e1ab372f79bc5733b + sha256sums = f271f7509c97e9f3de2d11c887c03be7e58c39b9eafd83691400a87143a86324 + sha256sums = 3fedd054e1dd439664aec2225de903c2d235c62113be69d361908466838e8c55 + sha256sums = a57715bf58b66ffdb2e67d9ba5ae437a6f627a144cd759cfaa9726d2151a6a61 + sha256sums = 934bd614407ff0e6c0366a765d93cd0854e23169cc2c6e69f789ef3d14095fea + sha256sums = 60def68fdbba857ab22eafc05d0e97b6aa43a0b13903e852902958d2cb847010 + sha256sums = 3f8fcde556f9ed718e1c2fdc466ec787fc639f83afba4b71ba125dfc2b0e74d0 + sha256sums = ec12dff066a5af6e034cae56984a275576790a6c52512e78d792b0d14503b319 + sha256sums = 26aaff027ba16ba61b7b4684a97f7595eef811c49e9263e5ba88ba6b51e4fcb9 + sha256sums = bde7b7b5e8d32814b26e5a46750c8d5e0e83047d335c94cbbc0b485e9b96a188 + sha256sums = 00b5e1bce87c62bc61cac71654ee5dbe57ea005fc8e7ff7206c936699e199747 + sha256sums = 93b2db5134581d8312996ae1eadc834ddc5fc394aaf88532554eea8f0936506f + sha256sums = 09bc39fa186fc4bed14cb3f589d8b77e10e3bf7a904dba43758805124e1d3787 + sha256sums = 5e6ddbcd6ab35fcf3e75bb353bc10fe258e8e1753456ba55d65f8ba5667d1c7f + sha256sums = d86b3cf81608819c7d371681f293f3168ce6198368441c916505f1efa1f6ad7d + sha256sums = 5d7eaaeec84a23b9db12e2998c099ceddd853d2d819018bbad472e77ecd72429 + sha256sums = 8ec002dfe54c83be1fac8bf5a3badb611230fba8ce91eb33bd26cd06b6ecec63 + sha256sums = c06f2a6a2bfffffea82fef8023039821fa2869a95af4a31bfd4224ee50cfa78c + sha256sums = 6d3c73791781ba99f48658bf65f446e4e8b94b1327d901f3fa34e3cf9c07c176 + sha256sums = b9ddaa27fa95aeb8dce1fb38950ae095e5c60a5c9bcef4f46138fc1fa1824807 + sha256sums = bab619655a585095269a5250170900d0dbce7ac6b20586d3ca468e914c39a8d4 + sha256sums = 3ebe50b4d7e436e0bdf396bba04f6c7dc79ca7e62b392cc2f3cdc8b898218682 + sha256sums = 19e1b928c03fa58dca7b5e27d97b7829ee28af280cf857f520d1e6a04e528ad5 + sha256sums = 77e7cf6a9ab87b76fd0d0f0e1c2948ad49db1fb1972887ad46a8ae179c627354 + sha256sums = 232d3dcb1d13d4961ca6a35ff5897aa633bca12f4425a35eea990759124b238d + sha256sums = 51fb2c38a41133fc816a16bd74cc2ba93b1b8ca4e456bba42b2ffe3e36aa8e80 + sha256sums = f1148c997a0d727b7b640594543196d8226f2f8c7df5c849523c8bbe9c37ad45 + sha256sums = 5a74594feb11c0c078ad4bbcefe662e54fc2a451ae7972a20247597ed392c1de + sha256sums = 70198d0a35338cb56c4aad5ad1789a915a5b628a3e3b780f2767fbd30ef7e31d + sha256sums = 7413278602ea7f9fc80d749d5008d029e775b191994c71ff78f5de5f780e2e3b + sha256sums = 1e2900354c1a6c38e87eff51a96099473827d6c70530dd63b036bdb7ba7ab2fa pkgname = mingw-w64-qt5-base-static 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 06b812e01114..93621b5d0f03 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 ce90790a4f5c2dcf9398d846f63a6c6b50411dcb Mon Sep 17 00:00:00 2001 +From e598463de84a2fa54739b386acf64bef368e8089 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 @@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.29.2 +2.31.1 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 a7ba57b4bd79..ccbdf7c9d49f 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 adbb14a78c0091c81925e5e79644ff8361e7b8e9 Mon Sep 17 00:00:00 2001 +From e6fef0839710cdc28d5e5df0ae3189d16d629172 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.29.2 +2.31.1 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 31b280461dd3..64a68df5cec5 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 520b519d962852792bd4ac3c2d1206afa329b65e Mon Sep 17 00:00:00 2001 +From 434420a1da0cc19096d1877b662eb6844ceb97dd 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.29.2 +2.31.1 diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch index 7ad86637cf39..a9c2066ff07c 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 45491f6d0b4d828f3b4ce6b76ec3c7d68cec6b06 Mon Sep 17 00:00:00 2001 +From f041def0ede2e36edd35ddae430fb7c06186756e 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 @@ -10,10 +10,10 @@ Subject: [PATCH 04/31] 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 5c61a3c65c..e94084381c 100644 +index a901332312..f1e8966123 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3211,7 +3211,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3218,7 +3218,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index 5c61a3c65c..e94084381c 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3236,7 +3236,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3243,7 +3243,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -36,7 +36,7 @@ index 5c61a3c65c..e94084381c 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index a96b9c54da..5a7913be7a 100644 +index dc612c392c..7bfd2e1953 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -96,7 +96,7 @@ protected: @@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.29.2 +2.31.1 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 8fe274d055dc..062e54e19528 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 806b631662ffebfa38085e1f9e708aee2c19f1d9 Mon Sep 17 00:00:00 2001 +From ed8bf76c5e770f8097a375b49f58bedd738f84f7 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 ee9a41838b..8d1dcae85b 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.29.2 +2.31.1 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 0bc5e996f8e1..3a1ca90960d8 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 3d816219968cfcaacfd30b6011263c8bb4d975c0 Mon Sep 17 00:00:00 2001 +From d77ce81ca24a85f10a0fb20a902f051c10662ea2 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 @@ -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 e94084381c..8e4d11484f 100644 +index f1e8966123..f45b6c9fd5 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3225,6 +3225,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3232,6 +3232,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index e94084381c..8e4d11484f 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.29.2 +2.31.1 diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch index 040ddbb4bdb8..1d7ff60c7e73 100644 --- a/0007-Fix-linking-against-shared-static-libpng.patch +++ b/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 77037d64693385c1cdcc2814890567e79548b40d Mon Sep 17 00:00:00 2001 +From 6838542142005d64b1447a1720109c82b2eb0434 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 @@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index c8c4864eca..be519a6d39 100644 +index 1f08795c57..7a5fc6ce7a 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -399,8 +399,10 @@ @@ -26,5 +26,5 @@ index c8c4864eca..be519a6d39 100644 ], "use": [ -- -2.29.2 +2.31.1 diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch index 82d8973a7f66..be6d0a5bbe0f 100644 --- a/0008-Fix-linking-against-static-D-Bus.patch +++ b/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From be0366f6b3d32f5c80038eca7d0c7ddd5375aa85 Mon Sep 17 00:00:00 2001 +From 81a8053aafc7f2111ecdc0a07d4f5e062fd19f70 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 c273aeeef1..57c40030d8 100644 +index 4a7c50f684..fedc80fa18 100644 --- a/configure.json +++ b/configure.json @@ -190,18 +190,23 @@ @@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644 # include <dbus/dbus.h> #else -- -2.29.2 +2.31.1 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 2d4c36b9ce1d..0b35e1c70642 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 adb495753f647c7b78d923bb512e18003cd309a4 Mon Sep 17 00:00:00 2001 +From 83ce093ca3e4ba1414395840e550bd1cb4dcce41 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 57c40030d8..2fa3c08440 100644 +index fedc80fa18..e308b5b7d7 100644 --- a/configure.json +++ b/configure.json @@ -203,7 +203,7 @@ @@ -25,5 +25,5 @@ index 57c40030d8..2fa3c08440 100644 }, "condition": "config.win32 && features.shared" -- -2.29.2 +2.31.1 diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch index fc9a35eb3ed8..201be0f8b497 100644 --- a/0010-Fix-linking-against-static-freetype2.patch +++ b/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 8a8da9fb5e44acf747985254b8e4a0e663397c15 Mon Sep 17 00:00:00 2001 +From 82af201a622c806d9a26e5f2710ad1391034a957 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 @@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index be519a6d39..d74fd3bc24 100644 +index 7a5fc6ce7a..b117f6fff6 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -238,8 +238,11 @@ @@ -26,5 +26,5 @@ index be519a6d39..d74fd3bc24 100644 { "libs": "-lfreetype" } ], -- -2.29.2 +2.31.1 diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch index e03dd7e64cdb..8dafb916324c 100644 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From 32692f0bf4ae8f35145d963fe95b82a11a20e6ca Mon Sep 17 00:00:00 2001 +From 781ee4c305c86f72fb851324e10b85ad113ca8d3 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 @@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index d74fd3bc24..d6759ed96a 100644 +index b117f6fff6..2a0207920a 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -306,7 +306,11 @@ @@ -25,5 +25,5 @@ index d74fd3bc24..d6759ed96a 100644 }, "imf": { -- -2.29.2 +2.31.1 diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch index 403c1e8665a1..f46384745e34 100644 --- a/0012-Fix-linking-against-static-pcre.patch +++ b/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 3bb30ee7403e468705aa03e1d92f797d6ce38332 Mon Sep 17 00:00:00 2001 +From 0bac31a16786b2ffac3b8623d6a9f28b5924fee9 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 @@ -24,5 +24,5 @@ index d7e3cc5ee2..e17c19fbae 100644 #include <pcre2.h> -- -2.29.2 +2.31.1 diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch index dda69c2f72f8..a176171165cc 100644 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 5d301704de074aeee8464bf9933296a437353a6f Mon Sep 17 00:00:00 2001 +From 370cd6e5833f50acbd4fdfdef5d1b8465f369696 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 28ccbeadcd..7262914c64 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.29.2 +2.31.1 diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 366913c83a6e..bfb067804f7a 100644 --- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 0f760f0e2b127ca9e765d2bbf4200b047bfa1a5e Mon Sep 17 00:00:00 2001 +From f1cce674c4e438e623387d8091bb9b3528c1210d 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 @@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644 ] }, -- -2.29.2 +2.31.1 diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch index 449698a967a4..44cf536e18ec 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 092e86f5dedf3173be832f868b60b1c306c42bfa Mon Sep 17 00:00:00 2001 +From 9aa2c124207494aaedfeead42851cc0cbf488237 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 @@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.29.2 +2.31.1 diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch index c4cf6a4eff00..540fd0109e5c 100644 --- a/0016-Enable-rpath-for-build-tools.patch +++ b/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From fc76d4187ab337a5efb96d6b80099f5075df69ee Mon Sep 17 00:00:00 2001 +From 8d40dc38a6d42e0aa72d94dead17af04319345a6 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.29.2 +2.31.1 diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch index 6a30f8cdebf6..3aabdee00b00 100644 --- a/0017-Use-system-zlib-for-build-tools.patch +++ b/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 2e0b11f0f0ba3e756f010b5948b24089be5e3aed Mon Sep 17 00:00:00 2001 +From ec4a953eddc6fe6f19a8f932ef4bcbcb15868e63 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 24862a07db..698e6cfb95 100644 } else { CONFIG += no_core_dep -- -2.29.2 +2.31.1 diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index ae13c1618b8d..8a70156a3373 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From bd22c9c095f87d358ea2269bfdd19cc31078b0b1 Mon Sep 17 00:00:00 2001 +From f0d6651cfac8231a7f57a0f70300d439f56ed5fc 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 @@ -139,10 +139,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 8e4d11484f..c73b19c144 100644 +index f45b6c9fd5..39221caf68 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3228,6 +3228,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3235,6 +3235,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -152,7 +152,7 @@ index 8e4d11484f..c73b19c144 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3404,11 +3407,11 @@ MakefileGenerator::writePkgConfigFile() +@@ -3411,11 +3414,11 @@ MakefileGenerator::writePkgConfigFile() t << Qt::endl; // requires @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.29.2 +2.31.1 diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch index 7ae066111a9e..ba915dcda5d8 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 ae893f34a059c78cf274d1ed05c2d4c4bfb66218 Mon Sep 17 00:00:00 2001 +From de05a40cbb5e86f0a0217624f80cb1a1ad31351f 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 @@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.29.2 +2.31.1 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 4bcd8f46b58c..d1ebf92e3533 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 1b69d19dd9ef7d00a5eec9a22961c3232e19e5b1 Mon Sep 17 00:00:00 2001 +From 625df2d13ff194603a339e770c645489e2a52f9a 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 @@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644 +endif() \ No newline at end of file -- -2.29.2 +2.31.1 diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch index 17ed0bedfa5c..847f92f2b5c1 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 494194c5b6b2775e756e911f5befde85e9ce13e4 Mon Sep 17 00:00:00 2001 +From 195f06dc9b77f9c5db4cbab8af0b8dc2fac34427 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 @@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.29.2 +2.31.1 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 d8d31d0b07b2..3b9ad058fdc4 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 0f44180723f14ae9861b406238d973e0ca20c405 Mon Sep 17 00:00:00 2001 +From 70e76369ababd9f7c22cef148eaa2755e31c2b2b 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 @@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.29.2 +2.31.1 diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch index 873c3996e3be..7992084d2ac7 100644 --- a/0023-Use-correct-pkg-config-static-flag.patch +++ b/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 0084c7966f46b5a64cac040a8c50c793ba680930 Mon Sep 17 00:00:00 2001 +From ee3bd9b4ff71e2f8f923245f61294284c7085d8a 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 53c67f885b..8934b72291 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.29.2 +2.31.1 diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 2a0983f13bf0..ef90616018b6 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 e5389013ff78085fdfdfbf1da5b0644e784c916d Mon Sep 17 00:00:00 2001 +From 292851da7011f84ffa9031cc653997b7a5a9822e 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 @@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.29.2 +2.31.1 diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch index beb723a64366..74a69eb1225f 100644 --- a/0025-Ignore-errors-about-missing-feature-static.patch +++ b/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From d29a2b44643831e439755d11348b69dc9ed6d60b Mon Sep 17 00:00:00 2001 +From 318d7e6283975013fc4eea21c5c2ac861849aafe 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 @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.29.2 +2.31.1 diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch index f0ac00988a8d..b30fc0b05826 100644 --- a/0026-Enable-and-fix-use-of-iconv.patch +++ b/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From becf49560bdf91b82df7bec0bc06c54d7ab8c948 Mon Sep 17 00:00:00 2001 +From 5e272dca9b420ada9e233a8b9134035b3747d8ee 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 @@ -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 c5e0423273..0b12e22351 100644 +index 9b5d19d41b..f649a9f6ef 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -72,7 +72,7 @@ @@ -74,5 +74,5 @@ index c5e0423273..0b12e22351 100644 }, "icu": { -- -2.29.2 +2.31.1 diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch index 0eef10446da6..71f1eff1193c 100644 --- a/0027-Ignore-failing-pkg-config-test.patch +++ b/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 2fd3c54980c0be5efa03f64c8998287d683ff54f Mon Sep 17 00:00:00 2001 +From 407fc2e686c14cf64cc519225440439b783b15f6 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 2fa3c08440..d96d2a6ecb 100644 +index e308b5b7d7..928ee2afa1 100644 --- a/configure.json +++ b/configure.json @@ -772,7 +772,6 @@ @@ -21,5 +21,5 @@ index 2fa3c08440..d96d2a6ecb 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.29.2 +2.31.1 diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 14e719aabb8d..c862bd56ae8e 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 e6e16f20966d91dd3c0020d4784d04e79b95613f Mon Sep 17 00:00:00 2001 +From defdf39ad4a6d4c905e7416da5e4160b093b1fc5 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 @@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.29.2 +2.31.1 diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch index 25482a8a58c2..b46165dc8fab 100644 --- a/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,13 +1,15 @@ -From d7d5e89ed1d5b7ea3962588eb719a85c85356f09 Mon Sep 17 00:00:00 2001 +From 1af55162492b245d789b9d76234eeef3d0fed5f6 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 Otherwise incorrect order of libs leads to errors when building libqminimal.dll, libqoffscreen.dll, -libqwindows.dll and libqdirect2d.dll +libqwindows.dll and libqdirect2d.dll. Unfortunately +this workaround leads to hardcoding include flags +as well. -Change-Id: Ibff901ecce864ae8d5ca2adbe37bcec28e5912f3 +Change-Id: I1863d184cff744d2c02e15875e1d108d32ea7861 --- src/plugins/platforms/direct2d/direct2d.pro | 39 +++++++++++++++--- src/plugins/platforms/minimal/minimal.pro | 17 +++++++- @@ -16,7 +18,7 @@ Change-Id: Ibff901ecce864ae8d5ca2adbe37bcec28e5912f3 4 files changed, 93 insertions(+), 19 deletions(-) diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro -index 6e73bd14f9..0829c75bd2 100644 +index 6e73bd14f9..8046e73d61 100644 --- a/src/plugins/platforms/direct2d/direct2d.pro +++ b/src/plugins/platforms/direct2d/direct2d.pro @@ -1,12 +1,41 @@ @@ -39,35 +41,35 @@ index 6e73bd14f9..0829c75bd2 100644 + -lfreetype -lole32 -lgdi32 -luuid +# However, this workaround leads to the necessity of specifying include dirs manually +INCLUDEPATH += \ -+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \ -+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ -+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \ -+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \ -+ $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION}/QtThemeSupport \ -+ $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION} ++ $$QT_BUILD_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \ ++ $$QT_BUILD_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ ++ $$QT_BUILD_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \ ++ $$QT_BUILD_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \ ++ $$QT_BUILD_TREE/include/QtThemeSupport/$${QT_VERSION}/QtThemeSupport \ ++ $$QT_BUILD_TREE/include/QtThemeSupport/$${QT_VERSION} +# Same for private support libs for accessibility and vulkan, if those are enabled +qtConfig(accessibility) { + LIBS += $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}Qt5AccessibilitySupport.$${QMAKE_EXTENSION_STATICLIB} + INCLUDEPATH += \ -+ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}/Qt5AccessibilitySupport \ -+ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION} ++ $$QT_BUILD_TREE/include/QtAccessibilitySupport/$${QT_VERSION}/Qt5AccessibilitySupport \ ++ $$QT_BUILD_TREE/include/QtAccessibilitySupport/$${QT_VERSION} +} +qtConfig(vulkan) { + LIBS += $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}Qt5VulkanSupport.$${QMAKE_EXTENSION_STATICLIB} + INCLUDEPATH += \ -+ $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}/Qt5VulkanSupport \ -+ $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION} ++ $$QT_BUILD_TREE/include/QtVulkanSupport/$${QT_VERSION}/Qt5VulkanSupport \ ++ $$QT_BUILD_TREE/include/QtVulkanSupport/$${QT_VERSION} +} +# Also add Qt5WindowsUIAutomationSupport - it seems to link against it +LIBS += $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}Qt5WindowsUIAutomationSupport.$${QMAKE_EXTENSION_STATICLIB} +INCLUDEPATH += \ -+ $$QT_SOURCE_TREE/include/Qt5WindowsUIAutomationSupport/$${QT_VERSION}/Qt5WindowsUIAutomationSupport \ -+ $$QT_SOURCE_TREE/include/Qt5WindowsUIAutomationSupport/$${QT_VERSION} ++ $$QT_BUILD_TREE/include/Qt5WindowsUIAutomationSupport/$${QT_VERSION}/Qt5WindowsUIAutomationSupport \ ++ $$QT_BUILD_TREE/include/Qt5WindowsUIAutomationSupport/$${QT_VERSION} LIBS += -ldwmapi -lversion QMAKE_USE_PRIVATE += gdi32 dwrite_1 d2d1_1 d3d11_1 dxgi1_2 diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro -index a1a2da547b..74ced58662 100644 +index a1a2da547b..9fd5c4fca2 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -1,8 +1,21 @@ @@ -86,16 +88,16 @@ index a1a2da547b..74ced58662 100644 + -lfreetype -lole32 -lgdi32 -luuid +# However, this workaround leads to the necessity of specifying include dirs manually +INCLUDEPATH += \ -+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \ -+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ -+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \ -+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} ++ $$QT_BUILD_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \ ++ $$QT_BUILD_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ ++ $$QT_BUILD_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \ ++ $$QT_BUILD_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} + DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro -index f226132592..cac8a007b8 100644 +index f226132592..592fa7406f 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -1,8 +1,20 @@ @@ -114,15 +116,15 @@ index f226132592..cac8a007b8 100644 + -lfreetype -lole32 -lgdi32 -luuid +# However, this workaround leads to the necessity of specifying include dirs manually +INCLUDEPATH += \ -+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \ -+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ -+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \ -+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} ++ $$QT_BUILD_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \ ++ $$QT_BUILD_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ ++ $$QT_BUILD_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \ ++ $$QT_BUILD_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro -index 50a3bb41a9..53c011642f 100644 +index 50a3bb41a9..02f74650a9 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -1,15 +1,35 @@ @@ -149,28 +151,28 @@ index 50a3bb41a9..53c011642f 100644 + -lfreetype -lole32 -lgdi32 -ldwmapi +# However, this workaround leads to the necessity of specifying include dirs manually +INCLUDEPATH += \ -+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \ -+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ -+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \ -+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \ -+ $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION}/QtThemeSupport \ -+ $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION} ++ $$QT_BUILD_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \ ++ $$QT_BUILD_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ ++ $$QT_BUILD_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \ ++ $$QT_BUILD_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \ ++ $$QT_BUILD_TREE/include/QtThemeSupport/$${QT_VERSION}/QtThemeSupport \ ++ $$QT_BUILD_TREE/include/QtThemeSupport/$${QT_VERSION} +# Same for private support libs for accessibility and vulkan, if those are enabled +qtConfig(accessibility) { + LIBS += $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}Qt5AccessibilitySupport.$${QMAKE_EXTENSION_STATICLIB} + INCLUDEPATH += \ -+ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}/Qt5AccessibilitySupport \ -+ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION} ++ $$QT_BUILD_TREE/include/QtAccessibilitySupport/$${QT_VERSION}/Qt5AccessibilitySupport \ ++ $$QT_BUILD_TREE/include/QtAccessibilitySupport/$${QT_VERSION} +} +qtConfig(vulkan) { + LIBS += $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}Qt5VulkanSupport.$${QMAKE_EXTENSION_STATICLIB} + INCLUDEPATH += \ -+ $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}/Qt5VulkanSupport \ -+ $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION} ++ $$QT_BUILD_TREE/include/QtVulkanSupport/$${QT_VERSION}/Qt5VulkanSupport \ ++ $$QT_BUILD_TREE/include/QtVulkanSupport/$${QT_VERSION} +} include(windows.pri) -- -2.29.2 +2.31.1 diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch index a306ece1ac43..d40100ef6674 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 cd3c5ceea13a08c8eea88eea90b24a2cacf816a3 Mon Sep 17 00:00:00 2001 +From ff9e461f1fa6eab244ca2adafa4d5e2ac2d85e5b 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 b79b324b88..6a03b7a74b 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.29.2 +2.31.1 diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 6632e2d10b6a..adfa4bbc1b2e 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 25a9b54ce96ea574fe18bc6df5dc2ee571d22c36 Mon Sep 17 00:00:00 2001 +From f483f2d0cf4db82ba2302874c67923b77ae15cb9 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.29.2 +2.31.1 @@ -17,8 +17,9 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base-static -pkgver=5.15.2 +pkgver=5.15.2+kde+r172 pkgrel=1 +_commit=cfa90a94f95510711e25920e7742b37faa2f4843 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('any') url='https://www.qt.io/' @@ -31,11 +32,11 @@ optdepends=('mingw-w64-mesa: use LLVMpipe software rasterizer for Qt Quick' 'mingw-w64-postgresql: PostgreSQL support' 'mingw-w64-mariadb-connector-c: MySQL support') makedepends=('mingw-w64-gcc' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' - 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'mingw-w64-environment') + 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'mingw-w64-environment' 'git') groups=('mingw-w64-qt5') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch' '0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch' '0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch' @@ -67,53 +68,57 @@ 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=('909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8' - 'b3b49e5580f296f993a0aba0b34bd5ae2399f8d1809456878c1881451b14c27e' - '833b8fc2dd8f0bb4a914fb7f5018b28954752b2d54cec2388332885c929a9266' - 'e49f91d9f8f56afc856a9e143feb4ad9cf54c804f773374e5ccb6d1fc264a7bc' - '944288f57ac8cc9063a75a3a6b421c20a3e8b02a5fd5294f7da7df28c840302b' - 'b421b77303f6f03682c04f1bd1c2c63e07b120dc724de93a9248330d0080ee26' - '595fe18bbefb6f7e271a9daeefbd008d6350ef44b16b4b72c4d3183ba14509ee' - '238900f33394be14378b58445abe28dcd66343ed4f0760c8f944508c02ae831b' - 'bbde0b8ac3a9639a90e2937367deb769ea39ee55b036995a253ec8fdd1d2bd2c' - '859c065f54819266b33bab6b57f76f8c21065a48ff36104b191e218e31f20f9e' - '896c0b0d346f271f90609c6b49490ee86d3076ae620af1127503ee397a7664bb' - '15c69cd06b6e28100ad118ed045abef670acd41609351cd8e2652f1aeec9c8c4' - '499b3a1177e2340b5063553452b0a9a44f232e47839f03087939f52da38d0548' - 'bbe45a397cbc4c0303125937710e305c6dbb0e4a8713b4a520ff820208295ea8' - '3fedd43cccc7000271766f7b4ff85efafc9c65ce3b9f40f4c443a0f352518631' - '2b4854083457f85a82e8f05c23d3983095ff8aa1d1e0ea5cfe1f7e9731b061f8' - '6d4dc98c2b9e0ed743332797e1511262bda3b240e4685c2150a40415650c78f0' - '27b0eb4795713e1c6804dbb446970684c19cc2797f9e371eb2605c852d404b05' - '0fa5c3b49425cfb357e9d04bf993e065174d8b44e450dd134aa24187ed66e0e1' - 'd990f99f04dcf52cae5d7f6dd4394aae778683c2d9ebcb41b485129af8c2cf2f' - '7a395f7e9f26a650e09ad4b35563d5cb46c34dfae1c7de2f4dcf0e86f9dd1927' - 'd38cbc2d4566a3915475fa29ae2982173cd1339abdbff292f5cd520c7c741039' - '2b90d5b001da77692805a8fc9f6ac77ed8d3bfce48f52c89be1b13e915b5ef7c' - '5b973e490c3bbbc3aba7bf2b4fa704c38f92601c7736b483334025e2fc913285' - '73683e5bc8672c09c7c4e86b4787bbb5792570a511768509db6c7a7f45a58109' - 'cc8d458974c5168a7956d4682a63b0c15f9918256820ae908b88e5dd18d95811' - '3cb99ad9d910bad53ad8565d0be2fb6bb4a0d1075dbb73fd85cb2ffbe404d73e' - 'ea31c31ccbd47f6d77a1cf00768a9c247b368d79e3ba19dca4854c29f1a69a69' - 'e6ed01492dacf7367d8f444eb00e2bcdae1fc3b3f1648858e6e379b1565f8943' - 'd4cd03c966a6a1c37ce21f9e6bbd9deaadbb62f31a1a652ac12cd48a651fc47d' - 'd9f55e93cfde4bd6d46744697ae846490912342bdb84ad8c4ba0cf7689b472ab' - 'd5478d6cbcb1067bf1b8e3e52210f1416d734303e387facb165b92f281789436') +sha256sums=('SKIP' + '07ca76c848991c2e34e021626374812aad040e210413c84e1ab372f79bc5733b' + 'f271f7509c97e9f3de2d11c887c03be7e58c39b9eafd83691400a87143a86324' + '3fedd054e1dd439664aec2225de903c2d235c62113be69d361908466838e8c55' + 'a57715bf58b66ffdb2e67d9ba5ae437a6f627a144cd759cfaa9726d2151a6a61' + '934bd614407ff0e6c0366a765d93cd0854e23169cc2c6e69f789ef3d14095fea' + '60def68fdbba857ab22eafc05d0e97b6aa43a0b13903e852902958d2cb847010' + '3f8fcde556f9ed718e1c2fdc466ec787fc639f83afba4b71ba125dfc2b0e74d0' + 'ec12dff066a5af6e034cae56984a275576790a6c52512e78d792b0d14503b319' + '26aaff027ba16ba61b7b4684a97f7595eef811c49e9263e5ba88ba6b51e4fcb9' + 'bde7b7b5e8d32814b26e5a46750c8d5e0e83047d335c94cbbc0b485e9b96a188' + '00b5e1bce87c62bc61cac71654ee5dbe57ea005fc8e7ff7206c936699e199747' + '93b2db5134581d8312996ae1eadc834ddc5fc394aaf88532554eea8f0936506f' + '09bc39fa186fc4bed14cb3f589d8b77e10e3bf7a904dba43758805124e1d3787' + '5e6ddbcd6ab35fcf3e75bb353bc10fe258e8e1753456ba55d65f8ba5667d1c7f' + 'd86b3cf81608819c7d371681f293f3168ce6198368441c916505f1efa1f6ad7d' + '5d7eaaeec84a23b9db12e2998c099ceddd853d2d819018bbad472e77ecd72429' + '8ec002dfe54c83be1fac8bf5a3badb611230fba8ce91eb33bd26cd06b6ecec63' + 'c06f2a6a2bfffffea82fef8023039821fa2869a95af4a31bfd4224ee50cfa78c' + '6d3c73791781ba99f48658bf65f446e4e8b94b1327d901f3fa34e3cf9c07c176' + 'b9ddaa27fa95aeb8dce1fb38950ae095e5c60a5c9bcef4f46138fc1fa1824807' + 'bab619655a585095269a5250170900d0dbce7ac6b20586d3ca468e914c39a8d4' + '3ebe50b4d7e436e0bdf396bba04f6c7dc79ca7e62b392cc2f3cdc8b898218682' + '19e1b928c03fa58dca7b5e27d97b7829ee28af280cf857f520d1e6a04e528ad5' + '77e7cf6a9ab87b76fd0d0f0e1c2948ad49db1fb1972887ad46a8ae179c627354' + '232d3dcb1d13d4961ca6a35ff5897aa633bca12f4425a35eea990759124b238d' + '51fb2c38a41133fc816a16bd74cc2ba93b1b8ca4e456bba42b2ffe3e36aa8e80' + 'f1148c997a0d727b7b640594543196d8226f2f8c7df5c849523c8bbe9c37ad45' + '5a74594feb11c0c078ad4bbcefe662e54fc2a451ae7972a20247597ed392c1de' + '70198d0a35338cb56c4aad5ad1789a915a5b628a3e3b780f2767fbd30ef7e31d' + '7413278602ea7f9fc80d749d5008d029e775b191994c71ff78f5de5f780e2e3b' + '1e2900354c1a6c38e87eff51a96099473827d6c70530dd63b036bdb7ba7ab2fa') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' +pkgver() { + cd $_pkgfqn + echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` +} + prepare() { cd "${srcdir}/${_pkgfqn}" + git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump + # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do msg2 "Applying patch $patch" patch -p1 -i "$patch" done - # make sure the Qt 5 build system uses our external PCRE library and zlib - rm -rf src/3rdparty/{pcre,zlib} - # clear buildflags ('!buildflags' only effects build() but not prepare()) unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS PKG_CONFIG_PATH diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt index f34593c4fdab..cc2ecb636e3a 100644 --- a/qtbase-sha256.txt +++ b/qtbase-sha256.txt @@ -1 +1 @@ -909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 +SKIP |