diff options
| author | Martchus | 2024-09-10 23:18:24 +0200 |
|---|---|---|
| committer | Martchus | 2024-09-10 23:18:24 +0200 |
| commit | 4b0084555027eac4bba9eeb3e08e5ae089d44f1c (patch) | |
| tree | 69ebfe78e8bb0e06f1d0d4e84666a90a64f7d365 | |
| parent | c78c41b113bb2b93e5eca7f2600a35ae8736e7a7 (diff) | |
| download | aur-4b0084555027eac4bba9eeb3e08e5ae089d44f1c.tar.gz | |
Update to 5.15.15
35 files changed, 168 insertions, 169 deletions
@@ -1,7 +1,7 @@ pkgbase = mingw-w64-qt5-base-static pkgdesc = A cross-platform application and UI framework, native OpenGL backend (mingw-w64) - pkgver = 5.15.14+kde+r143 - pkgrel = 2 + pkgver = 5.15.15+kde+r127 + pkgrel = 1 url = https://www.qt.io/ arch = any groups = mingw-w64-qt5 @@ -34,7 +34,7 @@ pkgbase = mingw-w64-qt5-base-static options = !buildflags options = staticlibs options = !emptydirs - source = git+https://invent.kde.org/qt/qt/qtbase#commit=9f9a56d750caff8b4459e7e9bf82f1f4d725f72f + source = git+https://invent.kde.org/qt/qt/qtbase#commit=ab13e81917207959785ad0185a3a9974e552a7f5 source = 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch source = 0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -68,37 +68,37 @@ pkgbase = mingw-w64-qt5-base-static source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch source = 0032-Fix-crashes-in-rasterization-code-using-setjmp.patch sha256sums = SKIP - sha256sums = 2314abe6c4dc0aea926e8b267db314f7da876993134ea0fba0a69e871703575b - sha256sums = c684a2119cf0cb83d141a7cabdb1a9c428ac7c4a9de6745553b0f91d2d58745a - sha256sums = 754fe1004d763040e9b593e53f4ced267304c58484c33719551e9b5711082b0b - sha256sums = e74fc5bb401386f9cda4013d4c6f7a034871820a6710f16c17d487b9e4024c8f - sha256sums = 71e0ecf48f3929cd2bc76066cc376d413248c1c83b482079952b296bd976d15f - sha256sums = fce118e0b787b4256c8a2f1e5c7ed90c63b93dedbf17f6b5399d8aa4962411d1 - sha256sums = 305e83101c271ea81f80bae0b46ea764fe9ab811853928d140170b86c6c4f913 - sha256sums = 974eaf232941f7d961b6eeff8a260d59316a472b980d7a4f3f7b3773e2565265 - sha256sums = c6876efcafa67dde7bd98cf75462215e37c72f3578df83288db44e1e4a2fa833 - sha256sums = 8bbaf07577fe84d79c02c35728756f874445725669a38fa65dcb75afc13a48c1 - sha256sums = d9032919a4ba3b0d83821d2942e53ddf62202468f956e0530fcde1afd0f9caeb - sha256sums = d1dcba199d513b7235d098fb336d43d995fc435e9e6da5eda1a0c5d6fe5bca2a - sha256sums = a048a94df7602ca4c9549b4b07e44bf38f0923324946858e33f6d390b1679502 - sha256sums = 00cb6efeb504a54c4d76770737ada66f8030d6c87edbebaed3e137d822fceb83 - sha256sums = 0a7320a98d54ea61d0dc255996ac632c7bcf447ccfafe34d9ee8e4c27e4e125c - sha256sums = 34a8273fae8625d08169204da26d2e5f799b04164f240df33d8f38d60fa8f730 - sha256sums = 80af54bf9552e58439f33e253768d31480edde2258aecbe6c6e71c649dd7611c - sha256sums = 14e741c2a6fb419dc259153f2da4ccf329b65939904221f1476579dedb8244b8 - sha256sums = 90bfb001d4946edf1c1b58bec4910e7530d276763baf9ae96a0356668d81bb22 - sha256sums = 065bca8364f80c3f4a6a984176fa304c1e596975a11ea43758297b7e164c4670 - sha256sums = de8ca51ec473afb282f4f171a37f9d0297b95111bf2d11b786c16af42ef70e8f - sha256sums = 92c32de2b3ee035fab694dce3b9f2cc73e0dba739aadbecd763cf2905a1c86f1 - sha256sums = 15e244b5a4b1bb87cddff12a6f6ccd908d03470941bfbda18931f1598166b7c3 - sha256sums = 9f6919e53627cee62dbcef2ae8ddd4d52eed3be5f7225dd1db16ef2c8efe641e - sha256sums = e40f80e3451ac44bc2a7d7859616b3adfb809cff04ef14c6adb561ec9982cc28 - sha256sums = e6ace3bfd69e21ee5030b7f4fd057746cc7c84b05bd25cdd5296d7e8b3992d59 - sha256sums = b3c01bdfa84cc25594ca789537fc6241810f94b985f00332fb0e205ba843cdee - sha256sums = 1b47229b7ec8e965006be9a6067d6440ddbce1e597f4237c730b1c1aaeb6e378 - sha256sums = 78904569fe4630680b465077fb8d14c07d0a9b1af1ff7d4316fd8d142ba6c537 - sha256sums = 1e58ea46aa901ffb3d3bb5b051dcd53ab8e0a94daa45e434e4730324f2236bcb - sha256sums = aedeaeac021fd56f7791ae8612c00e9cd0e3ce35d772ee7633e1978df498aed0 - sha256sums = 56a3a09825d8bb980c02be275ca2cf7d86c58b18dc585334845edf53146366f3 + sha256sums = 22d381ba13ab64988e3e83e1d796319cfa63e62521ac380bc98a44cb4efd474b + sha256sums = d2a78a1cee38821bba407c52cad12f715e5b3a6ea92c3420a47c70a6e5e68e5d + sha256sums = cfc19a2cbf5a149fa1f8b71fecd464811dd908e9d42df41b1c8865109ee1e97a + sha256sums = 6aaba5c09a128923512d67115e438bcbd79990b1d70e9a3f02548eaa9990c497 + sha256sums = 15da5fb4011f149a111df59518184fb6ea3c6c108580261d2698742b8cffc844 + sha256sums = 0eafd7f37d748b42fc4cd6108b1a2960e4a052b8193b91138a20069714789cc9 + sha256sums = 51b40da3b4135168ca796782bed17900e5e38820af50a13199f209bc0d274d7a + sha256sums = 4ffb27303ee723e56b7dd0b9f832ca5594c4bdfc2289647061ab7fef6f89798b + sha256sums = c6b3fefccc4a4d22bad20ccdfb644ce8ee9a5c015b16c64e77a46c12178d4951 + sha256sums = 955ba9e2f1f51eebd2c5245d8427b7240a4ac7694ad3f3f7a9167b5985263d7e + sha256sums = 9f1abc78715c37fe637a2a79a47b41bc110ad1d08cab5b3f00341d427eb70b65 + sha256sums = 11a208d19c567f87ec8318c7db69b6d7fd516dbc9ee2d3209a8b0a0fc16b41c5 + sha256sums = f91a26760166f7bcfc8d7deac5f8c9f2a8102d05568ec208fa18056b2f4ef6f5 + sha256sums = b025867eef51acdb3f65005463bdf9818c1bdc096b029425f16665c011cfed7d + sha256sums = 5b03f4307bb076727dde14d7efbf8290ab183fa45a544fa92858b315e60f1ebd + sha256sums = a79ae6f052f2b6ad7255a4cd875ba7ec81b142bddd270c78f786ec65d0646799 + sha256sums = fe5dbb469beaa8c1ef61bb408ab2fcc9e2df1e81225333fdebb908ead38bc308 + sha256sums = 28f7cbef809822a6c6c698468b2308888e8ffb7b649cea8a75240bb445c4f24d + sha256sums = bf46e868c2c8e6072367ea851d7a8a6d31969f372b337436f16f3141fc850873 + sha256sums = 9b0f0b4649f1e0d7c544e502f640c72a68dae9a667961f9ac1e792ffbfd2eaaa + sha256sums = cc0aba877cbc4da6d7840fb007128b94bb2c9fb396ab2316dd9b931cbe5a0ef9 + sha256sums = 687a68dd1de6fdcf0aa55da727cce269782661cc78cdf2f36597986f60c9b4a9 + sha256sums = 1d829b537884086d8b6552742717b79f59da3321a4d273ee71b2303e6a4c7823 + sha256sums = 321c128b4cd5f45e61d8225832a6cc9e68969aaa2e2eb567c511d2947b29f003 + sha256sums = 71d2e6dfb765dd69b98b3b851e4683acc51fc7069fe8d158d30f8beb12a467a2 + sha256sums = 5cbd3c1e92a7c2f50516855ee59a3f63e447079e099c0d655e721a2f69423242 + sha256sums = 6f66dffca0f80a97428584a55dcf405f6172a088058c1b011b092d8f68e0f34a + sha256sums = 1d8c8f49b61dedb0dc48291748ca6d055e0fcfbfe02483e9279a3661231686d1 + sha256sums = 017eb5246c624093c8e5396495427a91cf2f18228d3dd073dd9c033794f64d27 + sha256sums = 2334a67614e7e3c670225056f9b197ef0a3c4c7e97ea07f278371c82e8acae29 + sha256sums = 9eedc6b76a7f3111f905a6406d407fb7c33629b7f45361388274bba596ca90f5 + sha256sums = 773739cb8fadcfd70381103a4ee591d970a22c2cb27aae8fcb034e154b5e4af2 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 ecd6ecc4324a..5408f07e6170 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 d8a27c8e1b39c54ef4155a7c086b35f1bc114c7f Mon Sep 17 00:00:00 2001 +From 152b27bc79f148eeb1e151ef270d232d909ac4c2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with @@ -21,7 +21,7 @@ Change-Id: I94f5a6c44c112bd44a84f802712077bc14782b4c 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index c3a1f3a373..0cc6e93c93 100644 +index c3a1f3a3732..0cc6e93c93e 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -8,18 +8,24 @@ @@ -126,7 +126,7 @@ index c3a1f3a373..0cc6e93c93 100644 -include(angle.conf) -include(windows-vulkan.conf) diff --git a/mkspecs/win32-clang-g++/qmake.conf b/mkspecs/win32-clang-g++/qmake.conf -index 59d42176f0..f8cb9859f2 100644 +index 59d42176f03..f8cb9859f28 100644 --- a/mkspecs/win32-clang-g++/qmake.conf +++ b/mkspecs/win32-clang-g++/qmake.conf @@ -14,11 +14,11 @@ include(../common/g++-win32.conf) @@ -144,7 +144,7 @@ index 59d42176f0..f8cb9859f2 100644 QMAKE_LINK = $${CROSS_COMPILE}clang++ diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index 5de482f23b..3c3d22c699 100644 +index 5de482f23b5..3c3d22c6993 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -13,11 +13,11 @@ include(../common/windows-desktop.conf) 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 3c27a100a3af..248b6368d68a 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 eaaee22b5dfcbd0b27702b032ea75d3b27a81e47 Mon Sep 17 00:00:00 2001 +From 05dad258acfe736c5a156491488477893959e3c5 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL @@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required 1 file changed, 2 deletions(-) diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h -index 4554291bbd..23d55bddeb 100644 +index 4554291bbd9..23d55bddebd 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -56,9 +56,7 @@ 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 0c006626f5b9..17ad63ec21bc 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 d29523ad850dc556ff76b3bbe9e7418f97d637df Mon Sep 17 00:00:00 2001 +From 75a399e0f8c797d5769cd06348ec0c5ffc5d4578 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/32] Fix too many sections assemler error in OpenGL factory @@ -11,7 +11,7 @@ Hence the assembler option -mbig-obj is required. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri -index 24758afdeb..aa04b4a672 100644 +index 24758afdeb3..aa04b4a672e 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -3,7 +3,8 @@ diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch index 2a4c8dad8352..0aa8c5f53adb 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 8b3bec6ec1d4986dcbd55c214e3eb00b8b3c23eb Mon Sep 17 00:00:00 2001 +From 3d3a53de05966c9c1cfd109ebf097adf73ba2855 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/32] Make sure *.pc files are installed correctly @@ -10,7 +10,7 @@ Subject: [PATCH 04/32] 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 7ff921549d..fc996663d8 100644 +index 7ff921549da..fc996663d8d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3242,7 +3242,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const @@ -36,7 +36,7 @@ index 7ff921549d..fc996663d8 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index 106069c454..5252a7eaa1 100644 +index 106069c454b..5252a7eaa12 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -96,7 +96,7 @@ protected: @@ -49,7 +49,7 @@ index 106069c454..5252a7eaa1 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 5e446bd7e2..183cef2908 100644 +index 5e446bd7e2b..183cef29089 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -775,7 +775,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) 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 a971cc3d60ce..02e1f67ce782 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 5cddcd9dbf10c4f4613fa8109a670dab7b29385e Mon Sep 17 00:00:00 2001 +From ab589a7a49efa030fce68d4cdcc2abb8a5cb4fff Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/32] Don't add resource files to LIBS parameter @@ -11,7 +11,7 @@ like .obj/debug/Qt5Cored_resource_res.o 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp -index ee9a41838b..8d1dcae85b 100644 +index ee9a41838bc..8d1dcae85bb 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -147,7 +147,7 @@ void MingwMakefileGenerator::init() 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 4d0909554e3e..5387873cb7d2 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 61d5f5c5953b73ec08fad76379a29ac4548abb29 Mon Sep 17 00:00:00 2001 +From 7d5b694b9fb1ff6a70d12e4f2b58000c20299395 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/32] Prevent debug library names in pkg-config files @@ -15,7 +15,7 @@ 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 fc996663d8..23ac736fc0 100644 +index fc996663d8d..23ac736fc06 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3256,6 +3256,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch index c653853a519f..6d6a840ec4c2 100644 --- a/0007-Fix-linking-against-shared-static-libpng.patch +++ b/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 655f68b81d85afd13c6fb0664b6bfb8d9f8f8113 Mon Sep 17 00:00:00 2001 +From 9efa97e7788da4201e19cc29a9c0546431bce6f6 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/32] 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 95e8955b51..bc3eae9087 100644 +index 1f0e0534a50..08c0dcee370 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -399,8 +399,10 @@ diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch index 1c677a877141..1d6c36250a4e 100644 --- a/0008-Fix-linking-against-static-D-Bus.patch +++ b/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 95d35d40e72dce594063968920061114e555dcd2 Mon Sep 17 00:00:00 2001 +From b0a2b179506d0bd3befaad82c5401f07e7d1c8ac Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/32] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 08/32] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index 4763ff645f..e97969ab25 100644 +index 4763ff645f0..e97969ab25c 100644 --- a/configure.json +++ b/configure.json @@ -190,18 +190,23 @@ @@ -39,7 +39,7 @@ index 4763ff645f..e97969ab25 100644 { "libs": "-ldbus-1", "condition": "!config.win32" } ] diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h -index accaa4f5ed..4b11c74caa 100644 +index accaa4f5ed5..4b11c74caa7 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -57,6 +57,10 @@ 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 1679ea98924f..c4bd2ddf6a63 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 b2fae5ab20516d6da4b6dd8135e812ab2da90238 Mon Sep 17 00:00:00 2001 +From aad13e0f9c9e9532af9ffc90ae809f3466885cd4 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/32] 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 e97969ab25..b75f8a8033 100644 +index e97969ab25c..b75f8a8033c 100644 --- a/configure.json +++ b/configure.json @@ -203,7 +203,7 @@ diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch index f30e00c856b0..3e0cb3a22666 100644 --- a/0010-Fix-linking-against-static-freetype2.patch +++ b/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 26c1c47916653598f517a5c0127e21c66cf517eb Mon Sep 17 00:00:00 2001 +From d315f3107184d9229928f0437768843476780a7f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/32] Fix linking against static freetype2 @@ -8,7 +8,7 @@ Subject: [PATCH 10/32] Fix linking against static freetype2 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index bc3eae9087..d9b540ce42 100644 +index 08c0dcee370..25cf25044d1 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -238,8 +238,10 @@ diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch index 324eebef747e..7625cd7527fe 100644 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From df46da6b5197d70817c0a668f4f059c693d6387a Mon Sep 17 00:00:00 2001 +From 112e3b22cf8ac50f520258766ca8cb6deb7a9c64 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/32] Fix linking against static harfbuzz @@ -8,7 +8,7 @@ Subject: [PATCH 11/32] 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 d9b540ce42..69cb564e86 100644 +index 25cf25044d1..a5bdad0dee6 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -305,7 +305,11 @@ diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch index b061c63a763e..7f3a7fe3c915 100644 --- a/0012-Fix-linking-against-static-pcre.patch +++ b/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 2cc30ef704965a5531cb3e5954b042e927326114 Mon Sep 17 00:00:00 2001 +From df098f2b94f99521cf5e4f551bf30f318b3955d8 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/32] 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 1f10150435..6a97b47773 100644 +index 1f10150435d..6a97b47773e 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -57,6 +57,10 @@ diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch index 1b6e26f804a7..c58a0fcfa1df 100644 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From a311facacfb8b0d2c8009307d375cb00ae673b58 Mon Sep 17 00:00:00 2001 +From f580ad8b08498d9a2916e1b01e808d3e4d79ce10 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/32] Fix linking against shared/static MariaDB @@ -9,14 +9,14 @@ Change-Id: I775c3f0d7f4677efabd3d7c8c30d4d0ca182fc64 1 file changed, 2 insertions(+) diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json -index 28ccbeadcd..1d985b03b5 100644 +index 28ccbeadcde..cfff531cf93 100644 --- a/src/plugins/sqldrivers/configure.json +++ b/src/plugins/sqldrivers/configure.json @@ -67,6 +67,8 @@ }, "headers": "mysql.h", "sources": [ -+ { "libs": "-lmariadbclient -lws2_32 -ladvapi32 -lkernel32 -lshlwapi -lcrypt32 -lsecur32 -lgdi32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" }, ++ { "libs": "-lmariadbclient -lzstd -lws2_32 -ladvapi32 -lkernel32 -lshlwapi -lbcrypt -lcrypt32 -lsecur32 -lgdi32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" }, + { "libs": "-lmariadb", "condition": "config.win32 && features.shared" }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 6ab8a075671d..f0705156e228 100644 --- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 08ccd6585539d65ca7fdcac00330a6943d2e79bb Mon Sep 17 00:00:00 2001 +From e14d300bbe51344e8a13a1544c01e0b2d1feafdd Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL @@ -8,7 +8,7 @@ Subject: [PATCH 14/32] 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 1d985b03b5..995acd1858 100644 +index cfff531cf93..74e9de3b38a 100644 --- a/src/plugins/sqldrivers/configure.json +++ b/src/plugins/sqldrivers/configure.json @@ -90,9 +90,9 @@ diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch index e21c89a95b5e..a8c1f7cd97ef 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From e596d248fbb71d381d4dfbb8a275fe99d59a0723 Mon Sep 17 00:00:00 2001 +From 95046ab599fefa40dfce21a50e73c9e2a2609920 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/32] Rename qtmain to qt5main @@ -12,7 +12,7 @@ Prevents conflict with mingw-w64-qt4 package 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 0cc6e93c93..c2882d0b2c 100644 +index 0cc6e93c93e..c2882d0b2c4 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -83,7 +83,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 @@ -25,7 +25,7 @@ index 0cc6e93c93..c2882d0b2c 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 64639f177d..6cd94f8058 100644 +index 64639f177df..6cd94f8058a 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -336,14 +336,14 @@ mac { @@ -48,7 +48,7 @@ index 64639f177d..6cd94f8058 100644 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 +index 272170d4280..17f3ef9c2dd 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -5,8 +5,8 @@ contains(TEMPLATE, ".*app") { @@ -63,7 +63,7 @@ index 272170d428..17f3ef9c2d 100644 QMAKE_LIBS += $$lib } else { diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro -index 1f54c846ec..162e7a4b1b 100644 +index 1f54c846eca..162e7a4b1b4 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -2,7 +2,7 @@ diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch index 9275a314b095..a2a5d1279073 100644 --- a/0016-Enable-rpath-for-build-tools.patch +++ b/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 1cf768f18e02d0f9dff8980954341c95e87fa04b Mon Sep 17 00:00:00 2001 +From e76e3192df78e36109359d6e33d637a71f2d7579 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/32] Enable rpath for build tools @@ -13,7 +13,7 @@ Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 8354f30eea..30e8cf18c5 100644 +index 8354f30eea2..30e8cf18c51 100644 --- a/mkspecs/features/qt_app.prf +++ b/mkspecs/features/qt_app.prf @@ -21,6 +21,7 @@ isEmpty(QMAKE_TARGET_DESCRIPTION): \ diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch index d8201f6873be..aaac71c6f166 100644 --- a/0017-Use-system-zlib-for-build-tools.patch +++ b/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 00f46d153516f2f2d2783f7d6b06457d5386d1d4 Mon Sep 17 00:00:00 2001 +From e9e5a6ad899eba68d713af5bcb93b902cbafb222 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/32] Use system zlib for build tools @@ -8,7 +8,7 @@ Subject: [PATCH 17/32] Use system zlib for build tools 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index 24862a07db..698e6cfb95 100644 +index 24862a07dbc..698e6cfb95d 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -158,7 +158,9 @@ macx { diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index d2ba713c79d4..4167bf0caa7b 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From c8f9934f4532862554fc72e69e81a36a89dd4b30 Mon Sep 17 00:00:00 2001 +From 8b4c862d3340d20bc1d402fa1dedc7e3ff9f9aff Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/32] Merge shared and static library trees @@ -17,7 +17,7 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 365a16403e..85acb3757a 100644 +index 365a16403eb..85acb3757aa 100644 --- a/configure.pri +++ b/configure.pri @@ -668,7 +668,12 @@ defineTest(qtConfOutput_machineTuple) { @@ -48,7 +48,7 @@ index 365a16403e..85acb3757a 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index ac799047ab..60b6392267 100644 +index ac799047ab8..60b63922670 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -69,7 +69,7 @@ index ac799047ab..60b6392267 100644 !have_target:!force_qt: CONFIG -= qt diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf -index c15559e174..dd09ac749d 100644 +index c15559e1740..dd09ac749d8 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -4,7 +4,14 @@ @@ -89,7 +89,7 @@ index c15559e174..dd09ac749d 100644 unset(DEVICE_PRI) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index da1f44a88a..8096d01c34 100644 +index da1f44a88a1..8096d01c341 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -254,6 +254,23 @@ for(ever) { @@ -117,7 +117,7 @@ index da1f44a88a..8096d01c34 100644 !isEmpty(BAD_QT):error("Unknown module(s) in QT$$var_sfx: $$replace(BAD_QT, _private$, -private)") diff --git a/mkspecs/features/spec_pre.prf b/mkspecs/features/spec_pre.prf -index 51ea3a8321..275e080ae4 100644 +index 51ea3a8321a..275e080ae4e 100644 --- a/mkspecs/features/spec_pre.prf +++ b/mkspecs/features/spec_pre.prf @@ -14,9 +14,14 @@ QMAKE_EXT_H = .h .hpp .hh .hxx @@ -139,7 +139,7 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 23ac736fc0..16531d556e 100644 +index 23ac736fc06..16531d556e0 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3259,6 +3259,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) @@ -169,7 +169,7 @@ index 23ac736fc0..16531d556e 100644 } diff --git a/qtbase.pro b/qtbase.pro -index c0ce0972ef..5a2deaf31d 100644 +index c0ce0972ef4..5a2deaf31d2 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -20,6 +20,12 @@ CLEAN_DEPS += qmake-clean diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch index 614abd8fbffe..9dfab61ca744 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 f4cf7c6dd8d46cc8fafa6280c9afe421bb319b77 Mon Sep 17 00:00:00 2001 +From c60beaf9aafc2ea2d9ed4e61b612cd0d1ca15a1d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/32] Use *.dll.a as import lib extension @@ -14,7 +14,7 @@ Change-Id: Ic8915ea40b4db3d9f60533d21daf8ff1ec1bd803 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 6cd94f8058..ac089a2f9f 100644 +index 6cd94f8058a..ac089a2f9f0 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -339,8 +339,9 @@ mac { @@ -30,7 +30,7 @@ index 6cd94f8058..ac089a2f9f 100644 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 8096d01c34..b79b324b88 100644 +index 8096d01c341..b79b324b887 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -215,32 +215,22 @@ for(ever) { @@ -81,7 +81,7 @@ index 8096d01c34..b79b324b88 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 183cef2908..03732df4a8 100644 +index 183cef29089..03732df4a84 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -99,9 +99,13 @@ private: 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 3061582fa826..231916ac1ae0 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 ad1a049550fe1c49058bdbeb7a5f2d37116b6e78 Mon Sep 17 00:00:00 2001 +From 3880dd64ed41a80ec4a547cf8c06bc1283e36948 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/32] Pull dependencies of static libraries in CMake modules @@ -35,7 +35,7 @@ Change-Id: I9a1a384aeb39f9185342e3581ab98feb8ad103a0 2 files changed, 133 insertions(+), 201 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index db18dbece6..5a5bc4d61d 100644 +index db18dbece64..5a5bc4d61d6 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -52,6 +52,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura @@ -384,7 +384,7 @@ index db18dbece6..5a5bc4d61d 100644 include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\") !!ENDIF diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index b465a7fa89..eaf9011c3d 100644 +index b465a7fa898..eaf9011c3d9 100644 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in @@ -1,5 +1,6 @@ diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch index 9c89e2c7c117..d3e1d9dcb216 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 2c75eb673191b1588857c7ea921c51afd658a8dc Mon Sep 17 00:00:00 2001 +From 9a03456e540b4cf23f3308c61fb5bbb904503069 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/32] Allow usage of static version with CMake @@ -24,7 +24,7 @@ Change-Id: I410d22d1bee9dd66b90e07461c85fdb74ef621c1 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 ac089a2f9f..ceae7c1f8c 100644 +index ac089a2f9f0..ceae7c1f8c6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -68,7 +68,7 @@ split_incpath { @@ -252,7 +252,7 @@ index ac089a2f9f..ceae7c1f8c 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 5a5bc4d61d..97150fb244 100644 +index 5a5bc4d61d6..97150fb2448 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -2,6 +2,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) @@ -887,7 +887,7 @@ index 5a5bc4d61d..97150fb244 100644 ) endif() diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index eaf9011c3d..de09c85b90 100644 +index eaf9011c3d9..de09c85b90f 100644 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in @@ -1,13 +1,13 @@ @@ -945,7 +945,7 @@ index eaf9011c3d..de09c85b90 100644 endif() diff --git a/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in b/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in new file mode 100644 -index 0000000000..0091940fd2 +index 00000000000..0091940fd26 --- /dev/null +++ b/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in @@ -0,0 +1,11 @@ @@ -961,7 +961,7 @@ index 0000000000..0091940fd2 +set(OVERRIDE_QT_VARIANT_PREFIX "${ORIGINAL_OVERRIDE_QT_VARIANT_PREFIX}") + diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 4ceafb6445..774d8b6c2f 100644 +index 4ceafb6445e..774d8b6c2f7 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -2,6 +2,8 @@ if(NOT DEFINED QT_DEFAULT_MAJOR_VERSION) @@ -1048,7 +1048,7 @@ index 4ceafb6445..774d8b6c2f 100644 $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain> ) diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 84dbbfebd4..31fa875b6c 100644 +index 84dbbfebd47..31fa875b6c7 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -1,4 +1,6 @@ @@ -1080,7 +1080,7 @@ index 84dbbfebd4..31fa875b6c 100644 ${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES} ) diff --git a/src/testlib/Qt5TestConfigExtras.cmake.in b/src/testlib/Qt5TestConfigExtras.cmake.in -index 2a575958ae..ca0e3be3b5 100644 +index 2a575958ae4..ca0e3be3b56 100644 --- a/src/testlib/Qt5TestConfigExtras.cmake.in +++ b/src/testlib/Qt5TestConfigExtras.cmake.in @@ -1,5 +1,5 @@ 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 8bb8bef2b09a..983aff6338c2 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 066178c111de65c4c1622a4d037cc0ecd3e2fe04 Mon Sep 17 00:00:00 2001 +From e3940023b09342d6b1c621d8709737aee85f8c07 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/32] Adjust linker flags for static build with @@ -13,7 +13,7 @@ Change-Id: Iad665f18da5b4540f0899829a0165e1d3aa4ea60 1 file changed, 6 insertions(+) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 774d8b6c2f..d16a0fb18c 100644 +index 774d8b6c2f7..d16a0fb18c0 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -207,3 +207,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain) diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch index 3914bf2a039e..850ef04cbc1a 100644 --- a/0023-Use-correct-pkg-config-static-flag.patch +++ b/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 97128246dd76f8b7042d1edbd8d114b1dedc2731 Mon Sep 17 00:00:00 2001 +From 6d636480ff4e2ad8b4827c011816bbfb36d27f02 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/32] Use correct pkg-config --static flag @@ -8,7 +8,7 @@ Subject: [PATCH 23/32] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 85acb3757a..0a4db10dfc 100644 +index 85acb3757aa..0a4db10dfca 100644 --- a/configure.pri +++ b/configure.pri @@ -360,6 +360,9 @@ defineTest(qtConfTest_detectPkgConfig) { diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 0e891c913c65..8cd042210bff 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 a989a5c0ed590db9fe7c571e65b30881aa6108ad Mon Sep 17 00:00:00 2001 +From 2a0d165d912399911cb3a06fcc9479ee4bff431c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic @@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index d91873f1bc..8f1fb17722 100644 +index d91873f1bc9..8f1fb177225 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -153,8 +153,9 @@ function(qt5_create_moc_command infile outfile moc_flags moc_options moc_target @@ -55,7 +55,7 @@ index d91873f1bc..8f1fb17722 100644 MAIN_DEPENDENCY ${infile} DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM) diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake -index 35d2a2dc54..99f061f1b8 100644 +index 35d2a2dc546..99f061f1b82 100644 --- a/src/widgets/Qt5WidgetsMacros.cmake +++ b/src/widgets/Qt5WidgetsMacros.cmake @@ -55,8 +55,9 @@ function(qt5_wrap_ui outfiles ) diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch index f5d80522172c..cfc8c37461da 100644 --- a/0025-Ignore-errors-about-missing-feature-static.patch +++ b/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 57eed8432e651ea526cc1e8c46dec8caf35e4c32 Mon Sep 17 00:00:00 2001 +From 4878b9187fdff7c61e12df69fb17a334ae8b96d8 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/32] Ignore errors about missing feature static @@ -10,7 +10,7 @@ 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 511b158b91..39760d5ce4 100644 +index 511b158b917..39760d5ce44 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -153,5 +153,5 @@ defineTest(qtConfig) { @@ -21,7 +21,7 @@ index 511b158b91..39760d5ce4 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 7777e615bd..5f30366660 100644 +index 7777e615bda..5f30366660b 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -370,5 +370,5 @@ defineTest(qtConfig) { diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch index 11d967cdc5f8..b043b90d784e 100644 --- a/0026-Enable-and-fix-use-of-iconv.patch +++ b/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From b5bf562d8c05a83f341fc4f96d216824ad9993b7 Mon Sep 17 00:00:00 2001 +From d9f375dc3b17cd6e4e1c8e73e1d82e3e93570def Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/32] Enable and fix use of iconv @@ -10,7 +10,7 @@ Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp -index 9c39727946..cc14036b25 100644 +index 9c39727946c..cc14036b254 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp @@ -47,7 +47,6 @@ @@ -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 a9025a2dd2..ffb6f50fbe 100644 +index a9025a2dd29..ffb6f50fbe1 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -72,7 +72,7 @@ diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch index fdffe1b49d1e..d1df2b446d94 100644 --- a/0027-Ignore-failing-pkg-config-test.patch +++ b/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 9ed78355d9d66ba0ddc366093d55f5a879bb0010 Mon Sep 17 00:00:00 2001 +From 10efb837cf135d99e0565892d9f01b3339c4ac63 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/32] 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 b75f8a8033..72a963a679 100644 +index b75f8a8033c..72a963a6793 100644 --- a/configure.json +++ b/configure.json @@ -793,7 +793,6 @@ diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index f12a0bb3bc7d..efe6fc8054b4 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 b0864edc39d794669a00d22f43ca95f5d898b87f Mon Sep 17 00:00:00 2001 +From 5a399b6cff4bd16732c62d6c8c12a46e0588aaab Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies @@ -13,7 +13,7 @@ Change-Id: Ie5a4e2ad96bd613ae4c26486edb30c74929459b0 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index f7bd6dc663..b76c444012 100644 +index f7bd6dc6634..b76c444012c 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -391,6 +391,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -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 03732df4a8..602f7609f5 100644 +index 03732df4a84..602f7609f58 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -106,6 +106,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch index f32046697c8e..4aac9d634202 100644 --- a/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From ce9597b16bd7af9640a73f8bb55f0e3e98741f96 Mon Sep 17 00:00:00 2001 +From 49b47a8726378af67e0e0dcfd33d301fb75bc912 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/32] Hardcode linker flags for platform plugins @@ -18,7 +18,7 @@ Change-Id: I1863d184cff744d2c02e15875e1d108d32ea7861 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..8046e73d61 100644 +index 6e73bd14f9d..8046e73d61d 100644 --- a/src/plugins/platforms/direct2d/direct2d.pro +++ b/src/plugins/platforms/direct2d/direct2d.pro @@ -1,12 +1,41 @@ @@ -69,7 +69,7 @@ index 6e73bd14f9..8046e73d61 100644 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..9fd5c4fca2 100644 +index a1a2da547b3..9fd5c4fca2f 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -1,8 +1,21 @@ @@ -97,7 +97,7 @@ index a1a2da547b..9fd5c4fca2 100644 DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro -index f226132592..592fa7406f 100644 +index f226132592d..592fa7406f0 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -1,8 +1,20 @@ @@ -124,7 +124,7 @@ index f226132592..592fa7406f 100644 DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro -index 50a3bb41a9..02f74650a9 100644 +index 50a3bb41a92..02f74650a9b 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -1,15 +1,35 @@ diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch index 91a00ff916ee..71dfc610b17b 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 82a4a4426638b3a8af3d45377c8274908b0f3d5c Mon Sep 17 00:00:00 2001 +From 61714f5a62cd8d056240f56631a939199c495199 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/32] Fix linking against static plugins with qmake @@ -11,7 +11,7 @@ approach 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index b79b324b88..6a03b7a74b 100644 +index b79b324b887..6a03b7a74bf 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 940aa6cc54de..ec1a8e59ac75 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 ae10eba2d47cb222ebc157c4a8b3c99c04680795 Mon Sep 17 00:00:00 2001 +From 56726797d07ef5671414304e2f92da0fa8dffa0c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 31/32] Prevent 'Cannot find feature windows_vulkan_sdk' @@ -10,7 +10,7 @@ See https://bugreports.qt.io/browse/QTBUG-76660 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/windows-vulkan.conf b/mkspecs/common/windows-vulkan.conf -index da061422dc..a5a8ec68d2 100644 +index da061422dca..a5a8ec68d2f 100644 --- a/mkspecs/common/windows-vulkan.conf +++ b/mkspecs/common/windows-vulkan.conf @@ -1,2 +1,2 @@ @@ -18,7 +18,7 @@ index da061422dc..a5a8ec68d2 100644 +load(win32/windows_vulkan_sdk) QMAKE_LIBS_VULKAN = diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf -index 8475e4111a..c0eb8faa17 100644 +index 8475e4111a7..c0eb8faa17d 100644 --- a/mkspecs/features/qmake_use.prf +++ b/mkspecs/features/qmake_use.prf @@ -15,7 +15,9 @@ for(ever) { diff --git a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch index 50d7a12bc2bd..bda35217d588 100644 --- a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch +++ b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch @@ -1,4 +1,4 @@ -From f80c788b60c8939ef70910d4d774ec727789b201 Mon Sep 17 00:00:00 2001 +From 7370a441351d841243db3757a199904547933459 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 26 Jun 2021 22:24:12 +0200 Subject: [PATCH 32/32] Fix crashes in rasterization code using setjmp @@ -28,7 +28,7 @@ Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%) diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri -index bb0fc0ffba..72decdefbf 100644 +index bb0fc0ffbae..72decdefbf2 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -1,5 +1,7 @@ @@ -52,7 +52,7 @@ diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.cpp similarity index 98% rename from src/gui/painting/qgrayraster.c rename to src/gui/painting/qgrayraster.cpp -index 0143e9b602..803a676e1a 100644 +index 0143e9b6027..803a676e1af 100644 --- a/src/gui/painting/qgrayraster.c +++ b/src/gui/painting/qgrayraster.cpp @@ -39,7 +39,7 @@ @@ -231,7 +231,7 @@ index 0143e9b602..803a676e1a 100644 *araster = 0; return ErrRaster_Memory_Overflow; diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json -index 1a2b907606..746a41efa8 100644 +index 1a2b907606a..746a41efa8e 100644 --- a/src/gui/painting/qt_attribution.json +++ b/src/gui/painting/qt_attribution.json @@ -4,7 +4,7 @@ @@ -17,10 +17,10 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base-static -pkgver=5.15.14+kde+r143 -pkgrel=2 +pkgver=5.15.15+kde+r127 +pkgrel=1 _basever=${pkgver%%+*} -_commit=9f9a56d750caff8b4459e7e9bf82f1f4d725f72f +_commit=ab13e81917207959785ad0185a3a9974e552a7f5 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('any') url='https://www.qt.io/' @@ -71,38 +71,38 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch' '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch') sha256sums=('SKIP' - '2314abe6c4dc0aea926e8b267db314f7da876993134ea0fba0a69e871703575b' - 'c684a2119cf0cb83d141a7cabdb1a9c428ac7c4a9de6745553b0f91d2d58745a' - '754fe1004d763040e9b593e53f4ced267304c58484c33719551e9b5711082b0b' - 'e74fc5bb401386f9cda4013d4c6f7a034871820a6710f16c17d487b9e4024c8f' - '71e0ecf48f3929cd2bc76066cc376d413248c1c83b482079952b296bd976d15f' - 'fce118e0b787b4256c8a2f1e5c7ed90c63b93dedbf17f6b5399d8aa4962411d1' - '305e83101c271ea81f80bae0b46ea764fe9ab811853928d140170b86c6c4f913' - '974eaf232941f7d961b6eeff8a260d59316a472b980d7a4f3f7b3773e2565265' - 'c6876efcafa67dde7bd98cf75462215e37c72f3578df83288db44e1e4a2fa833' - '8bbaf07577fe84d79c02c35728756f874445725669a38fa65dcb75afc13a48c1' - 'd9032919a4ba3b0d83821d2942e53ddf62202468f956e0530fcde1afd0f9caeb' - 'd1dcba199d513b7235d098fb336d43d995fc435e9e6da5eda1a0c5d6fe5bca2a' - 'a048a94df7602ca4c9549b4b07e44bf38f0923324946858e33f6d390b1679502' - '00cb6efeb504a54c4d76770737ada66f8030d6c87edbebaed3e137d822fceb83' - '0a7320a98d54ea61d0dc255996ac632c7bcf447ccfafe34d9ee8e4c27e4e125c' - '34a8273fae8625d08169204da26d2e5f799b04164f240df33d8f38d60fa8f730' - '80af54bf9552e58439f33e253768d31480edde2258aecbe6c6e71c649dd7611c' - '14e741c2a6fb419dc259153f2da4ccf329b65939904221f1476579dedb8244b8' - '90bfb001d4946edf1c1b58bec4910e7530d276763baf9ae96a0356668d81bb22' - '065bca8364f80c3f4a6a984176fa304c1e596975a11ea43758297b7e164c4670' - 'de8ca51ec473afb282f4f171a37f9d0297b95111bf2d11b786c16af42ef70e8f' - '92c32de2b3ee035fab694dce3b9f2cc73e0dba739aadbecd763cf2905a1c86f1' - '15e244b5a4b1bb87cddff12a6f6ccd908d03470941bfbda18931f1598166b7c3' - '9f6919e53627cee62dbcef2ae8ddd4d52eed3be5f7225dd1db16ef2c8efe641e' - 'e40f80e3451ac44bc2a7d7859616b3adfb809cff04ef14c6adb561ec9982cc28' - 'e6ace3bfd69e21ee5030b7f4fd057746cc7c84b05bd25cdd5296d7e8b3992d59' - 'b3c01bdfa84cc25594ca789537fc6241810f94b985f00332fb0e205ba843cdee' - '1b47229b7ec8e965006be9a6067d6440ddbce1e597f4237c730b1c1aaeb6e378' - '78904569fe4630680b465077fb8d14c07d0a9b1af1ff7d4316fd8d142ba6c537' - '1e58ea46aa901ffb3d3bb5b051dcd53ab8e0a94daa45e434e4730324f2236bcb' - 'aedeaeac021fd56f7791ae8612c00e9cd0e3ce35d772ee7633e1978df498aed0' - '56a3a09825d8bb980c02be275ca2cf7d86c58b18dc585334845edf53146366f3') + '22d381ba13ab64988e3e83e1d796319cfa63e62521ac380bc98a44cb4efd474b' + 'd2a78a1cee38821bba407c52cad12f715e5b3a6ea92c3420a47c70a6e5e68e5d' + 'cfc19a2cbf5a149fa1f8b71fecd464811dd908e9d42df41b1c8865109ee1e97a' + '6aaba5c09a128923512d67115e438bcbd79990b1d70e9a3f02548eaa9990c497' + '15da5fb4011f149a111df59518184fb6ea3c6c108580261d2698742b8cffc844' + '0eafd7f37d748b42fc4cd6108b1a2960e4a052b8193b91138a20069714789cc9' + '51b40da3b4135168ca796782bed17900e5e38820af50a13199f209bc0d274d7a' + '4ffb27303ee723e56b7dd0b9f832ca5594c4bdfc2289647061ab7fef6f89798b' + 'c6b3fefccc4a4d22bad20ccdfb644ce8ee9a5c015b16c64e77a46c12178d4951' + '955ba9e2f1f51eebd2c5245d8427b7240a4ac7694ad3f3f7a9167b5985263d7e' + '9f1abc78715c37fe637a2a79a47b41bc110ad1d08cab5b3f00341d427eb70b65' + '11a208d19c567f87ec8318c7db69b6d7fd516dbc9ee2d3209a8b0a0fc16b41c5' + 'f91a26760166f7bcfc8d7deac5f8c9f2a8102d05568ec208fa18056b2f4ef6f5' + 'b025867eef51acdb3f65005463bdf9818c1bdc096b029425f16665c011cfed7d' + '5b03f4307bb076727dde14d7efbf8290ab183fa45a544fa92858b315e60f1ebd' + 'a79ae6f052f2b6ad7255a4cd875ba7ec81b142bddd270c78f786ec65d0646799' + 'fe5dbb469beaa8c1ef61bb408ab2fcc9e2df1e81225333fdebb908ead38bc308' + '28f7cbef809822a6c6c698468b2308888e8ffb7b649cea8a75240bb445c4f24d' + 'bf46e868c2c8e6072367ea851d7a8a6d31969f372b337436f16f3141fc850873' + '9b0f0b4649f1e0d7c544e502f640c72a68dae9a667961f9ac1e792ffbfd2eaaa' + 'cc0aba877cbc4da6d7840fb007128b94bb2c9fb396ab2316dd9b931cbe5a0ef9' + '687a68dd1de6fdcf0aa55da727cce269782661cc78cdf2f36597986f60c9b4a9' + '1d829b537884086d8b6552742717b79f59da3321a4d273ee71b2303e6a4c7823' + '321c128b4cd5f45e61d8225832a6cc9e68969aaa2e2eb567c511d2947b29f003' + '71d2e6dfb765dd69b98b3b851e4683acc51fc7069fe8d158d30f8beb12a467a2' + '5cbd3c1e92a7c2f50516855ee59a3f63e447079e099c0d655e721a2f69423242' + '6f66dffca0f80a97428584a55dcf405f6172a088058c1b011b092d8f68e0f34a' + '1d8c8f49b61dedb0dc48291748ca6d055e0fcfbfe02483e9279a3661231686d1' + '017eb5246c624093c8e5396495427a91cf2f18228d3dd073dd9c033794f64d27' + '2334a67614e7e3c670225056f9b197ef0a3c4c7e97ea07f278371c82e8acae29' + '9eedc6b76a7f3111f905a6406d407fb7c33629b7f45361388274bba596ca90f5' + '773739cb8fadcfd70381103a4ee591d970a22c2cb27aae8fcb034e154b5e4af2') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt deleted file mode 100644 index 9065505391ef..000000000000 --- a/qtbase-sha256.txt +++ /dev/null @@ -1 +0,0 @@ -d1d4f36a90fd1ddf61a0e7d00a6dbca8c64a39b7e9113d16c38c753c2dfe2a99 |