diff options
| author | Martchus | 2024-08-10 19:17:48 +0200 |
|---|---|---|
| committer | Martchus | 2024-08-10 19:17:48 +0200 |
| commit | f30b2445723a1ce1512dbac1f3a2ea6f5a0870f7 (patch) | |
| tree | 7281f189962dbeabae1f4b1aad93d2e98cd72097 | |
| parent | 76d33c1683f1ebed08b1f81feb1f13e9e35b63a8 (diff) | |
| download | aur-f30b2445723a1ce1512dbac1f3a2ea6f5a0870f7.tar.gz | |
Adapt to changes in mariadb-connector-c
35 files changed, 202 insertions, 202 deletions
@@ -1,7 +1,7 @@ pkgbase = mingw-w64-qt5-base pkgdesc = A cross-platform application and UI framework, native OpenGL backend (mingw-w64) - pkgver = 5.15.14+kde+r140 - pkgrel = 1 + pkgver = 5.15.14+kde+r143 + pkgrel = 2 url = https://www.qt.io/ arch = i686 arch = x86_64 @@ -33,7 +33,7 @@ pkgbase = mingw-w64-qt5-base options = !buildflags options = staticlibs options = !emptydirs - source = git+https://invent.kde.org/qt/qt/qtbase#commit=1c13ef067ea3c97342f98039931ea18b3992014f + source = git+https://invent.kde.org/qt/qt/qtbase#commit=9f9a56d750caff8b4459e7e9bf82f1f4d725f72f 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 @@ -67,37 +67,37 @@ pkgbase = mingw-w64-qt5-base source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch source = 0032-Fix-crashes-in-rasterization-code-using-setjmp.patch sha256sums = SKIP - sha256sums = 5b9f3f36e05a029181ca72b83683c119adbfba625ad98ba3fb02113d75d35d44 - sha256sums = ccab6d5fdce7809281c05c1b0b8ec65aab6db1112283fc69ba10bb05e664d545 - sha256sums = 9d4c8bfde02f7e77ea194f1e1ea724baaf947dcd72adca815559e43070df2938 - sha256sums = b6921b9b00542a4afad0f9f97f36b9d45c619bafa06a93576bed6545aea8dd3b - sha256sums = d76628f9395f8b7813e058ebbb8b87d380d490d2e2e67d5d59218082330b3a65 - sha256sums = e909ab659266bc65fd14e16231855b3cf209a3a03965f934f5d81771d4a0191d - sha256sums = 06fc346c7299fb31f0cbebb55c3749d533b48e99fd59e8a3ed3c068fcda03a2f - sha256sums = edd73dc56259afdc8865417974b8956697954aad22844522554fe83c665a3ac8 - sha256sums = 41ffca5bd37d020a3edc56c0b9949e466026fb8c8d935defd9e66a71b779934c - sha256sums = d869ae862fd3251c478e14fdb614185c81e5defb5b00f31161ff5497c66823e2 - sha256sums = 7ac6575b691ed70dde02182aec6f81aaad4aca8a041ab594868d113a913c9e41 - sha256sums = 0dba86fae79ae7368b504ae7d297359f4448f160a42b20b3857d81d2cde91ab5 - sha256sums = ddce558f74a1cdcb673e9a1e9df75442ea71fc6e2503fc85d779c5d8b948784a - sha256sums = 48ee9c592f17400f37e958a59f3605c97d335dec18537b0d730601bb9787a07b - sha256sums = 7e242c398740eabed1c437498e04744fda8a413ce6e668a2a654741d5900dd42 - sha256sums = 7cf8f198fe0348aa5c97c85bfcf868be62fec0fa0148570565c48ef1d91aa0e9 - sha256sums = 6ed70651c02399a407ffa4d8e76da46d5765983034d1e0644686f599b865b68f - sha256sums = 9edc35b11aa19b10ddd7ced57b3b0d035755a4c443ba3b6c6755810a0ecd338f - sha256sums = e4cc92c85debb106bf8ebc899729f8dc17a94a062ffa1c9e6f7fd4cc1c17f91e - sha256sums = 2e9ac0244ca938fc547db038b5d72a31b82e155c84050bf0e3407300bf7eaecb - sha256sums = a46f82235cfc8a6644b425061a7e923fa4468623974ddf75a46ec45802654cd0 - sha256sums = cdad591ba62797d930b5121eef39fa5e2928c76f28b0c32ab35b10ec04e550e4 - sha256sums = 67dec80f21aa819cea23a1b8a267c2724d2fa86e23c69834bc711b381fc03447 - sha256sums = 17320ad851fdf1f7282bb2215429aff12617096b0b82dfc689f3832766f5436e - sha256sums = 3cb80c51dda4e79b5480e0417678c751d0f5b762014939593d9f9c1b645080be - sha256sums = ecc72af327991945a6076790aadd5309aa8ac06891a14ed080fa49632e50b0b0 - sha256sums = efb16ee563478711ca027074494b0cbb1c4f3054028dedd5bcf2b3da91c0797c - sha256sums = 6247074166f5d9a97fb60597b15a80a65cfb2ea5dffc31dcb739cbaa9a95ac62 - sha256sums = 29062bf991b8eab0c65a5ecf09f9a69673757653aacb48269033e5ad8d4f652f - sha256sums = d0d8703d6ec5b960da6a537a3903804ef4366693125b0a31e5cd59954e348888 - sha256sums = 422b67821c2cb1025e3a230965ef664eabb05a9c6d623bc67fc0daaa0fd57262 - sha256sums = 5be2fe99912d1f905aac9a5c1de48e130a3e364bb97fa47fd81f66f26c7c9296 + 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 pkgname = mingw-w64-qt5-base diff --git a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index d4873371dd97..ecd6ecc4324a 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 59185445811e7e53c6301fb041012991e313688f Mon Sep 17 00:00:00 2001 +From d8a27c8e1b39c54ef4155a7c086b35f1bc114c7f 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 c3a1f3a3732..0cc6e93c93e 100644 +index c3a1f3a373..0cc6e93c93 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -8,18 +8,24 @@ @@ -126,7 +126,7 @@ index c3a1f3a3732..0cc6e93c93e 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 59d42176f03..f8cb9859f28 100644 +index 59d42176f0..f8cb9859f2 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 59d42176f03..f8cb9859f28 100644 QMAKE_LINK = $${CROSS_COMPILE}clang++ diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index 5de482f23b5..3c3d22c6993 100644 +index 5de482f23b..3c3d22c699 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -13,11 +13,11 @@ include(../common/windows-desktop.conf) @@ -162,5 +162,5 @@ index 5de482f23b5..3c3d22c6993 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.45.1 +2.46.0 diff --git a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 6f34e864d87d..3c27a100a3af 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 c35f9705a2382167db2ed0cf2f5d8af5118d3534 Mon Sep 17 00:00:00 2001 +From eaaee22b5dfcbd0b27702b032ea75d3b27a81e47 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 4554291bbd9..23d55bddebd 100644 +index 4554291bbd..23d55bddeb 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -56,9 +56,7 @@ @@ -23,5 +23,5 @@ index 4554291bbd9..23d55bddebd 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include <stdio.h> -- -2.45.1 +2.46.0 diff --git a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 8a0101649594..0c006626f5b9 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 9d6f369f80da45624cac856c60b9abb3c9ea30b2 Mon Sep 17 00:00:00 2001 +From d29523ad850dc556ff76b3bbe9e7418f97d637df 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 24758afdeb3..aa04b4a672e 100644 +index 24758afdeb..aa04b4a672 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -3,7 +3,8 @@ @@ -25,5 +25,5 @@ index 24758afdeb3..aa04b4a672e 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.45.1 +2.46.0 diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch index 6bd4e699d35d..2a4c8dad8352 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 9b0772d1085b410d1e11816de607f88df648518d Mon Sep 17 00:00:00 2001 +From 8b3bec6ec1d4986dcbd55c214e3eb00b8b3c23eb 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 7ff921549da..fc996663d8d 100644 +index 7ff921549d..fc996663d8 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 7ff921549da..fc996663d8d 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index 106069c454b..5252a7eaa12 100644 +index 106069c454..5252a7eaa1 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -96,7 +96,7 @@ protected: @@ -49,7 +49,7 @@ index 106069c454b..5252a7eaa12 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 5e446bd7e2b..183cef29089 100644 +index 5e446bd7e2..183cef2908 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -775,7 +775,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) @@ -62,5 +62,5 @@ index 5e446bd7e2b..183cef29089 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.45.1 +2.46.0 diff --git a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch index 2148eaf21b2c..a971cc3d60ce 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 181646ede776937ac769f4cbacb2d16e71d08c6a Mon Sep 17 00:00:00 2001 +From 5cddcd9dbf10c4f4613fa8109a670dab7b29385e 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 ee9a41838bc..8d1dcae85bb 100644 +index ee9a41838b..8d1dcae85b 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -147,7 +147,7 @@ void MingwMakefileGenerator::init() @@ -24,5 +24,5 @@ index ee9a41838bc..8d1dcae85bb 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.45.1 +2.46.0 diff --git a/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/0006-Prevent-debug-library-names-in-pkg-config-files.patch index 5c80a7c13fbf..4d0909554e3e 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 32b01780c19554e1b2950fa841525dcb17f4f5ff Mon Sep 17 00:00:00 2001 +From 61d5f5c5953b73ec08fad76379a29ac4548abb29 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 fc996663d8d..23ac736fc06 100644 +index fc996663d8..23ac736fc0 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3256,6 +3256,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) @@ -29,5 +29,5 @@ index fc996663d8d..23ac736fc06 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.45.1 +2.46.0 diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch index 4c6228c42c73..c653853a519f 100644 --- a/0007-Fix-linking-against-shared-static-libpng.patch +++ b/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From b7593425c07e0584a64b86a6c96ef48c25e1edf4 Mon Sep 17 00:00:00 2001 +From 655f68b81d85afd13c6fb0664b6bfb8d9f8f8113 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 95e8955b510..bc3eae90872 100644 +index 95e8955b51..bc3eae9087 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -399,8 +399,10 @@ @@ -26,5 +26,5 @@ index 95e8955b510..bc3eae90872 100644 ], "use": [ -- -2.45.1 +2.46.0 diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch index 7184b6eeb1dd..1c677a877141 100644 --- a/0008-Fix-linking-against-static-D-Bus.patch +++ b/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 4d7ece6b41e514620379181ca2e19e2cb21fb3c7 Mon Sep 17 00:00:00 2001 +From 95d35d40e72dce594063968920061114e555dcd2 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 4763ff645f0..e97969ab25c 100644 +index 4763ff645f..e97969ab25 100644 --- a/configure.json +++ b/configure.json @@ -190,18 +190,23 @@ @@ -39,7 +39,7 @@ index 4763ff645f0..e97969ab25c 100644 { "libs": "-ldbus-1", "condition": "!config.win32" } ] diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h -index accaa4f5ed5..4b11c74caa7 100644 +index accaa4f5ed..4b11c74caa 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -57,6 +57,10 @@ @@ -54,5 +54,5 @@ index accaa4f5ed5..4b11c74caa7 100644 # include <dbus/dbus.h> #else -- -2.45.1 +2.46.0 diff --git a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index 179baa413e37..1679ea98924f 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 dce1b9b945c9f5a528cf21f3fba9bb7bab69c134 Mon Sep 17 00:00:00 2001 +From b2fae5ab20516d6da4b6dd8135e812ab2da90238 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 e97969ab25c..b75f8a8033c 100644 +index e97969ab25..b75f8a8033 100644 --- a/configure.json +++ b/configure.json @@ -203,7 +203,7 @@ @@ -25,5 +25,5 @@ index e97969ab25c..b75f8a8033c 100644 }, "condition": "config.win32 && features.shared" -- -2.45.1 +2.46.0 diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch index 49e99bd4c8eb..f30e00c856b0 100644 --- a/0010-Fix-linking-against-static-freetype2.patch +++ b/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From a191eac4e7eb82ebe3f7627163d3942b13ec60f4 Mon Sep 17 00:00:00 2001 +From 26c1c47916653598f517a5c0127e21c66cf517eb 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 bc3eae90872..d9b540ce428 100644 +index bc3eae9087..d9b540ce42 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -238,8 +238,10 @@ @@ -25,5 +25,5 @@ index bc3eae90872..d9b540ce428 100644 { "libs": "-lfreetype" } ], -- -2.45.1 +2.46.0 diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch index 31602c4d3fb9..324eebef747e 100644 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From ed77c71d51c933ecce2af067b9d3ce898a9811b3 Mon Sep 17 00:00:00 2001 +From df46da6b5197d70817c0a668f4f059c693d6387a 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 d9b540ce428..69cb564e868 100644 +index d9b540ce42..69cb564e86 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -305,7 +305,11 @@ @@ -25,5 +25,5 @@ index d9b540ce428..69cb564e868 100644 }, "imf": { -- -2.45.1 +2.46.0 diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch index 1d41ff5e97c8..b061c63a763e 100644 --- a/0012-Fix-linking-against-static-pcre.patch +++ b/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 41ea62c42fc5386e3956d55cf2e7726aa257f335 Mon Sep 17 00:00:00 2001 +From 2cc30ef704965a5531cb3e5954b042e927326114 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 1f10150435d..6a97b47773e 100644 +index 1f10150435..6a97b47773 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -57,6 +57,10 @@ @@ -24,5 +24,5 @@ index 1f10150435d..6a97b47773e 100644 #include <pcre2.h> -- -2.45.1 +2.46.0 diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch index 7cc288853806..1b6e26f804a7 100644 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,26 +1,26 @@ -From 3561a46f89b20bb55fd73f71efee00cac7c347b8 Mon Sep 17 00:00:00 2001 +From a311facacfb8b0d2c8009307d375cb00ae673b58 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 -Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b +Change-Id: I775c3f0d7f4677efabd3d7c8c30d4d0ca182fc64 --- src/plugins/sqldrivers/configure.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json -index 28ccbeadcde..a5e3001bf60 100644 +index 28ccbeadcd..1d985b03b5 100644 --- a/src/plugins/sqldrivers/configure.json +++ b/src/plugins/sqldrivers/configure.json @@ -67,6 +67,8 @@ }, "headers": "mysql.h", "sources": [ -+ { "libs": "-lmariadbclient -lssl -lcrypto -lcrypt32 -lshlwapi -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" }, ++ { "libs": "-lmariadbclient -lws2_32 -ladvapi32 -lkernel32 -lshlwapi -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 }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.45.1 +2.46.0 diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 5553365b6e96..6ab8a075671d 100644 --- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 0a4e4c57620b8224531f1d6e8ef0db3ce066857b Mon Sep 17 00:00:00 2001 +From 08ccd6585539d65ca7fdcac00330a6943d2e79bb 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 a5e3001bf60..5768d3b9a97 100644 +index 1d985b03b5..995acd1858 100644 --- a/src/plugins/sqldrivers/configure.json +++ b/src/plugins/sqldrivers/configure.json @@ -90,9 +90,9 @@ @@ -24,5 +24,5 @@ index a5e3001bf60..5768d3b9a97 100644 ] }, -- -2.45.1 +2.46.0 diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch index d05ed6df2f36..e21c89a95b5e 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 243c90ced35cc231bd16a344da759db3f12131dd Mon Sep 17 00:00:00 2001 +From e596d248fbb71d381d4dfbb8a275fe99d59a0723 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 0cc6e93c93e..c2882d0b2c4 100644 +index 0cc6e93c93..c2882d0b2c 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 0cc6e93c93e..c2882d0b2c4 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 64639f177df..6cd94f8058a 100644 +index 64639f177d..6cd94f8058 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -336,14 +336,14 @@ mac { @@ -48,7 +48,7 @@ index 64639f177df..6cd94f8058a 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 272170d4280..17f3ef9c2dd 100644 +index 272170d428..17f3ef9c2d 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 272170d4280..17f3ef9c2dd 100644 QMAKE_LIBS += $$lib } else { diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro -index 1f54c846eca..162e7a4b1b4 100644 +index 1f54c846ec..162e7a4b1b 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -2,7 +2,7 @@ @@ -76,5 +76,5 @@ index 1f54c846eca..162e7a4b1b4 100644 CONFIG += static -- -2.45.1 +2.46.0 diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch index fe1218b4438e..9275a314b095 100644 --- a/0016-Enable-rpath-for-build-tools.patch +++ b/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 731606af0cded31a76af9c5835c4746aa4738260 Mon Sep 17 00:00:00 2001 +From 1cf768f18e02d0f9dff8980954341c95e87fa04b 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 8354f30eea2..30e8cf18c51 100644 +index 8354f30eea..30e8cf18c5 100644 --- a/mkspecs/features/qt_app.prf +++ b/mkspecs/features/qt_app.prf @@ -21,6 +21,7 @@ isEmpty(QMAKE_TARGET_DESCRIPTION): \ @@ -33,5 +33,5 @@ index 8354f30eea2..30e8cf18c51 100644 INSTALLS += target -- -2.45.1 +2.46.0 diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch index c864615e252b..d8201f6873be 100644 --- a/0017-Use-system-zlib-for-build-tools.patch +++ b/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 88e72a2c464f041a4ab238a90016edce35ceebbe Mon Sep 17 00:00:00 2001 +From 00f46d153516f2f2d2783f7d6b06457d5386d1d4 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 24862a07dbc..698e6cfb95d 100644 +index 24862a07db..698e6cfb95 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -158,7 +158,9 @@ macx { @@ -23,5 +23,5 @@ index 24862a07dbc..698e6cfb95d 100644 } else { CONFIG += no_core_dep -- -2.45.1 +2.46.0 diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index 6c73ee0e9188..d2ba713c79d4 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From fb7f2ab8ec627a62ded0f6c5965fef132ccc3db0 Mon Sep 17 00:00:00 2001 +From c8f9934f4532862554fc72e69e81a36a89dd4b30 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 365a16403eb..85acb3757aa 100644 +index 365a16403e..85acb3757a 100644 --- a/configure.pri +++ b/configure.pri @@ -668,7 +668,12 @@ defineTest(qtConfOutput_machineTuple) { @@ -48,7 +48,7 @@ index 365a16403eb..85acb3757aa 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index ac799047ab8..60b63922670 100644 +index ac799047ab..60b6392267 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -69,7 +69,7 @@ index ac799047ab8..60b63922670 100644 !have_target:!force_qt: CONFIG -= qt diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf -index c15559e1740..dd09ac749d8 100644 +index c15559e174..dd09ac749d 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -4,7 +4,14 @@ @@ -89,7 +89,7 @@ index c15559e1740..dd09ac749d8 100644 unset(DEVICE_PRI) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index da1f44a88a1..8096d01c341 100644 +index da1f44a88a..8096d01c34 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -254,6 +254,23 @@ for(ever) { @@ -117,7 +117,7 @@ index da1f44a88a1..8096d01c341 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 51ea3a8321a..275e080ae4e 100644 +index 51ea3a8321..275e080ae4 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 51ea3a8321a..275e080ae4e 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 23ac736fc06..16531d556e0 100644 +index 23ac736fc0..16531d556e 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 23ac736fc06..16531d556e0 100644 } diff --git a/qtbase.pro b/qtbase.pro -index c0ce0972ef4..5a2deaf31d2 100644 +index c0ce0972ef..5a2deaf31d 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -20,6 +20,12 @@ CLEAN_DEPS += qmake-clean @@ -204,5 +204,5 @@ index c0ce0972ef4..5a2deaf31d2 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.45.1 +2.46.0 diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch index b6af814f7e53..614abd8fbffe 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 45f282343d32577fb7551144189fde9a01d044de Mon Sep 17 00:00:00 2001 +From f4cf7c6dd8d46cc8fafa6280c9afe421bb319b77 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 6cd94f8058a..ac089a2f9f0 100644 +index 6cd94f8058..ac089a2f9f 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -339,8 +339,9 @@ mac { @@ -30,7 +30,7 @@ index 6cd94f8058a..ac089a2f9f0 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 8096d01c341..b79b324b887 100644 +index 8096d01c34..b79b324b88 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -215,32 +215,22 @@ for(ever) { @@ -81,7 +81,7 @@ index 8096d01c341..b79b324b887 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 183cef29089..03732df4a84 100644 +index 183cef2908..03732df4a8 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -99,9 +99,13 @@ private: @@ -116,5 +116,5 @@ index 183cef29089..03732df4a84 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.45.1 +2.46.0 diff --git a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index 5a3cd8915594..3061582fa826 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 e8cf5872bad72b833adbe4da4001090fa41b0454 Mon Sep 17 00:00:00 2001 +From ad1a049550fe1c49058bdbeb7a5f2d37116b6e78 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 db18dbece64..5a5bc4d61d6 100644 +index db18dbece6..5a5bc4d61d 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 db18dbece64..5a5bc4d61d6 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 b465a7fa898..eaf9011c3d9 100644 +index b465a7fa89..eaf9011c3d 100644 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in @@ -1,5 +1,6 @@ @@ -499,5 +499,5 @@ index b465a7fa898..eaf9011c3d9 100644 set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\") +endif() -- -2.45.1 +2.46.0 diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch index 2d461c43cbd4..9c89e2c7c117 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 2b2526c3f49b6a1d9e174d68c373a9ae9730d583 Mon Sep 17 00:00:00 2001 +From 2c75eb673191b1588857c7ea921c51afd658a8dc 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 ac089a2f9f0..ceae7c1f8c6 100644 +index ac089a2f9f..ceae7c1f8c 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -68,7 +68,7 @@ split_incpath { @@ -252,7 +252,7 @@ index ac089a2f9f0..ceae7c1f8c6 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 5a5bc4d61d6..97150fb2448 100644 +index 5a5bc4d61d..97150fb244 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 5a5bc4d61d6..97150fb2448 100644 ) endif() diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index eaf9011c3d9..de09c85b90f 100644 +index eaf9011c3d..de09c85b90 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 eaf9011c3d9..de09c85b90f 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 00000000000..0091940fd26 +index 0000000000..0091940fd2 --- /dev/null +++ b/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in @@ -0,0 +1,11 @@ @@ -961,7 +961,7 @@ index 00000000000..0091940fd26 +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 4ceafb6445e..774d8b6c2f7 100644 +index 4ceafb6445..774d8b6c2f 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 4ceafb6445e..774d8b6c2f7 100644 $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain> ) diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 84dbbfebd47..31fa875b6c7 100644 +index 84dbbfebd4..31fa875b6c 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -1,4 +1,6 @@ @@ -1080,7 +1080,7 @@ index 84dbbfebd47..31fa875b6c7 100644 ${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES} ) diff --git a/src/testlib/Qt5TestConfigExtras.cmake.in b/src/testlib/Qt5TestConfigExtras.cmake.in -index 2a575958ae4..ca0e3be3b56 100644 +index 2a575958ae..ca0e3be3b5 100644 --- a/src/testlib/Qt5TestConfigExtras.cmake.in +++ b/src/testlib/Qt5TestConfigExtras.cmake.in @@ -1,5 +1,5 @@ @@ -1091,5 +1091,5 @@ index 2a575958ae4..ca0e3be3b56 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.45.1 +2.46.0 diff --git a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 1c548c83d88b..8bb8bef2b09a 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 a36333cb15ec3cc9adc8e7065034715a741ca7aa Mon Sep 17 00:00:00 2001 +From 066178c111de65c4c1622a4d037cc0ecd3e2fe04 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 774d8b6c2f7..d16a0fb18c0 100644 +index 774d8b6c2f..d16a0fb18c 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) @@ -27,5 +27,5 @@ index 774d8b6c2f7..d16a0fb18c0 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.45.1 +2.46.0 diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch index 80e8f235f4a7..3914bf2a039e 100644 --- a/0023-Use-correct-pkg-config-static-flag.patch +++ b/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 4af65a7ec4c2ddb51b87b03d7351c8b7a9f13d2a Mon Sep 17 00:00:00 2001 +From 97128246dd76f8b7042d1edbd8d114b1dedc2731 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 85acb3757aa..0a4db10dfca 100644 +index 85acb3757a..0a4db10dfc 100644 --- a/configure.pri +++ b/configure.pri @@ -360,6 +360,9 @@ defineTest(qtConfTest_detectPkgConfig) { @@ -22,5 +22,5 @@ index 85acb3757aa..0a4db10dfca 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.45.1 +2.46.0 diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 766911f0e2f3..0e891c913c65 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 19c277e150d5d12b5eb1bd80ce8a1f6863fafbb2 Mon Sep 17 00:00:00 2001 +From a989a5c0ed590db9fe7c571e65b30881aa6108ad 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 d91873f1bc9..8f1fb177225 100644 +index d91873f1bc..8f1fb17722 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 d91873f1bc9..8f1fb177225 100644 MAIN_DEPENDENCY ${infile} DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM) diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake -index 35d2a2dc546..99f061f1b82 100644 +index 35d2a2dc54..99f061f1b8 100644 --- a/src/widgets/Qt5WidgetsMacros.cmake +++ b/src/widgets/Qt5WidgetsMacros.cmake @@ -55,8 +55,9 @@ function(qt5_wrap_ui outfiles ) @@ -70,5 +70,5 @@ index 35d2a2dc546..99f061f1b82 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.45.1 +2.46.0 diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch index 31c4ebc18f8c..f5d80522172c 100644 --- a/0025-Ignore-errors-about-missing-feature-static.patch +++ b/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From f4d043d78ddb2a497e8623a282510271dec3a39b Mon Sep 17 00:00:00 2001 +From 57eed8432e651ea526cc1e8c46dec8caf35e4c32 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 511b158b917..39760d5ce44 100644 +index 511b158b91..39760d5ce4 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 511b158b917..39760d5ce44 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 7777e615bda..5f30366660b 100644 +index 7777e615bd..5f30366660 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -370,5 +370,5 @@ defineTest(qtConfig) { @@ -32,5 +32,5 @@ index 7777e615bda..5f30366660b 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.45.1 +2.46.0 diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch index 49d657437d63..11d967cdc5f8 100644 --- a/0026-Enable-and-fix-use-of-iconv.patch +++ b/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 0c129a2729d3332ce66e7f987076d789aec7d763 Mon Sep 17 00:00:00 2001 +From b5bf562d8c05a83f341fc4f96d216824ad9993b7 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 9c39727946c..cc14036b254 100644 +index 9c39727946..cc14036b25 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp @@ -47,7 +47,6 @@ @@ -49,7 +49,7 @@ index 9c39727946c..cc14036b254 100644 #else char **inBytesPtr = &inBytes; diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index a9025a2dd29..ffb6f50fbe1 100644 +index a9025a2dd2..ffb6f50fbe 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -72,7 +72,7 @@ @@ -74,5 +74,5 @@ index a9025a2dd29..ffb6f50fbe1 100644 }, "icu": { -- -2.45.1 +2.46.0 diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch index 6800a531873c..fdffe1b49d1e 100644 --- a/0027-Ignore-failing-pkg-config-test.patch +++ b/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 36508b49514d17ba00eafd15dd21202dfbec5092 Mon Sep 17 00:00:00 2001 +From 9ed78355d9d66ba0ddc366093d55f5a879bb0010 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 b75f8a8033c..72a963a6793 100644 +index b75f8a8033..72a963a679 100644 --- a/configure.json +++ b/configure.json @@ -793,7 +793,6 @@ @@ -21,5 +21,5 @@ index b75f8a8033c..72a963a6793 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.45.1 +2.46.0 diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 5d629e413c5c..f12a0bb3bc7d 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 aab538b9ed39da73b7d12f46a64fde01cc646883 Mon Sep 17 00:00:00 2001 +From b0864edc39d794669a00d22f43ca95f5d898b87f 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 f7bd6dc6634..b76c444012c 100644 +index f7bd6dc663..b76c444012 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 f7bd6dc6634..b76c444012c 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 03732df4a84..602f7609f58 100644 +index 03732df4a8..602f7609f5 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -106,6 +106,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -41,5 +41,5 @@ index 03732df4a84..602f7609f58 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.45.1 +2.46.0 diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch index 3cdf8c138678..f32046697c8e 100644 --- a/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From cac5077627da94fdd50cf5fba443608639a98d57 Mon Sep 17 00:00:00 2001 +From ce9597b16bd7af9640a73f8bb55f0e3e98741f96 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 6e73bd14f9d..8046e73d61d 100644 +index 6e73bd14f9..8046e73d61 100644 --- a/src/plugins/platforms/direct2d/direct2d.pro +++ b/src/plugins/platforms/direct2d/direct2d.pro @@ -1,12 +1,41 @@ @@ -69,7 +69,7 @@ index 6e73bd14f9d..8046e73d61d 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 a1a2da547b3..9fd5c4fca2f 100644 +index a1a2da547b..9fd5c4fca2 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -1,8 +1,21 @@ @@ -97,7 +97,7 @@ index a1a2da547b3..9fd5c4fca2f 100644 DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro -index f226132592d..592fa7406f0 100644 +index f226132592..592fa7406f 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -1,8 +1,20 @@ @@ -124,7 +124,7 @@ index f226132592d..592fa7406f0 100644 DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro -index 50a3bb41a92..02f74650a9b 100644 +index 50a3bb41a9..02f74650a9 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -1,15 +1,35 @@ @@ -174,5 +174,5 @@ index 50a3bb41a92..02f74650a9b 100644 include(windows.pri) -- -2.45.1 +2.46.0 diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch index c603cfdd18ef..91a00ff916ee 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 50f9630adc9205f5fdc5e45b04f5c116ad64776f Mon Sep 17 00:00:00 2001 +From 82a4a4426638b3a8af3d45377c8274908b0f3d5c 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 b79b324b887..6a03b7a74bf 100644 +index b79b324b88..6a03b7a74b 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 @@ -33,5 +33,5 @@ index b79b324b887..6a03b7a74bf 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.45.1 +2.46.0 diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index de1455872c62..940aa6cc54de 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 87e11456be77dba3965fc9bac3a3b6d3ea16012a Mon Sep 17 00:00:00 2001 +From ae10eba2d47cb222ebc157c4a8b3c99c04680795 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 da061422dca..a5a8ec68d2f 100644 +index da061422dc..a5a8ec68d2 100644 --- a/mkspecs/common/windows-vulkan.conf +++ b/mkspecs/common/windows-vulkan.conf @@ -1,2 +1,2 @@ @@ -18,7 +18,7 @@ index da061422dca..a5a8ec68d2f 100644 +load(win32/windows_vulkan_sdk) QMAKE_LIBS_VULKAN = diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf -index 8475e4111a7..c0eb8faa17d 100644 +index 8475e4111a..c0eb8faa17 100644 --- a/mkspecs/features/qmake_use.prf +++ b/mkspecs/features/qmake_use.prf @@ -15,7 +15,9 @@ for(ever) { @@ -33,5 +33,5 @@ index 8475e4111a7..c0eb8faa17d 100644 LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) for (nu, LD_USES) { -- -2.45.1 +2.46.0 diff --git a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch index c39140dde5b9..50d7a12bc2bd 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 8179dcecafdbaa987228042b6b958af3da091f0d Mon Sep 17 00:00:00 2001 +From f80c788b60c8939ef70910d4d774ec727789b201 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 bb0fc0ffbae..72decdefbf2 100644 +index bb0fc0ffba..72decdefbf 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 0143e9b6027..803a676e1af 100644 +index 0143e9b602..803a676e1a 100644 --- a/src/gui/painting/qgrayraster.c +++ b/src/gui/painting/qgrayraster.cpp @@ -39,7 +39,7 @@ @@ -231,7 +231,7 @@ index 0143e9b6027..803a676e1af 100644 *araster = 0; return ErrRaster_Memory_Overflow; diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json -index 1a2b907606a..746a41efa8e 100644 +index 1a2b907606..746a41efa8 100644 --- a/src/gui/painting/qt_attribution.json +++ b/src/gui/painting/qt_attribution.json @@ -4,7 +4,7 @@ @@ -244,5 +244,5 @@ index 1a2b907606a..746a41efa8e 100644 "Description": "FreeType is a freely available software library to render fonts.", "Homepage": "http://www.freetype.org", -- -2.45.1 +2.46.0 @@ -17,10 +17,10 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base -pkgver=5.15.14+kde+r140 -pkgrel=1 +pkgver=5.15.14+kde+r143 +pkgrel=2 _basever=${pkgver%%+*} -_commit=1c13ef067ea3c97342f98039931ea18b3992014f +_commit=9f9a56d750caff8b4459e7e9bf82f1f4d725f72f pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('i686' 'x86_64') url='https://www.qt.io/' @@ -70,38 +70,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' - '5b9f3f36e05a029181ca72b83683c119adbfba625ad98ba3fb02113d75d35d44' - 'ccab6d5fdce7809281c05c1b0b8ec65aab6db1112283fc69ba10bb05e664d545' - '9d4c8bfde02f7e77ea194f1e1ea724baaf947dcd72adca815559e43070df2938' - 'b6921b9b00542a4afad0f9f97f36b9d45c619bafa06a93576bed6545aea8dd3b' - 'd76628f9395f8b7813e058ebbb8b87d380d490d2e2e67d5d59218082330b3a65' - 'e909ab659266bc65fd14e16231855b3cf209a3a03965f934f5d81771d4a0191d' - '06fc346c7299fb31f0cbebb55c3749d533b48e99fd59e8a3ed3c068fcda03a2f' - 'edd73dc56259afdc8865417974b8956697954aad22844522554fe83c665a3ac8' - '41ffca5bd37d020a3edc56c0b9949e466026fb8c8d935defd9e66a71b779934c' - 'd869ae862fd3251c478e14fdb614185c81e5defb5b00f31161ff5497c66823e2' - '7ac6575b691ed70dde02182aec6f81aaad4aca8a041ab594868d113a913c9e41' - '0dba86fae79ae7368b504ae7d297359f4448f160a42b20b3857d81d2cde91ab5' - 'ddce558f74a1cdcb673e9a1e9df75442ea71fc6e2503fc85d779c5d8b948784a' - '48ee9c592f17400f37e958a59f3605c97d335dec18537b0d730601bb9787a07b' - '7e242c398740eabed1c437498e04744fda8a413ce6e668a2a654741d5900dd42' - '7cf8f198fe0348aa5c97c85bfcf868be62fec0fa0148570565c48ef1d91aa0e9' - '6ed70651c02399a407ffa4d8e76da46d5765983034d1e0644686f599b865b68f' - '9edc35b11aa19b10ddd7ced57b3b0d035755a4c443ba3b6c6755810a0ecd338f' - 'e4cc92c85debb106bf8ebc899729f8dc17a94a062ffa1c9e6f7fd4cc1c17f91e' - '2e9ac0244ca938fc547db038b5d72a31b82e155c84050bf0e3407300bf7eaecb' - 'a46f82235cfc8a6644b425061a7e923fa4468623974ddf75a46ec45802654cd0' - 'cdad591ba62797d930b5121eef39fa5e2928c76f28b0c32ab35b10ec04e550e4' - '67dec80f21aa819cea23a1b8a267c2724d2fa86e23c69834bc711b381fc03447' - '17320ad851fdf1f7282bb2215429aff12617096b0b82dfc689f3832766f5436e' - '3cb80c51dda4e79b5480e0417678c751d0f5b762014939593d9f9c1b645080be' - 'ecc72af327991945a6076790aadd5309aa8ac06891a14ed080fa49632e50b0b0' - 'efb16ee563478711ca027074494b0cbb1c4f3054028dedd5bcf2b3da91c0797c' - '6247074166f5d9a97fb60597b15a80a65cfb2ea5dffc31dcb739cbaa9a95ac62' - '29062bf991b8eab0c65a5ecf09f9a69673757653aacb48269033e5ad8d4f652f' - 'd0d8703d6ec5b960da6a537a3903804ef4366693125b0a31e5cd59954e348888' - '422b67821c2cb1025e3a230965ef664eabb05a9c6d623bc67fc0daaa0fd57262' - '5be2fe99912d1f905aac9a5c1de48e130a3e364bb97fa47fd81f66f26c7c9296') + '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') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt index 7f9f47113366..9065505391ef 100644 --- a/qtbase-sha256.txt +++ b/qtbase-sha256.txt @@ -1 +1 @@ -cce3b289529f02b1c27a2c6659abb8f6d7ba62545507f17b44d31f15ecdcc109 +d1d4f36a90fd1ddf61a0e7d00a6dbca8c64a39b7e9113d16c38c753c2dfe2a99 |