diff options
35 files changed, 202 insertions, 202 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt5-base pkgdesc = A cross-platform application and UI framework, native OpenGL backend (mingw-w64) - pkgver = 5.15.12+kde+r147 + pkgver = 5.15.13+kde+r138 pkgrel = 1 url = https://www.qt.io/ arch = i686 @@ -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=8907dedc858cc344d770a2e826d6acc516429540 + source = git+https://invent.kde.org/qt/qt/qtbase#commit=b9906b5233a80cab372c95ac4dd68b25bdca0646 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 @@ -66,38 +66,38 @@ pkgbase = mingw-w64-qt5-base source = 0030-Fix-linking-against-static-plugins-with-qmake.patch source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch source = 0032-Fix-crashes-in-rasterization-code-using-setjmp.patch - sha256sums = SKIP - sha256sums = 6abea753da212719c065ba5001380257098fcb78ebfb1743d511c827f470a636 - sha256sums = 19b2918d73c1fe63c284602e9315e22d0c9b3240705b8a6459f2b0967933c969 - sha256sums = 23d6ace78834c831ea97e19b443a88291e4d103fd85da920e1cf430047a73d41 - sha256sums = 66924a2642debb2a76ff085c1c2c4a6912993d313efea392308859edc825672c - sha256sums = 306cc84dbb13f1315b6d060dffbca4d4a9637f9672e43c58a3d01bf766ae3f71 - sha256sums = 167a7c2cece750b7da922ec25e47eed618feaca92897d085a0c635f828b1a9b9 - sha256sums = 9667d35f3beb5c9042bd7190342f8e86bc9ff62f0bcbb438e25450025c1cf597 - sha256sums = 09c6de90337c1a8d42e695fdea53bdea9800e9d7fc8d12578e9fb1fd564988cc - sha256sums = b5442e2b87f39defa6e38793b2fd26c1e0f3610ae02b3d14a4b680e687ca2ccc - sha256sums = c3c3c0f651da11e3b78cf71399a0d95519e9dc0361e9732adc7f36d60c9e45c1 - sha256sums = 561c0ec6fce7f61166097ea7037020b657dc21abb3fbbf136318f0d43940c396 - sha256sums = e80f2dedaf91bd3302c27244451a510ba3a576bb60d6e96a0f3c8ad8bd0fbd68 - sha256sums = 0d77c5d3f9e84fa2dff90c5faf32b51b1b19f110a503fa9630cdc5e33bc6d72e - sha256sums = c49304f8c99bc4213dc62a65f7f8d1089b72c7ec49d8895afaf5d059da7b905f - sha256sums = 3eb93b2fb1b6eb5e6f5d4fff8e75e5b0cfab96503b077c121e4bc405eda08f42 - sha256sums = 16cc6c9c49d91e2a6c8c6e53a7305db868f4080affd387ec3d932fa474b5841c - sha256sums = 06fb708234c783bc1aa9e0bf1f9db6f16b3fe62ee8a94300252796de841fd56d - sha256sums = 1ab92232b3a94446c391c822a82aab767f4b1b077c73e839b316473163887ad4 - sha256sums = b174ddca0726fadf191176336f8fbddf18ab95f2967e1e0bebdb8e0425d4223f - sha256sums = 376aebad348858696a4f8ecaf9668cf4b12687ef2213706e768d8aa11a01e631 - sha256sums = f266866a8f01cb95a1d686b1a5ce3ec46ab8fa0ddec268b0e2eb53ddbf53aae3 - sha256sums = 91730e65dee6d4a3b1c36e2153c0608e9fb419060ccb57800452895cfe5e08c3 - sha256sums = 575c14e7ff04515a934491fcfd0328316f734045a419581b356db9e9dbd69d20 - sha256sums = a1c8251c4d9747fdfb2fa319cbef604bec6f3826ca4b0d2277b3e56b24e1d44a - sha256sums = 40419107bdd48d47c8d5c8cbee3624fd14c32e2daa42993ff08ea9d5eae21d0f - sha256sums = af7f4c80119c33607d142a591dcf86463796526333a964f7dee5813eab7a2705 - sha256sums = 1684c496c58ecff4fc5e21335a96824ee07282479d0d5f7edf52e844264ce76e - sha256sums = f610d74cffc6c2d089eedde8f31624da25172cc9825a24c085ff6e9c80cb3352 - sha256sums = 30decf5cf1c862c183350ac9af71263ecd45a9701d9e85bc765af8e74ddd0df6 - sha256sums = 811ad201d74106dea202ce28806dc1eca091139da5a71d2dd8656c592ec721ed - sha256sums = 8a154c511e6e3e35a64338890edbbc2a12d6a7079fff9a14491146a4b66e5b59 - sha256sums = c2a61b245c312b71c043ee274d7beba0daf213d7a6f6ba748c2965e4dc27ff0a + sha256sums = 06e49a14145574834d4d04f73e6baf662ee5e72e78973e1d7d0fe614472a80a4 + sha256sums = 11c2b54df2b5ea031c2103366d0b27d0786c3420b29cca391cc0015fd35264d7 + sha256sums = 2b00e98c8c8acb1a453191be77a2f7a9188e030480864e58ac39b517bb63ffb5 + sha256sums = 5131dff4db6f63e36ea364ce59b2fdb047fbb6d55e6543316054f6ebcd76711b + sha256sums = 3147a21ccad3026a06d8b622db96949d51f32b6a1d25c8aae5fe5a95c3e95625 + sha256sums = 4bd74cc1d78da412faac71b5357fd86fea3f1781d0b554f8f7fd3684c833e8ce + sha256sums = e566e5cdd5bc077c35054be1465148acd5ee209e609690c670b78df88cc9295b + sha256sums = 7fe1dc6c1251c16c4236924cb5a03ac55d1dca051bd9d99fbf7b35f91454fda3 + sha256sums = c054851c46036710ff6f025a48d4b5b2d6e5d5d54c74b73c2cb81b00bdfa029a + sha256sums = a2702d6ca3f696ca3c77b00df7bb512f5f3430fce109048c62c97d294758efd8 + sha256sums = 395339c3dde4115283db948899980e536a355422190bc90850efdc3438c527d8 + sha256sums = c386790a879e68b9d00bfe9f14afa67d8a374de57bdea164a5252499ec34cbcb + sha256sums = 576177950e99f62d05bee487dd5ae1b731fe4acf438553c74e7c48631dd8789b + sha256sums = 02bc0ce27d7835829d4e84580fb0a0b864b36b14331a166dba88f1942a6414a3 + sha256sums = 736de6cd28c8efb1729f926c1fa42c963c7f1d3a9e4b56b098906b570473320f + sha256sums = 294f3ab13a546a1bfeae472cf7342e2bce6c058a6867d19038ba1c194fb33b8d + sha256sums = 8f202adf905ebce78dd2942d17c0d935f0de7014ffa75840310edc0bd790ff03 + sha256sums = 129b4667c5e3cfe68040cbae2fce487e2d016bcbe2380a5ba410b225279f71b9 + sha256sums = fbd8cd4680e10074f90bf79d9d08ad787b483cf7c21250d1db1c8a5c829a1d83 + sha256sums = 05a29084b9bc3324beefb9ae6d00ea68c3b3c51a0b4595c024300949c906d7fd + sha256sums = 7843f5be44b9b367cb81c143c6d670e6a5be40510848c09a1448d921c3437639 + sha256sums = 7002db8f819bf34cafda04dc4d288fef58aec9e409230dc68fcb542cb48f09bb + sha256sums = 57607c662e6d68f2ca856617c8d7cfaa05ba8332ea70b67ab628a8f0cf2ca032 + sha256sums = 5910c4567348101d0a87197b2e52e59673467247ca4ffc89cba5701d98373435 + sha256sums = 0181986547b7c70bf2bc8de31198240f99a92e4cfdb1db81c7b99b849c416c1f + sha256sums = 9e692f956dffa5c936a2911d8418746b19197962111b4f0f45b33972ed3890f2 + sha256sums = 1d5e09034c9c903653d10c3983e4dcb710ebe8f08694e5e55199a3e4acb8f629 + sha256sums = 5379cea6fd54a16e7f67b617bf3582c08f8934ae8d699e85ad21f20dcf192424 + sha256sums = 82d1db9d4536350fe2549c400487018a8477a15da83a568240a013a6d82dfe92 + sha256sums = 01413344603a8e99f7b0280e7f297de4ea415e0c5011b1dac116eaf25082220b + sha256sums = 4f88801a586c35515fd982f8e465fb4546ef38765c6a2abe1e8ca69e3700d799 + sha256sums = b4dad74bbe2731aaa8711408fe509344e7e6049def897389f7e2a86423f3377e + sha256sums = 17f251d456713c920c6581659c54b9c372e1a329081b2ed9d9826e9e0ddd317a 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 169e6d4d5649..eb7f5cf67103 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 b6ccf3e66d2a7988a4ffe3407feb56ad782ed586 Mon Sep 17 00:00:00 2001 +From c134da249ee5459358292e1665b69aede5035c5b 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) @@ -162,5 +162,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.43.0 +2.44.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 99f250273572..8d45fa0b914a 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 ff91032556f863a8c7211cd874fd3b703622b2f3 Mon Sep 17 00:00:00 2001 +From acadba49c80804a908477f9a367c645fdf4300cc 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 @@ @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include <stdio.h> -- -2.43.0 +2.44.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 b51679321393..c860bc808f61 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 a04c5b24efbf3a049eb5deeb0e65bbc50cc13c49 Mon Sep 17 00:00:00 2001 +From d3cb4d3b96c01f151e15dc1017f2687f7d8102c3 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 @@ @@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.43.0 +2.44.0 diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch index 2ca9bd3b17b4..ab7ade7f8599 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 e92060e9f2082620f5e2a90f5caf962e5ddf6cc8 Mon Sep 17 00:00:00 2001 +From ed34f597de640c8ef123db60931353894564aa8d 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) @@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.43.0 +2.44.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 40a82b65871c..8d3fb47348ce 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 1509d40b75406e82868a8150080ce6137095115a Mon Sep 17 00:00:00 2001 +From a99587c177203e31c8cfbc825be56866c5a4f747 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() @@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.43.0 +2.44.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 04d9bd085733..b49319e68781 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 f14efd1bfe50197db8350b7042c4f7e0f64c7d9f Mon Sep 17 00:00:00 2001 +From 6456e33a0b4797be08898dce2ce4ccce1c07bef8 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) @@ -29,5 +29,5 @@ index fc996663d8..23ac736fc0 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.43.0 +2.44.0 diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch index 23af4df0f545..87bcd9bf43c5 100644 --- a/0007-Fix-linking-against-shared-static-libpng.patch +++ b/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 1d63d54f3678c7511eba98e6f372d7546501aeba Mon Sep 17 00:00:00 2001 +From 6979ca5c02d202597cf516cab889babbb9f74acc 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 12c95742d2..e0043542ec 100644 +index 95e8955b510..bc3eae90872 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -399,8 +399,10 @@ @@ -26,5 +26,5 @@ index 12c95742d2..e0043542ec 100644 ], "use": [ -- -2.43.0 +2.44.0 diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch index 67e07ef36efc..27e30094ad7d 100644 --- a/0008-Fix-linking-against-static-D-Bus.patch +++ b/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 5fa0a841ce62337e7280279b8aa70874b12148a4 Mon Sep 17 00:00:00 2001 +From a1cd8b87b57eee2b9724d64a2c3b2c949981c544 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 @@ @@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644 # include <dbus/dbus.h> #else -- -2.43.0 +2.44.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 d6203cc3ccf9..4f2deb073fcc 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 ccb0d3a691abf2be1e6ee5ff6293dae1c9246a20 Mon Sep 17 00:00:00 2001 +From 33ff3ba65c06a02136208b80567a0ba0c8db844a 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 @@ @@ -25,5 +25,5 @@ index e97969ab25..b75f8a8033 100644 }, "condition": "config.win32 && features.shared" -- -2.43.0 +2.44.0 diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch index 038f9f470459..df45a37bd830 100644 --- a/0010-Fix-linking-against-static-freetype2.patch +++ b/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 029df9db41b422111966430faa85fa12d96bdde4 Mon Sep 17 00:00:00 2001 +From c1019300eed7fabb7c2c73d5510e5a83e06a89b2 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 e0043542ec..6c5e99fa9a 100644 +index bc3eae90872..d9b540ce428 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -238,8 +238,10 @@ @@ -25,5 +25,5 @@ index e0043542ec..6c5e99fa9a 100644 { "libs": "-lfreetype" } ], -- -2.43.0 +2.44.0 diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch index cdea7a8f0826..a3fc79e0754b 100644 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From 2fb25bad89b6df6903f81d9efac2aa000513d02d Mon Sep 17 00:00:00 2001 +From d5ca57cecd935d1475d5b5677391e703a9733989 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 6c5e99fa9a..d8afe79b0b 100644 +index d9b540ce428..69cb564e868 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -305,7 +305,11 @@ @@ -25,5 +25,5 @@ index 6c5e99fa9a..d8afe79b0b 100644 }, "imf": { -- -2.43.0 +2.44.0 diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch index 45e8888e8bc4..0be57cdea0e2 100644 --- a/0012-Fix-linking-against-static-pcre.patch +++ b/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From c5de4d5b6a0cdb2b8931bf7baf43e75e7e562d45 Mon Sep 17 00:00:00 2001 +From 2189baae3ddff3bdba3f8d8480fa313e50432093 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 @@ @@ -24,5 +24,5 @@ index 1f10150435..6a97b47773 100644 #include <pcre2.h> -- -2.43.0 +2.44.0 diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch index 1887de970934..62a25589aaf6 100644 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 1ebf69214e4ef2269ab0135d126ce5d9bba2fa04 Mon Sep 17 00:00:00 2001 +From 5cdbce5a33f7881eee348250b1b9867c64ea686d 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,7 +9,7 @@ Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b 1 file changed, 2 insertions(+) diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json -index 28ccbeadcd..a5e3001bf6 100644 +index 28ccbeadcde..a5e3001bf60 100644 --- a/src/plugins/sqldrivers/configure.json +++ b/src/plugins/sqldrivers/configure.json @@ -67,6 +67,8 @@ @@ -22,5 +22,5 @@ index 28ccbeadcd..a5e3001bf6 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.43.0 +2.44.0 diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 707e3acbda22..2cce773a6550 100644 --- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 2759362b0676bda304c86d30c30bab30444ffbb9 Mon Sep 17 00:00:00 2001 +From d95435227c24ef2b1be37561a55751e8ff3cfd0e 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 a5e3001bf6..5768d3b9a9 100644 +index a5e3001bf60..5768d3b9a97 100644 --- a/src/plugins/sqldrivers/configure.json +++ b/src/plugins/sqldrivers/configure.json @@ -90,9 +90,9 @@ @@ -24,5 +24,5 @@ index a5e3001bf6..5768d3b9a9 100644 ] }, -- -2.43.0 +2.44.0 diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch index 63156a4e1fb4..08a71116e005 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From ff832ccc532edcd8ed520ee84db3b00454f33651 Mon Sep 17 00:00:00 2001 +From 41e6e4c93cc8cbe45305458bc87573ad5a630601 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 @@ @@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.43.0 +2.44.0 diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch index 704655145ce1..5919447ebb08 100644 --- a/0016-Enable-rpath-for-build-tools.patch +++ b/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From a4cd073cad8030792dd7822ff3a4317441ec3824 Mon Sep 17 00:00:00 2001 +From 0dc529641264921bd859fabdf4a6d082b253fcdc 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): \ @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.43.0 +2.44.0 diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch index 1feef395011a..3e8814e569ca 100644 --- a/0017-Use-system-zlib-for-build-tools.patch +++ b/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 83459578b49cefb55f3977182b2f2a8dff1eff32 Mon Sep 17 00:00:00 2001 +From c8b4c96da58bf20d982f5142ac0f218a2abeeb90 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 { @@ -23,5 +23,5 @@ index 24862a07db..698e6cfb95 100644 } else { CONFIG += no_core_dep -- -2.43.0 +2.44.0 diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index 0f64cacaabce..7e35a741d883 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 2171c0bfb817495fb64d7a0b31ced2a4fa9c4f4f Mon Sep 17 00:00:00 2001 +From 2029f79155af8b3fdff3b9a66ee25b7ff274c327 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 @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.43.0 +2.44.0 diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch index 099b966227b1..cc8f99287b11 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 b90b122dde2818d7c43c2400ec5aad542909ec67 Mon Sep 17 00:00:00 2001 +From d5bbf09f6dd16ada912feae0a1a63cf22ecd5f71 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: @@ -116,5 +116,5 @@ index 183cef2908..03732df4a8 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.43.0 +2.44.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 26e7923d7c75..2fe1a55d86a5 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 52e0f0689c9bfc6f10e5b5eeaf51181fea9beb25 Mon Sep 17 00:00:00 2001 +From 8d7db460bee900348d29fb86784de1a79312bc19 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 @@ @@ -499,5 +499,5 @@ index b465a7fa89..eaf9011c3d 100644 set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\") +endif() -- -2.43.0 +2.44.0 diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch index 1876db935437..96c32ae865da 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 c748cb3cc99435da4123f5822c544dc8a4a0960f Mon Sep 17 00:00:00 2001 +From a32c64f42900b052b017795255511cf5d1ea019d 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 0d02edb41c..9da1361c95 100644 +index 0d02edb41c3..9da1361c95a 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 0d02edb41c..9da1361c95 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 @@ @@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.43.0 +2.44.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 a420a7c9ed97..83810470c590 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 3fb4f9b9186af92e95cd35ba994ee9e9fa3be4d6 Mon Sep 17 00:00:00 2001 +From 1e0190cb9b33cd6aaef745da13d8e4de85a50775 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 9da1361c95..5e802dea4c 100644 +index 9da1361c95a..5e802dea4c5 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -206,3 +206,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain) @@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.43.0 +2.44.0 diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch index 02eac25b0e7a..39a8e626d249 100644 --- a/0023-Use-correct-pkg-config-static-flag.patch +++ b/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 4e95aba534172824d9756ec22bfe903d29d98e54 Mon Sep 17 00:00:00 2001 +From 4d24aaff9e4e144e320a964c2c21060b41c3039f 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) { @@ -22,5 +22,5 @@ index 85acb3757a..0a4db10dfc 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.43.0 +2.44.0 diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 9930cb377c73..ccb734bcded2 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 c78641f7d7f6fc5878153d219e83dbf27d8a07b4 Mon Sep 17 00:00:00 2001 +From bfe19d4efc3d2102f6132231a3d41b4940ba2ecf 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 ) @@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.43.0 +2.44.0 diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch index 32896986ae3d..f28e1c84689c 100644 --- a/0025-Ignore-errors-about-missing-feature-static.patch +++ b/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 446017c200c59d2332a0b17c24a897d3165b8de9 Mon Sep 17 00:00:00 2001 +From b4037f482107b0bde253b487487501b8bc82db55 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) { @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.43.0 +2.44.0 diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch index 6605d3365180..2bf44dfba747 100644 --- a/0026-Enable-and-fix-use-of-iconv.patch +++ b/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From a567a7a191d2616a372529383a10bad8e9306f6a Mon Sep 17 00:00:00 2001 +From 5f1d71631402760aa75df7b0ea8c9be7608f51a2 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 @@ @@ -74,5 +74,5 @@ index a9025a2dd2..ffb6f50fbe 100644 }, "icu": { -- -2.43.0 +2.44.0 diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch index 8eff0aa5dbae..ca55df914ba3 100644 --- a/0027-Ignore-failing-pkg-config-test.patch +++ b/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From ebca1e4ba71b42a0b9f3358118dd1bf7e5184450 Mon Sep 17 00:00:00 2001 +From 341d9fb7080be076b2dbeb5d1b714eff08060327 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 @@ @@ -21,5 +21,5 @@ index b75f8a8033..72a963a679 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.43.0 +2.44.0 diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index f5e770e0e0f4..9776e1a11cbc 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 fc455d2b8916fbfe7b0b5240822b96c6567a7e2c Mon Sep 17 00:00:00 2001 +From 2095dda5640e16c678173355a2d39910701d8fc3 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) @@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.43.0 +2.44.0 diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch index a46035d930f7..e1a952761d31 100644 --- a/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From 9858a911afe59c3768b5eb76f7c9cb1d7ea2f06c Mon Sep 17 00:00:00 2001 +From c08a720e1cd51c0015ec02143cd65b17e5e69b64 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 @@ @@ -174,5 +174,5 @@ index 50a3bb41a9..02f74650a9 100644 include(windows.pri) -- -2.43.0 +2.44.0 diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch index 58dca6fdbe2c..576bc94d219b 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 e12301fa179a7196624b12d02a2ddacd997ecc7e Mon Sep 17 00:00:00 2001 +From bd80f6a8310a4e9d3d91d4fc242cccc3718977b1 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 @@ -33,5 +33,5 @@ index b79b324b88..6a03b7a74b 100644 # Check if the plugin is known to Qt. We can use this to determine # the plugin path. Unknown plugins must rely on the default link path. -- -2.43.0 +2.44.0 diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 700dd6485137..5fc03ed8d76e 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 a7a3f6a64e90aee5a0024f9b8b1d6d4876d25d7e Mon Sep 17 00:00:00 2001 +From 5a1f5a3b43cfc29cd8ec1ce8791ef4029f5e2f96 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) { @@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644 LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) for (nu, LD_USES) { -- -2.43.0 +2.44.0 diff --git a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch index a35aa695581e..c5673e401b3f 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 5f254a0f2f5857a6c1da88166549b38a3864a38c Mon Sep 17 00:00:00 2001 +From 1690bb85bf77a77a80abf2d369b6ec17b87ab4f8 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 @@ @@ -244,5 +244,5 @@ index 1a2b907606..746a41efa8 100644 "Description": "FreeType is a freely available software library to render fonts.", "Homepage": "http://www.freetype.org", -- -2.43.0 +2.44.0 @@ -17,10 +17,10 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base -pkgver=5.15.12+kde+r147 +pkgver=5.15.13+kde+r138 pkgrel=1 _basever=${pkgver%%+*} -_commit=8907dedc858cc344d770a2e826d6acc516429540 +_commit=b9906b5233a80cab372c95ac4dd68b25bdca0646 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('i686' 'x86_64') url='https://www.qt.io/' @@ -69,39 +69,39 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0030-Fix-linking-against-static-plugins-with-qmake.patch' '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch' '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch') -sha256sums=('SKIP' - '6abea753da212719c065ba5001380257098fcb78ebfb1743d511c827f470a636' - '19b2918d73c1fe63c284602e9315e22d0c9b3240705b8a6459f2b0967933c969' - '23d6ace78834c831ea97e19b443a88291e4d103fd85da920e1cf430047a73d41' - '66924a2642debb2a76ff085c1c2c4a6912993d313efea392308859edc825672c' - '306cc84dbb13f1315b6d060dffbca4d4a9637f9672e43c58a3d01bf766ae3f71' - '167a7c2cece750b7da922ec25e47eed618feaca92897d085a0c635f828b1a9b9' - '9667d35f3beb5c9042bd7190342f8e86bc9ff62f0bcbb438e25450025c1cf597' - '09c6de90337c1a8d42e695fdea53bdea9800e9d7fc8d12578e9fb1fd564988cc' - 'b5442e2b87f39defa6e38793b2fd26c1e0f3610ae02b3d14a4b680e687ca2ccc' - 'c3c3c0f651da11e3b78cf71399a0d95519e9dc0361e9732adc7f36d60c9e45c1' - '561c0ec6fce7f61166097ea7037020b657dc21abb3fbbf136318f0d43940c396' - 'e80f2dedaf91bd3302c27244451a510ba3a576bb60d6e96a0f3c8ad8bd0fbd68' - '0d77c5d3f9e84fa2dff90c5faf32b51b1b19f110a503fa9630cdc5e33bc6d72e' - 'c49304f8c99bc4213dc62a65f7f8d1089b72c7ec49d8895afaf5d059da7b905f' - '3eb93b2fb1b6eb5e6f5d4fff8e75e5b0cfab96503b077c121e4bc405eda08f42' - '16cc6c9c49d91e2a6c8c6e53a7305db868f4080affd387ec3d932fa474b5841c' - '06fb708234c783bc1aa9e0bf1f9db6f16b3fe62ee8a94300252796de841fd56d' - '1ab92232b3a94446c391c822a82aab767f4b1b077c73e839b316473163887ad4' - 'b174ddca0726fadf191176336f8fbddf18ab95f2967e1e0bebdb8e0425d4223f' - '376aebad348858696a4f8ecaf9668cf4b12687ef2213706e768d8aa11a01e631' - 'f266866a8f01cb95a1d686b1a5ce3ec46ab8fa0ddec268b0e2eb53ddbf53aae3' - '91730e65dee6d4a3b1c36e2153c0608e9fb419060ccb57800452895cfe5e08c3' - '575c14e7ff04515a934491fcfd0328316f734045a419581b356db9e9dbd69d20' - 'a1c8251c4d9747fdfb2fa319cbef604bec6f3826ca4b0d2277b3e56b24e1d44a' - '40419107bdd48d47c8d5c8cbee3624fd14c32e2daa42993ff08ea9d5eae21d0f' - 'af7f4c80119c33607d142a591dcf86463796526333a964f7dee5813eab7a2705' - '1684c496c58ecff4fc5e21335a96824ee07282479d0d5f7edf52e844264ce76e' - 'f610d74cffc6c2d089eedde8f31624da25172cc9825a24c085ff6e9c80cb3352' - '30decf5cf1c862c183350ac9af71263ecd45a9701d9e85bc765af8e74ddd0df6' - '811ad201d74106dea202ce28806dc1eca091139da5a71d2dd8656c592ec721ed' - '8a154c511e6e3e35a64338890edbbc2a12d6a7079fff9a14491146a4b66e5b59' - 'c2a61b245c312b71c043ee274d7beba0daf213d7a6f6ba748c2965e4dc27ff0a') +sha256sums=('06e49a14145574834d4d04f73e6baf662ee5e72e78973e1d7d0fe614472a80a4' + '11c2b54df2b5ea031c2103366d0b27d0786c3420b29cca391cc0015fd35264d7' + '2b00e98c8c8acb1a453191be77a2f7a9188e030480864e58ac39b517bb63ffb5' + '5131dff4db6f63e36ea364ce59b2fdb047fbb6d55e6543316054f6ebcd76711b' + '3147a21ccad3026a06d8b622db96949d51f32b6a1d25c8aae5fe5a95c3e95625' + '4bd74cc1d78da412faac71b5357fd86fea3f1781d0b554f8f7fd3684c833e8ce' + 'e566e5cdd5bc077c35054be1465148acd5ee209e609690c670b78df88cc9295b' + '7fe1dc6c1251c16c4236924cb5a03ac55d1dca051bd9d99fbf7b35f91454fda3' + 'c054851c46036710ff6f025a48d4b5b2d6e5d5d54c74b73c2cb81b00bdfa029a' + 'a2702d6ca3f696ca3c77b00df7bb512f5f3430fce109048c62c97d294758efd8' + '395339c3dde4115283db948899980e536a355422190bc90850efdc3438c527d8' + 'c386790a879e68b9d00bfe9f14afa67d8a374de57bdea164a5252499ec34cbcb' + '576177950e99f62d05bee487dd5ae1b731fe4acf438553c74e7c48631dd8789b' + '02bc0ce27d7835829d4e84580fb0a0b864b36b14331a166dba88f1942a6414a3' + '736de6cd28c8efb1729f926c1fa42c963c7f1d3a9e4b56b098906b570473320f' + '294f3ab13a546a1bfeae472cf7342e2bce6c058a6867d19038ba1c194fb33b8d' + '8f202adf905ebce78dd2942d17c0d935f0de7014ffa75840310edc0bd790ff03' + '129b4667c5e3cfe68040cbae2fce487e2d016bcbe2380a5ba410b225279f71b9' + 'fbd8cd4680e10074f90bf79d9d08ad787b483cf7c21250d1db1c8a5c829a1d83' + '05a29084b9bc3324beefb9ae6d00ea68c3b3c51a0b4595c024300949c906d7fd' + '7843f5be44b9b367cb81c143c6d670e6a5be40510848c09a1448d921c3437639' + '7002db8f819bf34cafda04dc4d288fef58aec9e409230dc68fcb542cb48f09bb' + '57607c662e6d68f2ca856617c8d7cfaa05ba8332ea70b67ab628a8f0cf2ca032' + '5910c4567348101d0a87197b2e52e59673467247ca4ffc89cba5701d98373435' + '0181986547b7c70bf2bc8de31198240f99a92e4cfdb1db81c7b99b849c416c1f' + '9e692f956dffa5c936a2911d8418746b19197962111b4f0f45b33972ed3890f2' + '1d5e09034c9c903653d10c3983e4dcb710ebe8f08694e5e55199a3e4acb8f629' + '5379cea6fd54a16e7f67b617bf3582c08f8934ae8d699e85ad21f20dcf192424' + '82d1db9d4536350fe2549c400487018a8477a15da83a568240a013a6d82dfe92' + '01413344603a8e99f7b0280e7f297de4ea415e0c5011b1dac116eaf25082220b' + '4f88801a586c35515fd982f8e465fb4546ef38765c6a2abe1e8ca69e3700d799' + 'b4dad74bbe2731aaa8711408fe509344e7e6049def897389f7e2a86423f3377e' + '17f251d456713c920c6581659c54b9c372e1a329081b2ed9d9826e9e0ddd317a') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -219,7 +219,7 @@ build() { #export LDFLAGS="-L$PWD/lib" msg2 'Build qmake and configure' && ../${_pkgfqn}/configure $qt_configure_args - msg2 'Build Qt libraries' && make + msg2 'Build Qt libraries' && make -j$(nproc) popd done @@ -228,7 +228,7 @@ build() { package() { for _arch in ${_architectures}; do cd "$srcdir/${_pkgfqn}" - make install -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" + make install -j$(nproc) -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE pushd "$srcdir/build-${_arch}/lib" diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt index cc2ecb636e3a..2bf4062ff4af 100644 --- a/qtbase-sha256.txt +++ b/qtbase-sha256.txt @@ -1 +1 @@ -SKIP +06e49a14145574834d4d04f73e6baf662ee5e72e78973e1d7d0fe614472a80a4 |