aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2023-06-14 10:48:10 +0200
committerMartchus2023-06-14 10:48:10 +0200
commit23276b5cd5d898b09710e1fede1cab6bf7bc84d0 (patch)
tree0b4c6c685edba90610db9c97520cc9faf1bbc85d
parent93e1334367f9089ccc3968490fcd730f44414a71 (diff)
downloadaur-23276b5cd5d898b09710e1fede1cab6bf7bc84d0.tar.gz
Update to 5.15.10
-rw-r--r--.SRCINFO68
-rw-r--r--0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch4
-rw-r--r--0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch4
-rw-r--r--0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch4
-rw-r--r--0004-Make-sure-.pc-files-are-installed-correctly.patch4
-rw-r--r--0005-Don-t-add-resource-files-to-LIBS-parameter.patch4
-rw-r--r--0006-Prevent-debug-library-names-in-pkg-config-files.patch4
-rw-r--r--0007-Fix-linking-against-shared-static-libpng.patch4
-rw-r--r--0008-Fix-linking-against-static-D-Bus.patch6
-rw-r--r--0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch6
-rw-r--r--0010-Fix-linking-against-static-freetype2.patch4
-rw-r--r--0011-Fix-linking-against-static-harfbuzz.patch4
-rw-r--r--0012-Fix-linking-against-static-pcre.patch4
-rw-r--r--0013-Fix-linking-against-shared-static-MariaDB.patch4
-rw-r--r--0014-Fix-linking-against-shared-static-PostgreSQL.patch4
-rw-r--r--0015-Rename-qtmain-to-qt5main.patch4
-rw-r--r--0016-Enable-rpath-for-build-tools.patch4
-rw-r--r--0017-Use-system-zlib-for-build-tools.patch4
-rw-r--r--0018-Merge-shared-and-static-library-trees.patch12
-rw-r--r--0019-Use-.dll.a-as-import-lib-extension.patch4
-rw-r--r--0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch8
-rw-r--r--0021-Allow-usage-of-static-version-with-CMake.patch4
-rw-r--r--0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch4
-rw-r--r--0023-Use-correct-pkg-config-static-flag.patch8
-rw-r--r--0024-Fix-macro-invoking-moc-rcc-and-uic.patch4
-rw-r--r--0025-Ignore-errors-about-missing-feature-static.patch4
-rw-r--r--0026-Enable-and-fix-use-of-iconv.patch4
-rw-r--r--0027-Ignore-failing-pkg-config-test.patch8
-rw-r--r--0028-Prevent-qmake-from-messing-static-lib-dependencies.patch4
-rw-r--r--0029-Hardcode-linker-flags-for-platform-plugins.patch4
-rw-r--r--0030-Fix-linking-against-static-plugins-with-qmake.patch4
-rw-r--r--0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch4
-rw-r--r--0032-Fix-crashes-in-rasterization-code-using-setjmp.patch4
-rw-r--r--PKGBUILD68
34 files changed, 144 insertions, 144 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6068b25b6df4..1e719aaadd06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-base-static
pkgdesc = A cross-platform application and UI framework, native OpenGL backend (mingw-w64)
- pkgver = 5.15.9+kde+r150
+ pkgver = 5.15.10+kde+r129
pkgrel = 1
url = https://www.qt.io/
arch = any
@@ -34,7 +34,7 @@ pkgbase = mingw-w64-qt5-base-static
options = !buildflags
options = staticlibs
options = !emptydirs
- source = git+https://invent.kde.org/qt/qt/qtbase#commit=d3b21bc8b70eaa1af848371dc1d34c4617c1f73c
+ source = git+https://invent.kde.org/qt/qt/qtbase#commit=e8d9e68d25f4bf305f8b3ca5d678594ee4681baa
source = 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
source = 0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -68,37 +68,37 @@ pkgbase = mingw-w64-qt5-base-static
source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
source = 0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
sha256sums = SKIP
- sha256sums = e3d31c0fa945b7f4aaf52216ea9d9a546592faf2920a4311b4551cb6e3998ebb
- sha256sums = 50bfadae6febcd0354ba058d60a97830d17184e3521ab29d81ef8a8906af509e
- sha256sums = c27b36ae6f1e8ccdec4582887c5c6b2935c07cdee898ace2bf3f2f48fddb10e1
- sha256sums = 0d5eda7272e4e7aada9fe05a7d2f4b9d83c1c208931a25d51d207cd7f6000b27
- sha256sums = 58e46ed1aa3f53768070ba668eaf0bd482cdce81ed42bfd020dd1567bca2e96b
- sha256sums = e14d4e10a46d065d22ab923a4a743d17692d219064469130258e144944059f48
- sha256sums = 4f95937fef0c8cfb233a879ad336bfbdf592e111078b18d77e62e61e8ee145c6
- sha256sums = 76a34de588ff16f0bada68dffbb6532a7988a30ca78181d5f487dd7adc4450a3
- sha256sums = 7a67391c8923f3322d1b4932865334cfd581db1ff5b061accbd6dad2ae6628ad
- sha256sums = 4fea6993a009c79150362b000b1881e2a7b4a421ab20d1d79eabc01508a6ded5
- sha256sums = cc25f5191046825cb7b54fc83739ed5443bbfd060b5530d73f63d816f4998968
- sha256sums = 46213add8069810b0397a9b99b4ca654b384829adc561831a2003bd85e482066
- sha256sums = 69412355a54927761f957cc6defdfcb291eac1893fdc4ff39b56868ea44d9704
- sha256sums = d8ee421c868cc86e1a286162b13a75501b177d254a03a2101351d0e3f1843b52
- sha256sums = 5295136bb5d3ff647653b3f91eb5b6f328a050f25df81ff59b9c2876a9db2911
- sha256sums = 5116a0f0acac3e63b1c8f70108879e1cf326084b1295a395f4eb3e7554a20828
- sha256sums = 558b8fe1c9893249c6d71ef5a4d1fe4a847dc05e4e8d11297591b0d701d57d55
- sha256sums = f3bfdf636da598fabfb8ef9a41c9d3ba6dd487c14bf9eb01ae23a25f3d8324c6
- sha256sums = 21e8e8e8304ecf575c08f32f8b53a738c3b75f20a2113db583057f62475e1703
- sha256sums = 7d226148335497fba9f19e497dec2e65c2d882bd958dbe1c7309c6fe0c9e1d4f
- sha256sums = 20b5805e97743492cfaa9c1d6fc502e15e2887f07f31fe80069c7fb864f3b84f
- sha256sums = b71bce63d118de43ae486bb0c02a4f618d3c2edfbefc13185e821ce601029311
- sha256sums = dcd3ff314e8fdb0204dc95e2debf98bfd64e3532835f98824a3f0f5a915015d2
- sha256sums = 1922ea83667a387b8a23564f1da721f9da827bde5da009d0938549f0301f8f0c
- sha256sums = 62000eb6f623cf3e50912bbbdb55c0ee209c3f9a693570ad1e2131eb135e50b2
- sha256sums = 9315034272921450841798c536e560481791cbd8daf5c19134200775e3f9a0e4
- sha256sums = 0c476a0ee71ce50b9f4029b0ddb3c33bea03468fe3da44fa2e7615f55806a431
- sha256sums = 247c17bbf8c2bccd0559e4974d5f05621eca8933d9e3d597b451a7ea54d12fc2
- sha256sums = 00c81c93780321fdc9d7584bc2b860e8943f261faf296b59b159e15aa7ce945f
- sha256sums = 8bfe3564e98fe2bb078ec612f7b2504497b0d068e26ac6f4ebe22f49c4da708c
- sha256sums = f00340c6bf0e1a7fdcce97bf2ef49e333fb961d0d59c16dcd7005d8824acaa65
- sha256sums = 9d500a58350ee3c565eacc59b456a7a9ca0f1867d4611a7eccd74a0bc19a8762
+ sha256sums = 5575a2851d3b14b0cf64541c6094049f539559f3258a82163e447c742eb63ad5
+ sha256sums = 25d6cda0799d3c1bb37d0a8e04842918aa01fa35af62750099b65824d002c5bf
+ sha256sums = e7c22b2c51429cad62ac0e799f44f852c71833f2f863e6436737efd24ee3afb3
+ sha256sums = 4a0e39c118a7557254df4ebd76541752aa93c039df1bef09a93cee507756781b
+ sha256sums = c554e4dcc782a16074345153c699c6580c5dc6e5bd5f419b38b3c0f50c5dd660
+ sha256sums = eb27e5598c4a234de18a35d3cd4f8e3176acdef28d73d7eee2f3b9ac1b543a73
+ sha256sums = 70be0fc5267af9a88abc0e9d0dfb6c361954f075c51a3ae88db5ad47673d9e07
+ sha256sums = 3a78fa01d71569952acea141eee92b69c05e33b9222f9526eda5e1050071290f
+ sha256sums = b7dd6d5039c8bbe185191934113446dd93bbf31c5e37b1014854f345ff537d4d
+ sha256sums = f1c3ab01d71dacfe223233ca94d0ca6c402869987e735887e54617d0e0b94c26
+ sha256sums = a949f72ccfd9be7796b2f6504089c932539a25a0c3695659819c5d5e6cbbc7e2
+ sha256sums = 49d3b8e852d42e8b817864ba27e68b2dda6d8e1523843355a4284ac52a844f02
+ sha256sums = d13271708d94fd0daad5d5c6f01c52f393ee723ee9af4231dc2b50ce9c650b35
+ sha256sums = 3558735297a33ae56796f82a5b655ad5b0eeb097e0f5caad88751de47e7c7eca
+ sha256sums = dfbea1bde61b92d4dc7ab7d8253a60dd8af4e3bb655b52ba398ec53c95ffa56e
+ sha256sums = 4bf7efe320d267f1a2b4836cfcd5ed0be41660fbbcde3c9d79737e913a824d4d
+ sha256sums = cb0aa04799c7ba97e22639f6d3002001f3d63a458b334c1a0a8621daf9763ec2
+ sha256sums = cc33e6907b254c9f304f2adf4baf9a40f1d04551988a403e4ff922b8298ce24c
+ sha256sums = 1726007c8b0ce3765cd1eda15a2ebe0e66687de4e674ac1ed688de6498ae88a7
+ sha256sums = 4cf9137b1eab21d0eb3f690e821134e2041dd772313a8cb8081cabf2e611baba
+ sha256sums = e7c046cfeaa424ba7e45b3ac598a31bf06c4900e417db3f47bdf0feb25f6c634
+ sha256sums = b37f0b55608847e8ad7e551b9b3e1c541ec3cfeb784060af81af65f9d51ea0fa
+ sha256sums = a4dd3a9dc9aaa6758a1b6e970b6b097624fe92f4b034ee4f0e3d2f2ac4f3ec34
+ sha256sums = 0b8baecbae0bad0d9496d522537bac32c6d4914a4c5fb75b82254cfecbf905b0
+ sha256sums = 1ae5b15ac4307d319635d24c6227dad58684462b6337f0f5b3e09b898b492010
+ sha256sums = 061231bae7cf862f84849f7a176421579141b2dd0080cb12f5b57c9c074b93a7
+ sha256sums = f34020441b50baeecb7f2a761d5c70bf22ece4818aff31dc96481ade7b5f0e57
+ sha256sums = 06ad3bd34589418d8b9bf1bc96731585f339b3078e2d5b0106f9fbb5d45eeb44
+ sha256sums = af0336853112a291ae85cb8a1e5e40ee43cb23ec1a6d1683610f5e6a36346550
+ sha256sums = 7d953e963bdf0595c17712991fe0d71b128c06e4f8e00d9eb0657b2e9d44b121
+ sha256sums = 2334c6b78f97ac2636f66b96b380cee137c8da08fa451f97b274f64c29fd8f38
+ sha256sums = e0daf561153e0758467fd902d69c30c1a6449580cc13e378c498bd35e8589394
pkgname = mingw-w64-qt5-base-static
diff --git a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
index 8ae9c6db1242..6d8cb814056b 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 a660177b2e277a3aea143b8ee4f982ac4bd1ffb7 Mon Sep 17 00:00:00 2001
+From 4b44fc8d6eb08a8d650fa7f9a0ad8d2daee8c8e1 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
@@ -162,5 +162,5 @@ index 5de482f23b..3c3d22c699 100644
QMAKE_LINK = $${CROSS_COMPILE}g++
--
-2.40.0
+2.41.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 a003365718ea..2dbf989123eb 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 ccf3b04fe58d2f44489431cf00258dddd2939527 Mon Sep 17 00:00:00 2001
+From a386f2ffcf46ed410bc1b780c08761b71c3c99ca 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
@@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
-2.40.0
+2.41.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 545ca2012b3b..f3b14be154ea 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 aa0ea41ee835b90ff949346c0b974bce7d2c2c62 Mon Sep 17 00:00:00 2001
+From 511c391c08975f57d70995cde493894c50024ac5 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
@@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
-2.40.0
+2.41.0
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch
index 88db18fe327f..a6740708c038 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 0798956e9381b89f28cf3778886c3a7cbccc972d Mon Sep 17 00:00:00 2001
+From 4dcb5b8f76d0d5c8f11277c0fcba0b4544624b32 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
@@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
-2.40.0
+2.41.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 b6d7fe780262..ea90e978d785 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 406d93abc062cc8e2c295b833eaaf57fbb2a71ac Mon Sep 17 00:00:00 2001
+From 511dc70a41721926177d5429b928dae0d9766f70 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
@@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
-2.40.0
+2.41.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 aa04921d2321..d8a341212e1b 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 d313c824bf09b035935805a220c55e6a51b650ed Mon Sep 17 00:00:00 2001
+From 9c387ee325280dc9f634876c54d0295ad9038efb 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
@@ -29,5 +29,5 @@ index fc996663d8..23ac736fc0 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.40.0
+2.41.0
diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch
index e0089f0de9a2..c1521317b094 100644
--- a/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/0007-Fix-linking-against-shared-static-libpng.patch
@@ -1,4 +1,4 @@
-From b819cc1c634dd3fee16aa0215cfe6aa35a998bc8 Mon Sep 17 00:00:00 2001
+From f5ffb39a0a52f163591a995274845fac82ae8517 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
@@ -26,5 +26,5 @@ index 12c95742d2..e0043542ec 100644
],
"use": [
--
-2.40.0
+2.41.0
diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch
index 463dfed86561..bd47d9ec0674 100644
--- a/0008-Fix-linking-against-static-D-Bus.patch
+++ b/0008-Fix-linking-against-static-D-Bus.patch
@@ -1,4 +1,4 @@
-From 6e4517111e42f61a2398e2bdc68a548e37cc6ada Mon Sep 17 00:00:00 2001
+From a58a8c47e247696eb9061c949ad1567de5307afd 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 f0b5fed415..2807c53488 100644
+index 4763ff645f..e97969ab25 100644
--- a/configure.json
+++ b/configure.json
@@ -190,18 +190,23 @@
@@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
-2.40.0
+2.41.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 b01382899c6d..32ccc9f0ecfb 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 a3e510b5af9be96230abac41b05fff1a7f2f4e9e Mon Sep 17 00:00:00 2001
+From 236c7ca8f3706821e3ca98dbc2a2a8bb21776c32 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 2807c53488..85e5a56d75 100644
+index e97969ab25..b75f8a8033 100644
--- a/configure.json
+++ b/configure.json
@@ -203,7 +203,7 @@
@@ -25,5 +25,5 @@ index 2807c53488..85e5a56d75 100644
},
"condition": "config.win32 && features.shared"
--
-2.40.0
+2.41.0
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
index a8d318209e2f..7884d79a43d0 100644
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ b/0010-Fix-linking-against-static-freetype2.patch
@@ -1,4 +1,4 @@
-From 98139042f3b5ae4a0f7c780668750544b9cb52d4 Mon Sep 17 00:00:00 2001
+From ec2bf09c0ebb132f09650e68d042545923ea8777 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
@@ -26,5 +26,5 @@ index e0043542ec..3f77f67a07 100644
{ "libs": "-lfreetype" }
],
--
-2.40.0
+2.41.0
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch
index 04398718d08b..c4a8f9341a24 100644
--- a/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/0011-Fix-linking-against-static-harfbuzz.patch
@@ -1,4 +1,4 @@
-From c73560ae1ff08b9303319d195e71a89b8a41336d Mon Sep 17 00:00:00 2001
+From cff1619ac4e1e7f190357dc5b6f9a569c9e22914 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
@@ -25,5 +25,5 @@ index 3f77f67a07..f6da787b13 100644
},
"imf": {
--
-2.40.0
+2.41.0
diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch
index 1fd11b741cb5..d63ef7d7b1db 100644
--- a/0012-Fix-linking-against-static-pcre.patch
+++ b/0012-Fix-linking-against-static-pcre.patch
@@ -1,4 +1,4 @@
-From fc3bd33b823594adf0fda3e1b638fe165f277f32 Mon Sep 17 00:00:00 2001
+From 8b62c9e283b295574bab6dfb09f6a21a62310fc6 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
@@ -24,5 +24,5 @@ index 1f10150435..6a97b47773 100644
#include <pcre2.h>
--
-2.40.0
+2.41.0
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch
index 119498fe3cd4..00ed9eafb998 100644
--- a/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0013-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,4 +1,4 @@
-From b277e78f1d6432a4106fddc4abb1b388e4b7be93 Mon Sep 17 00:00:00 2001
+From 1bed841db4ffc9375f0688a0ceb1597844d9ed02 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
@@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
-2.40.0
+2.41.0
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
index 4ab3a773faff..097010edc33b 100644
--- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,4 +1,4 @@
-From b541279015e73b3721b56801255e2f5c8e2dcb40 Mon Sep 17 00:00:00 2001
+From 6465bbecacd50596f4eef4f2846ae5f3105348d2 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
@@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644
]
},
--
-2.40.0
+2.41.0
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index e6d7ea2c1de8..b98ce0ed9d1b 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,4 +1,4 @@
-From 848a398477d6201602e7cc68ab8d2f25af53774c Mon Sep 17 00:00:00 2001
+From 4004f593210513e2283c866c179389d565825ed3 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
@@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
CONFIG += static
--
-2.40.0
+2.41.0
diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch
index 731fb119236a..78ecbdc3ba4b 100644
--- a/0016-Enable-rpath-for-build-tools.patch
+++ b/0016-Enable-rpath-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 5d25765ffe01b2ddff784544ef04aac743549135 Mon Sep 17 00:00:00 2001
+From 37aa04c1e28bef2c8b92019a636d17c3b32e001f 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
@@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
INSTALLS += target
--
-2.40.0
+2.41.0
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch
index 6cff6b4eba61..be974feb9ec8 100644
--- a/0017-Use-system-zlib-for-build-tools.patch
+++ b/0017-Use-system-zlib-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 8a112b1231af97b01d8289af8185dbc486fdf6f7 Mon Sep 17 00:00:00 2001
+From d9d5f9908c72e4b8fb3f4a73129d9cd1b1bd3ca7 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
@@ -23,5 +23,5 @@ index 24862a07db..698e6cfb95 100644
} else {
CONFIG += no_core_dep
--
-2.40.0
+2.41.0
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch
index 5e0c4d702289..d2f49e439d49 100644
--- a/0018-Merge-shared-and-static-library-trees.patch
+++ b/0018-Merge-shared-and-static-library-trees.patch
@@ -1,4 +1,4 @@
-From 44db16c1f264182bfaa913240fdbd6713687e538 Mon Sep 17 00:00:00 2001
+From bf9698f5703d4d6d6da8a627766054e7e682f3ae 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,10 +17,10 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d
7 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/configure.pri b/configure.pri
-index 63d6b3f278..eda4a35013 100644
+index 365a16403e..85acb3757a 100644
--- a/configure.pri
+++ b/configure.pri
-@@ -659,7 +659,12 @@ defineTest(qtConfOutput_machineTuple) {
+@@ -668,7 +668,12 @@ defineTest(qtConfOutput_machineTuple) {
defineTest(qtConfOutput_commitOptions) {
# qdevice.pri needs to be written early, because the compile tests require it.
@@ -34,7 +34,7 @@ index 63d6b3f278..eda4a35013 100644
}
# Output is written after configuring each Qt module,
-@@ -1421,3 +1426,12 @@ defineTest(createConfigStatus) {
+@@ -1430,3 +1435,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@@ -48,7 +48,7 @@ index 63d6b3f278..eda4a35013 100644
+ CONFIG += no_smart_library_merge
+}
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
-index 462dbf7774..e5f54caf5d 100644
+index ac799047ab..60b6392267 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -1,5 +1,16 @@
@@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
INSTALLS += mkspecs
--
-2.40.0
+2.41.0
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch
index c9dda04b70b9..afb552bff200 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 86117e8a850550c8686157cd0e02db446006dd73 Mon Sep 17 00:00:00 2001
+From 6f08bbee92af46e9c93fe5a364ef122885ba18c2 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
@@ -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.40.0
+2.41.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 83c1aa08fab2..189fb34812af 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 d799313888a5dd4a7dc2e9c5f499637239697822 Mon Sep 17 00:00:00 2001
+From 4ee89f7cb286a1b85f9a7834bc245529d5bb610e 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
@@ -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 2e23109167..eaf9011c3d 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 @@
@@ -473,7 +473,7 @@ index 2e23109167..eaf9011c3d 100644
- # Add this plugin if all of the following are true:
- # 1) the list of explicitly included plugin types is empty
- # 2) the QT_PLUGIN_EXTENDS property for the plugin is empty or equal to one of the modules
-- # listed in the plugin's PLUGIN_EXTEND qmake variable
+- # listed in the plugin\'s PLUGIN_EXTEND qmake variable
- # 3) the user hasn\'t explicitly excluded the plugin.
- # TODO: Note that the current implementation of (2) is not entirely correct QTBUG-93501
- \"$<AND:\"
@@ -499,5 +499,5 @@ index 2e23109167..eaf9011c3d 100644
set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\")
+endif()
--
-2.40.0
+2.41.0
diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch
index 9d8752a9416d..d92d2a13f476 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 be3fd100c97616bd3360971c4d265753f4887ab4 Mon Sep 17 00:00:00 2001
+From 49e14061fa7b828779878fcde4e70b0b031086fd 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
@@ -1089,5 +1089,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
-2.40.0
+2.41.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 8e2317724faa..3bed788a96d0 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 123efd02bdd3d238ef21e172c88a6346ddb747e5 Mon Sep 17 00:00:00 2001
+From 93129b13c5864f10b3f8fd135dc91ee91b2daa4f 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
@@ -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.40.0
+2.41.0
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index 5026353ca5b7..c88d5760288d 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From 0998fbc7835b6f6b63d4d45dc97f21f3ca045de1 Mon Sep 17 00:00:00 2001
+From f55ebd797d5e32793a6792e7af9fff7f5fb0bfe0 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,10 +8,10 @@ Subject: [PATCH 23/32] Use correct pkg-config --static flag
1 file changed, 3 insertions(+)
diff --git a/configure.pri b/configure.pri
-index eda4a35013..6dbb1f4d1d 100644
+index 85acb3757a..0a4db10dfc 100644
--- a/configure.pri
+++ b/configure.pri
-@@ -351,6 +351,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -360,6 +360,9 @@ defineTest(qtConfTest_detectPkgConfig) {
qtLog("Found pkg-config from path: $$pkgConfig")
}
}
@@ -22,5 +22,5 @@ index eda4a35013..6dbb1f4d1d 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
-2.40.0
+2.41.0
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
index c5aa021cc762..e034a7e2ad91 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 b5f865b76d137ae1576515e0ce35e4b8ff53b52e Mon Sep 17 00:00:00 2001
+From c67b271876e27226cb9b3b05e641097cb3812a7a 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
@@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
-2.40.0
+2.41.0
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index 39c8d34cf614..d7d2b97eaf26 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From 5ebfc5e8ed25064db27e9a77e4b7ac35a6630ab4 Mon Sep 17 00:00:00 2001
+From 4af504e31a8053f8255592b300590de57d67939d 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
@@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
-2.40.0
+2.41.0
diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch
index 50bcb64d04a9..f93a39933570 100644
--- a/0026-Enable-and-fix-use-of-iconv.patch
+++ b/0026-Enable-and-fix-use-of-iconv.patch
@@ -1,4 +1,4 @@
-From beb5aee023c41a605e095bd2e65ac2d1305fc9db Mon Sep 17 00:00:00 2001
+From 78a3832857278ccfa3d170fa673cb4b5a4717af3 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
@@ -74,5 +74,5 @@ index a9025a2dd2..ffb6f50fbe 100644
},
"icu": {
--
-2.40.0
+2.41.0
diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch
index 307cdfa9e235..33e8e1d821c2 100644
--- a/0027-Ignore-failing-pkg-config-test.patch
+++ b/0027-Ignore-failing-pkg-config-test.patch
@@ -1,4 +1,4 @@
-From 7d47272248988ec43b000e8889b303cb099e1d2d Mon Sep 17 00:00:00 2001
+From 92f8d50f4c7dfc8654abc4b27e5fe16be70bbd93 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,10 +9,10 @@ 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 85e5a56d75..4759d9ff96 100644
+index b75f8a8033..72a963a679 100644
--- a/configure.json
+++ b/configure.json
-@@ -779,7 +779,6 @@
+@@ -793,7 +793,6 @@
"pkg-config": {
"label": "Using pkg-config",
"autoDetect": "!config.darwin && !config.win32",
@@ -21,5 +21,5 @@ index 85e5a56d75..4759d9ff96 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
-2.40.0
+2.41.0
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
index daed2134c59c..e2fac914e7c7 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 b3ea9e3b2c70d86a8315acf1a66134d38b2f1cd7 Mon Sep 17 00:00:00 2001
+From abe28499dde072fd6041c44ccd2b94cb32c609b7 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
@@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644
int libidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
--
-2.40.0
+2.41.0
diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch
index 272821410806..2be7afcb4aae 100644
--- a/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,4 +1,4 @@
-From e74bc3bd9f621b2591dafb7721ed346acb429be1 Mon Sep 17 00:00:00 2001
+From 1bb703668a845d8de0b909e9adf9655ea7075abf 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
@@ -174,5 +174,5 @@ index 50a3bb41a9..02f74650a9 100644
include(windows.pri)
--
-2.40.0
+2.41.0
diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch
index 4a1b474493bf..9ee034322a88 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 be5d87a1839b1a760da15bc432c87ce62afccf82 Mon Sep 17 00:00:00 2001
+From 84d660b4aa42d811b092b933340d29c6fc8092b5 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
@@ -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.40.0
+2.41.0
diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
index 24dc6fb509b1..b0d55ea9ffb9 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 e19e8103eea66bbb2c9887e704c7c51107f7b7c1 Mon Sep 17 00:00:00 2001
+From 78b25c64b0b8375d1f3db12d2f892ecbef2d4949 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'
@@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
for (nu, LD_USES) {
--
-2.40.0
+2.41.0
diff --git a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
index ced8a2c76290..e0b3343daab3 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 8ee3af0141327d6a982b66e663b0854616aba274 Mon Sep 17 00:00:00 2001
+From 958d0705b8a8faed9d8a07b3e1ea3949317211f9 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
@@ -244,5 +244,5 @@ index 0e87d30aa2..8566ce0048 100644
"Description": "FreeType is a freely available software library to render fonts.",
"Homepage": "http://www.freetype.org",
--
-2.40.0
+2.41.0
diff --git a/PKGBUILD b/PKGBUILD
index 0548feb52c97..eca01258c150 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,10 +17,10 @@
_qt_module=qtbase
pkgname=mingw-w64-qt5-base-static
-pkgver=5.15.9+kde+r150
+pkgver=5.15.10+kde+r129
pkgrel=1
_basever=${pkgver%%+*}
-_commit=d3b21bc8b70eaa1af848371dc1d34c4617c1f73c
+_commit=e8d9e68d25f4bf305f8b3ca5d678594ee4681baa
pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
arch=('any')
url='https://www.qt.io/'
@@ -71,38 +71,38 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
'0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch'
'0032-Fix-crashes-in-rasterization-code-using-setjmp.patch')
sha256sums=('SKIP'
- 'e3d31c0fa945b7f4aaf52216ea9d9a546592faf2920a4311b4551cb6e3998ebb'
- '50bfadae6febcd0354ba058d60a97830d17184e3521ab29d81ef8a8906af509e'
- 'c27b36ae6f1e8ccdec4582887c5c6b2935c07cdee898ace2bf3f2f48fddb10e1'
- '0d5eda7272e4e7aada9fe05a7d2f4b9d83c1c208931a25d51d207cd7f6000b27'
- '58e46ed1aa3f53768070ba668eaf0bd482cdce81ed42bfd020dd1567bca2e96b'
- 'e14d4e10a46d065d22ab923a4a743d17692d219064469130258e144944059f48'
- '4f95937fef0c8cfb233a879ad336bfbdf592e111078b18d77e62e61e8ee145c6'
- '76a34de588ff16f0bada68dffbb6532a7988a30ca78181d5f487dd7adc4450a3'
- '7a67391c8923f3322d1b4932865334cfd581db1ff5b061accbd6dad2ae6628ad'
- '4fea6993a009c79150362b000b1881e2a7b4a421ab20d1d79eabc01508a6ded5'
- 'cc25f5191046825cb7b54fc83739ed5443bbfd060b5530d73f63d816f4998968'
- '46213add8069810b0397a9b99b4ca654b384829adc561831a2003bd85e482066'
- '69412355a54927761f957cc6defdfcb291eac1893fdc4ff39b56868ea44d9704'
- 'd8ee421c868cc86e1a286162b13a75501b177d254a03a2101351d0e3f1843b52'
- '5295136bb5d3ff647653b3f91eb5b6f328a050f25df81ff59b9c2876a9db2911'
- '5116a0f0acac3e63b1c8f70108879e1cf326084b1295a395f4eb3e7554a20828'
- '558b8fe1c9893249c6d71ef5a4d1fe4a847dc05e4e8d11297591b0d701d57d55'
- 'f3bfdf636da598fabfb8ef9a41c9d3ba6dd487c14bf9eb01ae23a25f3d8324c6'
- '21e8e8e8304ecf575c08f32f8b53a738c3b75f20a2113db583057f62475e1703'
- '7d226148335497fba9f19e497dec2e65c2d882bd958dbe1c7309c6fe0c9e1d4f'
- '20b5805e97743492cfaa9c1d6fc502e15e2887f07f31fe80069c7fb864f3b84f'
- 'b71bce63d118de43ae486bb0c02a4f618d3c2edfbefc13185e821ce601029311'
- 'dcd3ff314e8fdb0204dc95e2debf98bfd64e3532835f98824a3f0f5a915015d2'
- '1922ea83667a387b8a23564f1da721f9da827bde5da009d0938549f0301f8f0c'
- '62000eb6f623cf3e50912bbbdb55c0ee209c3f9a693570ad1e2131eb135e50b2'
- '9315034272921450841798c536e560481791cbd8daf5c19134200775e3f9a0e4'
- '0c476a0ee71ce50b9f4029b0ddb3c33bea03468fe3da44fa2e7615f55806a431'
- '247c17bbf8c2bccd0559e4974d5f05621eca8933d9e3d597b451a7ea54d12fc2'
- '00c81c93780321fdc9d7584bc2b860e8943f261faf296b59b159e15aa7ce945f'
- '8bfe3564e98fe2bb078ec612f7b2504497b0d068e26ac6f4ebe22f49c4da708c'
- 'f00340c6bf0e1a7fdcce97bf2ef49e333fb961d0d59c16dcd7005d8824acaa65'
- '9d500a58350ee3c565eacc59b456a7a9ca0f1867d4611a7eccd74a0bc19a8762')
+ '5575a2851d3b14b0cf64541c6094049f539559f3258a82163e447c742eb63ad5'
+ '25d6cda0799d3c1bb37d0a8e04842918aa01fa35af62750099b65824d002c5bf'
+ 'e7c22b2c51429cad62ac0e799f44f852c71833f2f863e6436737efd24ee3afb3'
+ '4a0e39c118a7557254df4ebd76541752aa93c039df1bef09a93cee507756781b'
+ 'c554e4dcc782a16074345153c699c6580c5dc6e5bd5f419b38b3c0f50c5dd660'
+ 'eb27e5598c4a234de18a35d3cd4f8e3176acdef28d73d7eee2f3b9ac1b543a73'
+ '70be0fc5267af9a88abc0e9d0dfb6c361954f075c51a3ae88db5ad47673d9e07'
+ '3a78fa01d71569952acea141eee92b69c05e33b9222f9526eda5e1050071290f'
+ 'b7dd6d5039c8bbe185191934113446dd93bbf31c5e37b1014854f345ff537d4d'
+ 'f1c3ab01d71dacfe223233ca94d0ca6c402869987e735887e54617d0e0b94c26'
+ 'a949f72ccfd9be7796b2f6504089c932539a25a0c3695659819c5d5e6cbbc7e2'
+ '49d3b8e852d42e8b817864ba27e68b2dda6d8e1523843355a4284ac52a844f02'
+ 'd13271708d94fd0daad5d5c6f01c52f393ee723ee9af4231dc2b50ce9c650b35'
+ '3558735297a33ae56796f82a5b655ad5b0eeb097e0f5caad88751de47e7c7eca'
+ 'dfbea1bde61b92d4dc7ab7d8253a60dd8af4e3bb655b52ba398ec53c95ffa56e'
+ '4bf7efe320d267f1a2b4836cfcd5ed0be41660fbbcde3c9d79737e913a824d4d'
+ 'cb0aa04799c7ba97e22639f6d3002001f3d63a458b334c1a0a8621daf9763ec2'
+ 'cc33e6907b254c9f304f2adf4baf9a40f1d04551988a403e4ff922b8298ce24c'
+ '1726007c8b0ce3765cd1eda15a2ebe0e66687de4e674ac1ed688de6498ae88a7'
+ '4cf9137b1eab21d0eb3f690e821134e2041dd772313a8cb8081cabf2e611baba'
+ 'e7c046cfeaa424ba7e45b3ac598a31bf06c4900e417db3f47bdf0feb25f6c634'
+ 'b37f0b55608847e8ad7e551b9b3e1c541ec3cfeb784060af81af65f9d51ea0fa'
+ 'a4dd3a9dc9aaa6758a1b6e970b6b097624fe92f4b034ee4f0e3d2f2ac4f3ec34'
+ '0b8baecbae0bad0d9496d522537bac32c6d4914a4c5fb75b82254cfecbf905b0'
+ '1ae5b15ac4307d319635d24c6227dad58684462b6337f0f5b3e09b898b492010'
+ '061231bae7cf862f84849f7a176421579141b2dd0080cb12f5b57c9c074b93a7'
+ 'f34020441b50baeecb7f2a761d5c70bf22ece4818aff31dc96481ade7b5f0e57'
+ '06ad3bd34589418d8b9bf1bc96731585f339b3078e2d5b0106f9fbb5d45eeb44'
+ 'af0336853112a291ae85cb8a1e5e40ee43cb23ec1a6d1683610f5e6a36346550'
+ '7d953e963bdf0595c17712991fe0d71b128c06e4f8e00d9eb0657b2e9d44b121'
+ '2334c6b78f97ac2636f66b96b380cee137c8da08fa451f97b274f64c29fd8f38'
+ 'e0daf561153e0758467fd902d69c30c1a6449580cc13e378c498bd35e8589394')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'