diff options
author | Martchus | 2021-06-01 20:45:07 +0200 |
---|---|---|
committer | Martchus | 2021-06-01 20:45:07 +0200 |
commit | 88efe59d5344bba3812ef589d7d946c45fa21f2e (patch) | |
tree | 952df08eecac7cf1ed346a14b166902f19f39944 | |
parent | 8a38a57bc9454101f416448c75add6e354329939 (diff) | |
download | aur-88efe59d5344bba3812ef589d7d946c45fa21f2e.tar.gz |
Update patch version
34 files changed, 162 insertions, 130 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+kde+r172 + pkgver = 5.15.2+kde+r196 pkgrel = 1 url = https://www.qt.io/ arch = any @@ -33,7 +33,7 @@ pkgbase = mingw-w64-qt5-base-static options = !buildflags options = staticlibs options = !emptydirs - source = git+https://invent.kde.org/qt/qt/qtbase#commit=cfa90a94f95510711e25920e7742b37faa2f4843 + source = git+https://invent.kde.org/qt/qt/qtbase#commit=2a2f3cd61f59ccec0eecb09e4a8795d7322edfcb 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 @@ -65,38 +65,39 @@ 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 + source = 0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch 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 + sha256sums = 065c8fdb0b2f70264085b2059713ec2045ac45aac680b8f073d88c39edeb4e69 + sha256sums = 63183545568e036190c1e18b3197f64e4d407eb3244ed6c1778e845ab1c74c0a + sha256sums = 6f0f8605b251df99adc45668a825bd463c8459b29fb279cc9ebd36e2af256e6c + sha256sums = 1ed4ba57d4e1393cdb3e7e38cee9c3fafe5f8e67070c5bc057c949491797c62b + sha256sums = bc941a7891bc4396179f7b5c0a9806610b0e20ae9e01f79561ddd4b313a9a90d + sha256sums = 15492f5f479ae53cd819805c18e20c11d4f0231c16c3db44ecd751129d987e81 + sha256sums = b3a9d29d4068b83e5b47d56d02179784ea752edbfa60cebd4da0879a0a375530 + sha256sums = ede3f1822f552353208d928ab4616bf00adc398e13a6c893e58062b1aeb313ed + sha256sums = 9105bdcf2802c524d766b2c0f54c76c766ccc3f87c2b1293a592bc70177a5439 + sha256sums = 203499a407f81c08fb38f6bd7d6bfba2f413e27c43808376a718049ab25e13d8 + sha256sums = 484c90579c250cae826ad9dbc71862f4f774634a07465cc41e05bd28138382c1 + sha256sums = 08bfefd5116c0fc87b46fe3d4b11fb3f1c3263dcbca565b0f7c29e57c974b3d5 + sha256sums = a13c6c01caf2f3135495023590a2ed8505ca5c616e588b15c7a9a82d7b8678af + sha256sums = 66e58b40d7c4dfdf0ea897cd63c72a9a6bac12af93c33268477500fafacd5f07 + sha256sums = 8b44e4f820c0a0728cc7c4f1167224f3d95b02a49f968c2947f9942c8b84c873 + sha256sums = 7623991f9cb71c1c1b9c08bb7e2734826cb133c72ba2d07a4ca718b7b0d7bb03 + sha256sums = fe07fea05d61b6c9263370874ba7fb46153982c74aafa89288098ce07b6e0a36 + sha256sums = a29334543322bef8fc755ae1462f3a1c792bbf9a693b45acaa1254d0942c3336 + sha256sums = ed24d868094e854529e5237c66d339550ce584ad21031c671c57cd831f5a6e5b + sha256sums = 7dff27c29399e2e708c6bcd539442cba87eb212017efe4f48287d65d0ff1e9fe + sha256sums = 9c186a1ecc5e16af01549a5cf9228e6ec135ae28c76772a9730ea8b3caf27409 + sha256sums = 3412b4cd71a645778ca9e7c106682281f291f2ece2c5f106ee9f6e427d4e140f + sha256sums = a8589883158e2060fae6a0f0cb352ba1f3c7d739b1ed21c022c3fcc5792ce871 + sha256sums = 17fdc20875941a3d7ee0e99c3cfeddf79ed8939e4049614809b444734053b96b + sha256sums = df8d6552ecb8a0617d919b9483f44543b27fbcf53468c8cfb8f4bbb400f689cb + sha256sums = 7174b00cfb20401e35133a4736ec081e1ea526b4658f2fb67d05064858cafb93 + sha256sums = 0203c09fd27a3e181e418e83f296ca7e6036d2e2f645ae3801be08f5c12006bc + sha256sums = 399a832701ceeb4529a58533fe6152112ba97ec942afff0a0671efdd8f2438c1 + sha256sums = de4fa5b45d6cc3366014a82b167eacb867b5441478ce2f484f4d77132f3e3b80 + sha256sums = d1842d8096aaf4baf6cb9c160eb5a0d3c2ed17ce2ca91239416ab0c8f4f76ca5 + sha256sums = e884e79264f8b98c5021bdd5dbb03044f4c178e68f60449d3a37918f94d39a54 + sha256sums = bf55e0b7198807301edb1468af14e86ab9821d7209136f05e28df483e676bcf9 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 93621b5d0f03..970775b612d6 100644 --- a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,7 +1,7 @@ -From e598463de84a2fa54739b386acf64bef368e8089 Mon Sep 17 00:00:00 2001 +From ec51b8d37aefbe2d8804c537eb68b9761eabb140 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 +Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with mingw-w64 Adding a new, separate mkspec instead of patching the existing one 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 ccbdf7c9d49f..90fbc59c197c 100644 --- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,7 +1,7 @@ -From e6fef0839710cdc28d5e5df0ae3189d16d629172 Mon Sep 17 00:00:00 2001 +From 91484bad9459091e491da9dd57b32582e5f57c13 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 +Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL FIXME: Not sure whether this is still required --- 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 64a68df5cec5..43c0ce811bdf 100644 --- a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,7 +1,7 @@ -From 434420a1da0cc19096d1877b662eb6844ceb97dd Mon Sep 17 00:00:00 2001 +From 691d96585274ba8f2787d11977d76bde6c589152 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 +Subject: [PATCH 03/32] Fix too many sections assemler error in OpenGL factory On x86_64 qopenglversionfunctionsfactory.o exceeds the limit of 32768 sections. diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch index a9c2066ff07c..896813996dea 100644 --- a/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,7 +1,7 @@ -From f041def0ede2e36edd35ddae430fb7c06186756e Mon Sep 17 00:00:00 2001 +From 59628a6023505f0efb5c885b5bb60c888c90a2e1 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 +Subject: [PATCH 04/32] Make sure *.pc files are installed correctly --- qmake/generators/makefile.cpp | 8 ++++++-- 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 062e54e19528..3098dcfd39d1 100644 --- a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,7 +1,7 @@ -From ed8bf76c5e770f8097a375b49f58bedd738f84f7 Mon Sep 17 00:00:00 2001 +From 9db275e349267c021ee2ba8befcd055e4aaec578 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 +Subject: [PATCH 05/32] Don't add resource files to LIBS parameter Solves an issue where the generated pkg-config files contained invalid Libs.private references 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 3a1ca90960d8..5ae14fd9e7d8 100644 --- a/0006-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/0006-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,7 +1,7 @@ -From d77ce81ca24a85f10a0fb20a902f051c10662ea2 Mon Sep 17 00:00:00 2001 +From 44b203dc0d97d95dec2f9c30878308760aa8e331 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 +Subject: [PATCH 06/32] Prevent debug library names in pkg-config files qmake generates the pkgconfig .pc files two times, once for the release build and once for the debug build (which we're not actually diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch index 1d7ff60c7e73..0d951a85625f 100644 --- a/0007-Fix-linking-against-shared-static-libpng.patch +++ b/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,7 +1,7 @@ -From 6838542142005d64b1447a1720109c82b2eb0434 Mon Sep 17 00:00:00 2001 +From 48e1f2d109147ee04d6675125900dc124f23038c 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 +Subject: [PATCH 07/32] Fix linking against shared/static libpng Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf --- diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch index be6d0a5bbe0f..db61624eef95 100644 --- a/0008-Fix-linking-against-static-D-Bus.patch +++ b/0008-Fix-linking-against-static-D-Bus.patch @@ -1,7 +1,7 @@ -From 81a8053aafc7f2111ecdc0a07d4f5e062fd19f70 Mon Sep 17 00:00:00 2001 +From 1ad5eef21682c8f9794266aec91a57191caa2c29 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 +Subject: [PATCH 08/32] Fix linking against static D-Bus --- configure.json | 9 +++++++-- 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 0b35e1c70642..2ee623bd0ff4 100644 --- a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,7 +1,7 @@ -From 83ce093ca3e4ba1414395840e550bd1cb4dcce41 Mon Sep 17 00:00:00 2001 +From fa07ecc0dd45f2abe9e0bb362a05e6255c725f26 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 +Subject: [PATCH 09/32] Don't try to use debug version of D-Bus library Required for a debug build of Qt because mingw-w64-dbus does not contain debug version diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch index 201be0f8b497..1e076a4acc3c 100644 --- a/0010-Fix-linking-against-static-freetype2.patch +++ b/0010-Fix-linking-against-static-freetype2.patch @@ -1,7 +1,7 @@ -From 82af201a622c806d9a26e5f2710ad1391034a957 Mon Sep 17 00:00:00 2001 +From ad9fe794523b16d1d5f46b7d06b39205f90f45f1 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 +Subject: [PATCH 10/32] Fix linking against static freetype2 --- src/gui/configure.json | 7 +++++-- diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch index 8dafb916324c..a895e06aa820 100644 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,7 +1,7 @@ -From 781ee4c305c86f72fb851324e10b85ad113ca8d3 Mon Sep 17 00:00:00 2001 +From 690707a2fe2995667dcbaf7908cc988657b09001 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 +Subject: [PATCH 11/32] Fix linking against static harfbuzz --- src/gui/configure.json | 6 +++++- diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch index f46384745e34..527777b6ad03 100644 --- a/0012-Fix-linking-against-static-pcre.patch +++ b/0012-Fix-linking-against-static-pcre.patch @@ -1,7 +1,7 @@ -From 0bac31a16786b2ffac3b8623d6a9f28b5924fee9 Mon Sep 17 00:00:00 2001 +From 70dc4ada12bdd127abb05d9b9dd8557a56aa0a3f 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 +Subject: [PATCH 12/32] Fix linking against static pcre Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1 --- diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch index a176171165cc..e2328913e11d 100644 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,7 +1,7 @@ -From 370cd6e5833f50acbd4fdfdef5d1b8465f369696 Mon Sep 17 00:00:00 2001 +From 7e019da335d13ec35337f18f5cc6826ded915e8f 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 +Subject: [PATCH 13/32] Fix linking against shared/static MariaDB Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b --- diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch index bfb067804f7a..bc3d21d8c960 100644 --- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,7 +1,7 @@ -From f1cce674c4e438e623387d8091bb9b3528c1210d Mon Sep 17 00:00:00 2001 +From 5f1a0186d809ce7628600d5a02ab130ebec95e91 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 +Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL --- src/plugins/sqldrivers/configure.json | 4 ++-- diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch index 44cf536e18ec..c54e509d4ea7 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0015-Rename-qtmain-to-qt5main.patch @@ -1,7 +1,7 @@ -From 9aa2c124207494aaedfeead42851cc0cbf488237 Mon Sep 17 00:00:00 2001 +From 6fce8ae5b212867100ccebe32385100abce625f6 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 +Subject: [PATCH 15/32] Rename qtmain to qt5main Prevents conflict with mingw-w64-qt4 package --- diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch index 540fd0109e5c..a10056481f78 100644 --- a/0016-Enable-rpath-for-build-tools.patch +++ b/0016-Enable-rpath-for-build-tools.patch @@ -1,7 +1,7 @@ -From 8d40dc38a6d42e0aa72d94dead17af04319345a6 Mon Sep 17 00:00:00 2001 +From a3215867ab7d89c3044748924d9b8cc1a6844c7e 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 +Subject: [PATCH 16/32] Enable rpath for build tools - Required because various tools depend on libQt5Bootstrap.so which resides in folder /usr/${_arch}/lib diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch index 3aabdee00b00..8d625e0a93db 100644 --- a/0017-Use-system-zlib-for-build-tools.patch +++ b/0017-Use-system-zlib-for-build-tools.patch @@ -1,7 +1,7 @@ -From ec4a953eddc6fe6f19a8f932ef4bcbcb15868e63 Mon Sep 17 00:00:00 2001 +From cc57486884fe4e07c1f57bfdf3b2bd8105eaa55d 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 +Subject: [PATCH 17/32] Use system zlib for build tools --- src/tools/bootstrap/bootstrap.pro | 4 +++- diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index 8a70156a3373..352718143b2a 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,7 +1,7 @@ -From f0d6651cfac8231a7f57a0f70300d439f56ed5fc Mon Sep 17 00:00:00 2001 +From 479df475c9d5c46756f40acf5d50691c2bf4d39e 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 +Subject: [PATCH 18/32] Merge shared and static library trees Allow installation of shared and static build in the same prefix diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch index ba915dcda5d8..e762566965b8 100644 --- a/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,7 +1,7 @@ -From de05a40cbb5e86f0a0217624f80cb1a1ad31351f Mon Sep 17 00:00:00 2001 +From 6b05a19f07c9e00e56d475a13b53b7b548ebf111 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 +Subject: [PATCH 19/32] Use *.dll.a as import lib extension The variables used here are provided by g++-win32.conf 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 d1ebf92e3533..b07a8e2ded1d 100644 --- a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,7 +1,7 @@ -From 625df2d13ff194603a339e770c645489e2a52f9a Mon Sep 17 00:00:00 2001 +From 2a23c3d45db1a49409b396cd4f3bdd3ad9588865 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 +Subject: [PATCH 20/32] Pull dependencies of static libraries in CMake modules When doing a static build of Qt, the dependencies of the Qt libraries and plugins itself must be specified when linking diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch index 847f92f2b5c1..b06677618d1d 100644 --- a/0021-Allow-usage-of-static-version-with-CMake.patch +++ b/0021-Allow-usage-of-static-version-with-CMake.patch @@ -1,7 +1,7 @@ -From 195f06dc9b77f9c5db4cbab8af0b8dc2fac34427 Mon Sep 17 00:00:00 2001 +From fa8dd568cd9ad7dcfaef05dddcc157bd7ee851f8 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 +Subject: [PATCH 21/32] Allow usage of static version with CMake Allow selecting between dynamic and static Qt versions installed in the same prefix 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 3b9ad058fdc4..dcb79a28f5d4 100644 --- a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,7 +1,7 @@ -From 70e76369ababd9f7c22cef148eaa2755e31c2b2b Mon Sep 17 00:00:00 2001 +From 3e2ef8be011b02cbb900717ced96bcd7b0e55a93 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 +Subject: [PATCH 22/32] Adjust linker flags for static build with cmake/mingw-w64 It is not clear anymore where I picked that change up and for diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch index 7992084d2ac7..30e306e3b06c 100644 --- a/0023-Use-correct-pkg-config-static-flag.patch +++ b/0023-Use-correct-pkg-config-static-flag.patch @@ -1,7 +1,7 @@ -From ee3bd9b4ff71e2f8f923245f61294284c7085d8a Mon Sep 17 00:00:00 2001 +From dc17b6970cd7ac7a2aa3bcf24dc175a00e0e6175 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 +Subject: [PATCH 23/32] Use correct pkg-config --static flag --- configure.pri | 3 +++ diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index ef90616018b6..864733eb51e9 100644 --- a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,7 +1,7 @@ -From 292851da7011f84ffa9031cc653997b7a5a9822e Mon Sep 17 00:00:00 2001 +From 573c8958419f112afe5600bddda1d0bd4ca132d0 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 +Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic * Otherwise the arguments aren't passed correctly leading to errors like ``` diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch index 74a69eb1225f..4d9c1b1c2c57 100644 --- a/0025-Ignore-errors-about-missing-feature-static.patch +++ b/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,7 +1,7 @@ -From 318d7e6283975013fc4eea21c5c2ac861849aafe Mon Sep 17 00:00:00 2001 +From 54f4a5bd8e239a94f4e48d2f275cadb4dc67bf6e 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 +Subject: [PATCH 25/32] Ignore errors about missing feature static Not sure why this error occurs, let's hope for the best --- diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch index b30fc0b05826..aa97736390da 100644 --- a/0026-Enable-and-fix-use-of-iconv.patch +++ b/0026-Enable-and-fix-use-of-iconv.patch @@ -1,7 +1,7 @@ -From 5e272dca9b420ada9e233a8b9134035b3747d8ee Mon Sep 17 00:00:00 2001 +From 9d95a07aedfba071de7a556af609de1fea435100 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 +Subject: [PATCH 26/32] Enable and fix use of iconv Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c --- diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch index 71f1eff1193c..0da64d1bddca 100644 --- a/0027-Ignore-failing-pkg-config-test.patch +++ b/0027-Ignore-failing-pkg-config-test.patch @@ -1,7 +1,7 @@ -From 407fc2e686c14cf64cc519225440439b783b15f6 Mon Sep 17 00:00:00 2001 +From 1d9baf03ac68d2be47d6d6b94ab78a9145dd799d 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 +Subject: [PATCH 27/32] Ignore failing pkg-config test Didn't investigate why it fails, let's hope for the best --- diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index c862bd56ae8e..097be77619b2 100644 --- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,7 +1,7 @@ -From defdf39ad4a6d4c905e7416da5e4160b093b1fc5 Mon Sep 17 00:00:00 2001 +From 42c17e98cd3c256df07996e240fd465d53c8dbbe 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 +Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies In particular, it messes resolving cyclic dependency between static freetype2 and harfbuzz diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch index b46165dc8fab..b346aff58aa0 100644 --- a/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,7 +1,7 @@ -From 1af55162492b245d789b9d76234eeef3d0fed5f6 Mon Sep 17 00:00:00 2001 +From f3f11cb89cd14f7479d457d3a8e5df069cecade1 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 +Subject: [PATCH 29/32] Hardcode linker flags for platform plugins Otherwise incorrect order of libs leads to errors when building libqminimal.dll, libqoffscreen.dll, diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch index d40100ef6674..c72418c99eed 100644 --- a/0030-Fix-linking-against-static-plugins-with-qmake.patch +++ b/0030-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,7 +1,7 @@ -From ff9e461f1fa6eab244ca2adafa4d5e2ac2d85e5b Mon Sep 17 00:00:00 2001 +From a12f242f872e2c3578bb97149949541c1bed20e4 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 +Subject: [PATCH 30/32] Fix linking against static plugins with qmake Required because qtConfig(static) does not work with 'Merge shared and static library trees' diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index adfa4bbc1b2e..6651dcfea7d4 100644 --- a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,7 +1,7 @@ -From f483f2d0cf4db82ba2302874c67923b77ae15cb9 Mon Sep 17 00:00:00 2001 +From 8dd259dde3e0f8cd26ea9f9ddb64c79c541200a8 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' +Subject: [PATCH 31/32] Prevent 'Cannot find feature windows_vulkan_sdk' See https://bugreports.qt.io/browse/QTBUG-76660 --- diff --git a/0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch b/0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch new file mode 100644 index 000000000000..51852037726d --- /dev/null +++ b/0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch @@ -0,0 +1,29 @@ +From 7eb97b37768e404b3a919b2d85162943c4ed9ca3 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Tue, 1 Jun 2021 13:00:33 +0200 +Subject: [PATCH 32/32] Add missing `#include <limits>` in QOffsetStringArray + header + +At least with GCC 10/11 targeting mingw-w64 the compilation +fails otherwise. + +Change-Id: Icad20343a58f9aa1293ba443bebf70373e7dc762 +--- + src/corelib/tools/qoffsetstringarray_p.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h +index 4dd9e9603b..e26a57ff43 100644 +--- a/src/corelib/tools/qoffsetstringarray_p.h ++++ b/src/corelib/tools/qoffsetstringarray_p.h +@@ -55,6 +55,7 @@ + + #include <tuple> + #include <array> ++#include <limits> + + QT_BEGIN_NAMESPACE + +-- +2.31.1 + @@ -17,9 +17,9 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base-static -pkgver=5.15.2+kde+r172 +pkgver=5.15.2+kde+r196 pkgrel=1 -_commit=cfa90a94f95510711e25920e7742b37faa2f4843 +_commit=2a2f3cd61f59ccec0eecb09e4a8795d7322edfcb pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('any') url='https://www.qt.io/' @@ -67,39 +67,41 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0028-Prevent-qmake-from-messing-static-lib-dependencies.patch' '0029-Hardcode-linker-flags-for-platform-plugins.patch' '0030-Fix-linking-against-static-plugins-with-qmake.patch' - '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') + '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch' + '0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch') 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') + '065c8fdb0b2f70264085b2059713ec2045ac45aac680b8f073d88c39edeb4e69' + '63183545568e036190c1e18b3197f64e4d407eb3244ed6c1778e845ab1c74c0a' + '6f0f8605b251df99adc45668a825bd463c8459b29fb279cc9ebd36e2af256e6c' + '1ed4ba57d4e1393cdb3e7e38cee9c3fafe5f8e67070c5bc057c949491797c62b' + 'bc941a7891bc4396179f7b5c0a9806610b0e20ae9e01f79561ddd4b313a9a90d' + '15492f5f479ae53cd819805c18e20c11d4f0231c16c3db44ecd751129d987e81' + 'b3a9d29d4068b83e5b47d56d02179784ea752edbfa60cebd4da0879a0a375530' + 'ede3f1822f552353208d928ab4616bf00adc398e13a6c893e58062b1aeb313ed' + '9105bdcf2802c524d766b2c0f54c76c766ccc3f87c2b1293a592bc70177a5439' + '203499a407f81c08fb38f6bd7d6bfba2f413e27c43808376a718049ab25e13d8' + '484c90579c250cae826ad9dbc71862f4f774634a07465cc41e05bd28138382c1' + '08bfefd5116c0fc87b46fe3d4b11fb3f1c3263dcbca565b0f7c29e57c974b3d5' + 'a13c6c01caf2f3135495023590a2ed8505ca5c616e588b15c7a9a82d7b8678af' + '66e58b40d7c4dfdf0ea897cd63c72a9a6bac12af93c33268477500fafacd5f07' + '8b44e4f820c0a0728cc7c4f1167224f3d95b02a49f968c2947f9942c8b84c873' + '7623991f9cb71c1c1b9c08bb7e2734826cb133c72ba2d07a4ca718b7b0d7bb03' + 'fe07fea05d61b6c9263370874ba7fb46153982c74aafa89288098ce07b6e0a36' + 'a29334543322bef8fc755ae1462f3a1c792bbf9a693b45acaa1254d0942c3336' + 'ed24d868094e854529e5237c66d339550ce584ad21031c671c57cd831f5a6e5b' + '7dff27c29399e2e708c6bcd539442cba87eb212017efe4f48287d65d0ff1e9fe' + '9c186a1ecc5e16af01549a5cf9228e6ec135ae28c76772a9730ea8b3caf27409' + '3412b4cd71a645778ca9e7c106682281f291f2ece2c5f106ee9f6e427d4e140f' + 'a8589883158e2060fae6a0f0cb352ba1f3c7d739b1ed21c022c3fcc5792ce871' + '17fdc20875941a3d7ee0e99c3cfeddf79ed8939e4049614809b444734053b96b' + 'df8d6552ecb8a0617d919b9483f44543b27fbcf53468c8cfb8f4bbb400f689cb' + '7174b00cfb20401e35133a4736ec081e1ea526b4658f2fb67d05064858cafb93' + '0203c09fd27a3e181e418e83f296ca7e6036d2e2f645ae3801be08f5c12006bc' + '399a832701ceeb4529a58533fe6152112ba97ec942afff0a0671efdd8f2438c1' + 'de4fa5b45d6cc3366014a82b167eacb867b5441478ce2f484f4d77132f3e3b80' + 'd1842d8096aaf4baf6cb9c160eb5a0d3c2ed17ce2ca91239416ab0c8f4f76ca5' + 'e884e79264f8b98c5021bdd5dbb03044f4c178e68f60449d3a37918f94d39a54' + 'bf55e0b7198807301edb1468af14e86ab9821d7209136f05e28df483e676bcf9') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' |