summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2021-06-27 22:14:41 +0200
committerMartchus2021-06-27 22:14:41 +0200
commit55828bd8b57f87e26741a0426545ac76284017d0 (patch)
tree672fb692d88516fd478740ca5b7de55d48379b07
parent53cdc37ebafa8790f08f0316c15b57fcf80670ec (diff)
downloadaur-55828bd8b57f87e26741a0426545ac76284017d0.tar.gz
Fix crashes in rasterizer
-rw-r--r--.SRCINFO70
-rw-r--r--0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch6
-rw-r--r--0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch6
-rw-r--r--0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch6
-rw-r--r--0004-Make-sure-.pc-files-are-installed-correctly.patch6
-rw-r--r--0005-Don-t-add-resource-files-to-LIBS-parameter.patch6
-rw-r--r--0006-Prevent-debug-library-names-in-pkg-config-files.patch6
-rw-r--r--0007-Fix-linking-against-shared-static-libpng.patch6
-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.patch6
-rw-r--r--0011-Fix-linking-against-static-harfbuzz.patch6
-rw-r--r--0012-Fix-linking-against-static-pcre.patch6
-rw-r--r--0013-Fix-linking-against-shared-static-MariaDB.patch6
-rw-r--r--0014-Fix-linking-against-shared-static-PostgreSQL.patch6
-rw-r--r--0015-Rename-qtmain-to-qt5main.patch6
-rw-r--r--0016-Enable-rpath-for-build-tools.patch6
-rw-r--r--0017-Use-system-zlib-for-build-tools.patch6
-rw-r--r--0018-Merge-shared-and-static-library-trees.patch6
-rw-r--r--0019-Use-.dll.a-as-import-lib-extension.patch6
-rw-r--r--0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch6
-rw-r--r--0021-Allow-usage-of-static-version-with-CMake.patch6
-rw-r--r--0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch6
-rw-r--r--0023-Use-correct-pkg-config-static-flag.patch6
-rw-r--r--0024-Fix-macro-invoking-moc-rcc-and-uic.patch6
-rw-r--r--0025-Ignore-errors-about-missing-feature-static.patch6
-rw-r--r--0026-Enable-and-fix-use-of-iconv.patch6
-rw-r--r--0027-Ignore-failing-pkg-config-test.patch6
-rw-r--r--0028-Prevent-qmake-from-messing-static-lib-dependencies.patch6
-rw-r--r--0029-Hardcode-linker-flags-for-platform-plugins.patch6
-rw-r--r--0030-Fix-linking-against-static-plugins-with-qmake.patch6
-rw-r--r--0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch6
-rw-r--r--0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch6
-rw-r--r--0033-Fix-crashes-in-rasterization-code-using-setjmp.patch248
-rw-r--r--PKGBUILD72
35 files changed, 417 insertions, 165 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 206942b7315..9989ffe27cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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.2+kde+r196
+ pkgver = 5.15.2+kde+r203
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=2a2f3cd61f59ccec0eecb09e4a8795d7322edfcb
+ source = git+https://invent.kde.org/qt/qt/qtbase#commit=d23de39db3b84c8c9a80da36d8d0de8da4321566
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,40 @@ 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-Add-missing-include-limits-in-QOffsetStringArray-hea.patch
+ source = 0033-Fix-crashes-in-rasterization-code-using-setjmp.patch
sha256sums = SKIP
- sha256sums = 065c8fdb0b2f70264085b2059713ec2045ac45aac680b8f073d88c39edeb4e69
- sha256sums = 63183545568e036190c1e18b3197f64e4d407eb3244ed6c1778e845ab1c74c0a
- sha256sums = 6f0f8605b251df99adc45668a825bd463c8459b29fb279cc9ebd36e2af256e6c
- sha256sums = 1ed4ba57d4e1393cdb3e7e38cee9c3fafe5f8e67070c5bc057c949491797c62b
- sha256sums = bc941a7891bc4396179f7b5c0a9806610b0e20ae9e01f79561ddd4b313a9a90d
- sha256sums = 15492f5f479ae53cd819805c18e20c11d4f0231c16c3db44ecd751129d987e81
- sha256sums = b3a9d29d4068b83e5b47d56d02179784ea752edbfa60cebd4da0879a0a375530
- sha256sums = ede3f1822f552353208d928ab4616bf00adc398e13a6c893e58062b1aeb313ed
- sha256sums = 9105bdcf2802c524d766b2c0f54c76c766ccc3f87c2b1293a592bc70177a5439
- sha256sums = 203499a407f81c08fb38f6bd7d6bfba2f413e27c43808376a718049ab25e13d8
- sha256sums = 484c90579c250cae826ad9dbc71862f4f774634a07465cc41e05bd28138382c1
- sha256sums = 08bfefd5116c0fc87b46fe3d4b11fb3f1c3263dcbca565b0f7c29e57c974b3d5
- sha256sums = a13c6c01caf2f3135495023590a2ed8505ca5c616e588b15c7a9a82d7b8678af
- sha256sums = 66e58b40d7c4dfdf0ea897cd63c72a9a6bac12af93c33268477500fafacd5f07
- sha256sums = 8b44e4f820c0a0728cc7c4f1167224f3d95b02a49f968c2947f9942c8b84c873
- sha256sums = 7623991f9cb71c1c1b9c08bb7e2734826cb133c72ba2d07a4ca718b7b0d7bb03
- sha256sums = fe07fea05d61b6c9263370874ba7fb46153982c74aafa89288098ce07b6e0a36
- sha256sums = a29334543322bef8fc755ae1462f3a1c792bbf9a693b45acaa1254d0942c3336
- sha256sums = ed24d868094e854529e5237c66d339550ce584ad21031c671c57cd831f5a6e5b
- sha256sums = 7dff27c29399e2e708c6bcd539442cba87eb212017efe4f48287d65d0ff1e9fe
- sha256sums = 9c186a1ecc5e16af01549a5cf9228e6ec135ae28c76772a9730ea8b3caf27409
- sha256sums = 3412b4cd71a645778ca9e7c106682281f291f2ece2c5f106ee9f6e427d4e140f
- sha256sums = a8589883158e2060fae6a0f0cb352ba1f3c7d739b1ed21c022c3fcc5792ce871
- sha256sums = 17fdc20875941a3d7ee0e99c3cfeddf79ed8939e4049614809b444734053b96b
- sha256sums = df8d6552ecb8a0617d919b9483f44543b27fbcf53468c8cfb8f4bbb400f689cb
- sha256sums = 7174b00cfb20401e35133a4736ec081e1ea526b4658f2fb67d05064858cafb93
- sha256sums = 0203c09fd27a3e181e418e83f296ca7e6036d2e2f645ae3801be08f5c12006bc
- sha256sums = 399a832701ceeb4529a58533fe6152112ba97ec942afff0a0671efdd8f2438c1
- sha256sums = de4fa5b45d6cc3366014a82b167eacb867b5441478ce2f484f4d77132f3e3b80
- sha256sums = d1842d8096aaf4baf6cb9c160eb5a0d3c2ed17ce2ca91239416ab0c8f4f76ca5
- sha256sums = e884e79264f8b98c5021bdd5dbb03044f4c178e68f60449d3a37918f94d39a54
- sha256sums = bf55e0b7198807301edb1468af14e86ab9821d7209136f05e28df483e676bcf9
+ sha256sums = 8613f8d23c5440a46d4a0f9c4539381005e2818b90ea496193eed92786edb16f
+ sha256sums = 679799aa865366497d7475bab40464a5957328cc3c0e5da28a0db878c8f8573b
+ sha256sums = b56fdf550506c9d44838c5fda6652193cf592106779fb54ebe4a45ef320a6af9
+ sha256sums = 30a32bfc481ba0c314d2767cc4a064fbc07802469a641f271629cebd2ac9a761
+ sha256sums = 3144ef696efd1364a24de1badf9bb80b4101c77edb7939fb8718a903d7bf26c2
+ sha256sums = 13c2e0c1af4ef8465c7f342c7a5eff418a276de750dc7fabb5c203332ec9e64c
+ sha256sums = 369919f5b9ceb7cceafc05bd5c65e3c81c35e93a44c735ce3aba7deeb8f424ff
+ sha256sums = 46bbcc0ff97daba70cda9f2e80b56f929f3e601ad3350ae00c78c68aabed1570
+ sha256sums = 8fafbc2c0b124ab8489a99860062d96f98305b81e9dd91d32b500710ef4ed0af
+ sha256sums = 5bbce61594fd594cbef497689ffb11df5ef9fdfb1ac568b0e111c1aaf8f4c665
+ sha256sums = 97bfd341b18a0c22085ed451351a9709d536b7a93fdf4b994bd171ec5f913ca2
+ sha256sums = 0dcba5a7d147fc84cf4e2744a03c268aadbaffba0f2e2958a3fa75d4fa958f1b
+ sha256sums = a545af810eab032617aabef87dbd951c2f73019f223180c4b771e3e020dc9edb
+ sha256sums = 9f850469676a4b8ba4fc1ee6eefb321ad09a5cd1395e999cb1f765aeb774e1a4
+ sha256sums = 493bfc5d6db5199648656525780183c6f52f4afb7695b2aa22d2e96cf6d70507
+ sha256sums = ca0888582955a0ccf92b68829c8f0441aa5ece9d0bfec496c3b8d3f8c88bd5ea
+ sha256sums = da49b774077d4759bbbc5d5c2a5d1ec52b9a3c53621da996d870945d4e393b1c
+ sha256sums = 4242302b53bd487faf399d4fad193dc312e377a9583ea5ebefa5c0368bf77117
+ sha256sums = 3fed7f019a61ca0ed1df4cb9456c78e75bacf3daa75ac1ab2206d2c8cfce1199
+ sha256sums = eede73419d13d66b093e005f455a657505f6d6063b38de691c8cdb56358f3cb8
+ sha256sums = ea60c37493ec14d9048cefead9dc8dbc7acafb1dca5543b3d480b1ea84280a04
+ sha256sums = 39ce306ab1d3b264ed567f72f5c3e397c4a9d6c562741ff0df1a1d97a21cc92a
+ sha256sums = 5ae44f415817a53106ff9a9a3c64aabdb44d8f200bda302bdd51491597b83951
+ sha256sums = 1e95190e1cfc9ab7692ad796c0217144a770f3f644697939f2bcb93a0c8aa569
+ sha256sums = dec83c48a3d337d47e480e75fbb853a6f2563d0901f39cbb76b84e8c5483f069
+ sha256sums = 680854dabbfa446dc9d50c270be1eeff01faf8fc83594e0cea08f9df6602553a
+ sha256sums = fa8d9f78d4a6b329303a20d6511b4ee46722536f8621fc77721bf45185244251
+ sha256sums = 3e834ad4bc6f4e28fcb9afba31531d91e8ec962775e21014bce977b2467c5054
+ sha256sums = 0e3fb673f45ededf99c6b13c922cc8873202f4ba066b9ba05e8c47b529fe027f
+ sha256sums = 8eb6a0e9cd837263728148ed00785a4f98bc524eeb7bdd658880757eeda3250e
+ sha256sums = 2aa935715d8415686aaa812e8cea57b0e5e5391bead12219aee424d2aeef17c1
+ sha256sums = e1526e6e1ddcccbdf06de55ccc411fb1983c58abfa776fd0112545392e0e9d6e
+ sha256sums = b0a1d82dc22dc02d993224f4391ad297fdd7e992e8d2bcaabb106f28a9f243e6
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 970775b612d..9119677dbf0 100644
--- a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@@ -1,7 +1,7 @@
-From ec51b8d37aefbe2d8804c537eb68b9761eabb140 Mon Sep 17 00:00:00 2001
+From 7c9a1d941889ec1236bc664321db7b2c755d63b4 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
+Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
mingw-w64
Adding a new, separate mkspec instead of patching the existing one
@@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644
QMAKE_LINK = $${CROSS_COMPILE}g++
--
-2.31.1
+2.32.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 90fbc59c197..3f6f83f50b6 100644
--- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,7 +1,7 @@
-From 91484bad9459091e491da9dd57b32582e5f57c13 Mon Sep 17 00:00:00 2001
+From 14a16cff351d13b14bfa70f88455999fbdf17c80 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
+Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
FIXME: Not sure whether this is still required
---
@@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
-2.31.1
+2.32.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 43c0ce811bd..ff6bf1ae954 100644
--- a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -1,7 +1,7 @@
-From 691d96585274ba8f2787d11977d76bde6c589152 Mon Sep 17 00:00:00 2001
+From 130b76cebed8dcb0fcf31dae4c29a269f77d2302 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
+Subject: [PATCH 03/33] Fix too many sections assemler error in OpenGL factory
On x86_64 qopenglversionfunctionsfactory.o exceeds the
limit of 32768 sections.
@@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
-2.31.1
+2.32.0
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch
index 896813996de..236e81e40a7 100644
--- a/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,7 +1,7 @@
-From 59628a6023505f0efb5c885b5bb60c888c90a2e1 Mon Sep 17 00:00:00 2001
+From add7cd75298bc870042cf4d847668f16cf4c6af4 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
+Subject: [PATCH 04/33] Make sure *.pc files are installed correctly
---
qmake/generators/makefile.cpp | 8 ++++++--
@@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
-2.31.1
+2.32.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 3098dcfd39d..f68706296e4 100644
--- a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,7 +1,7 @@
-From 9db275e349267c021ee2ba8befcd055e4aaec578 Mon Sep 17 00:00:00 2001
+From cd00692354e0cb89f562e8677d2dfe60aaad962b 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
+Subject: [PATCH 05/33] Don't add resource files to LIBS parameter
Solves an issue where the generated pkg-config
files contained invalid Libs.private references
@@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
-2.31.1
+2.32.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 5ae14fd9e7d..69aa16c4275 100644
--- a/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,7 +1,7 @@
-From 44b203dc0d97d95dec2f9c30878308760aa8e331 Mon Sep 17 00:00:00 2001
+From 9a6e5a7076f9ae8b8a4adf250a1d256171a2e59b 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
+Subject: [PATCH 06/33] Prevent debug library names in pkg-config files
qmake generates the pkgconfig .pc files two times, once for the
release build and once for the debug build (which we're not actually
@@ -29,5 +29,5 @@ index f1e8966123..f45b6c9fd5 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.31.1
+2.32.0
diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch
index 0d951a85625..78ff57fa28b 100644
--- a/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/0007-Fix-linking-against-shared-static-libpng.patch
@@ -1,7 +1,7 @@
-From 48e1f2d109147ee04d6675125900dc124f23038c Mon Sep 17 00:00:00 2001
+From 7d65ad4667e08a597fb484885e52bcd2c80f091b 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
+Subject: [PATCH 07/33] Fix linking against shared/static libpng
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
---
@@ -26,5 +26,5 @@ index 1f08795c57..7a5fc6ce7a 100644
],
"use": [
--
-2.31.1
+2.32.0
diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch
index db61624eef9..4d0cb0509bd 100644
--- a/0008-Fix-linking-against-static-D-Bus.patch
+++ b/0008-Fix-linking-against-static-D-Bus.patch
@@ -1,7 +1,7 @@
-From 1ad5eef21682c8f9794266aec91a57191caa2c29 Mon Sep 17 00:00:00 2001
+From c6effb1b9d08d314a3628baf06400d2303100f47 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
+Subject: [PATCH 08/33] Fix linking against static D-Bus
---
configure.json | 9 +++++++--
@@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
-2.31.1
+2.32.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 2ee623bd0ff..0432ab8085f 100644
--- a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,7 +1,7 @@
-From fa07ecc0dd45f2abe9e0bb362a05e6255c725f26 Mon Sep 17 00:00:00 2001
+From 2eddcbb81c70a66086e8aa068ff14e704e6cba48 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
+Subject: [PATCH 09/33] Don't try to use debug version of D-Bus library
Required for a debug build of Qt because mingw-w64-dbus
does not contain debug version
@@ -25,5 +25,5 @@ index fedc80fa18..e308b5b7d7 100644
},
"condition": "config.win32 && features.shared"
--
-2.31.1
+2.32.0
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
index 1e076a4acc3..cec8e087375 100644
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ b/0010-Fix-linking-against-static-freetype2.patch
@@ -1,7 +1,7 @@
-From ad9fe794523b16d1d5f46b7d06b39205f90f45f1 Mon Sep 17 00:00:00 2001
+From 87bbab7f185fa14c42bd7744eaf4fa507ab8d711 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
+Subject: [PATCH 10/33] Fix linking against static freetype2
---
src/gui/configure.json | 7 +++++--
@@ -26,5 +26,5 @@ index 7a5fc6ce7a..b117f6fff6 100644
{ "libs": "-lfreetype" }
],
--
-2.31.1
+2.32.0
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch
index a895e06aa82..ac0d46c3042 100644
--- a/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/0011-Fix-linking-against-static-harfbuzz.patch
@@ -1,7 +1,7 @@
-From 690707a2fe2995667dcbaf7908cc988657b09001 Mon Sep 17 00:00:00 2001
+From a6c798da0571df897d761c9c401dfa2161b3d9a6 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
+Subject: [PATCH 11/33] Fix linking against static harfbuzz
---
src/gui/configure.json | 6 +++++-
@@ -25,5 +25,5 @@ index b117f6fff6..2a0207920a 100644
},
"imf": {
--
-2.31.1
+2.32.0
diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch
index 527777b6ad0..ed55bb2d379 100644
--- a/0012-Fix-linking-against-static-pcre.patch
+++ b/0012-Fix-linking-against-static-pcre.patch
@@ -1,7 +1,7 @@
-From 70dc4ada12bdd127abb05d9b9dd8557a56aa0a3f Mon Sep 17 00:00:00 2001
+From 9e6f97f8709f80021772435db4b7060aed302731 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
+Subject: [PATCH 12/33] Fix linking against static pcre
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
---
@@ -24,5 +24,5 @@ index d7e3cc5ee2..e17c19fbae 100644
#include <pcre2.h>
--
-2.31.1
+2.32.0
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch
index e2328913e11..23860b3be9a 100644
--- a/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0013-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,7 +1,7 @@
-From 7e019da335d13ec35337f18f5cc6826ded915e8f Mon Sep 17 00:00:00 2001
+From 8e0ec58cc815467e27eba78d1c25097629a048f8 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
+Subject: [PATCH 13/33] Fix linking against shared/static MariaDB
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
---
@@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
-2.31.1
+2.32.0
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
index bc3d21d8c96..a710d191211 100644
--- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,7 +1,7 @@
-From 5f1a0186d809ce7628600d5a02ab130ebec95e91 Mon Sep 17 00:00:00 2001
+From 272c994b5d871fe90474346b71365b7aacae2ff4 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
+Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL
---
src/plugins/sqldrivers/configure.json | 4 ++--
@@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644
]
},
--
-2.31.1
+2.32.0
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index c54e509d4ea..46618ead54b 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,7 +1,7 @@
-From 6fce8ae5b212867100ccebe32385100abce625f6 Mon Sep 17 00:00:00 2001
+From 11ba5d7b2b2cbe6e30c10de9bc1e24de32263cf8 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
+Subject: [PATCH 15/33] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
---
@@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
CONFIG += static
--
-2.31.1
+2.32.0
diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch
index a10056481f7..97b267846d9 100644
--- a/0016-Enable-rpath-for-build-tools.patch
+++ b/0016-Enable-rpath-for-build-tools.patch
@@ -1,7 +1,7 @@
-From a3215867ab7d89c3044748924d9b8cc1a6844c7e Mon Sep 17 00:00:00 2001
+From be767e4b4f50cb63a54d6584395836fa5550ca51 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
+Subject: [PATCH 16/33] Enable rpath for build tools
- Required because various tools depend on libQt5Bootstrap.so which resides
in folder /usr/${_arch}/lib
@@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
INSTALLS += target
--
-2.31.1
+2.32.0
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch
index 8d625e0a93d..fa17dd54034 100644
--- a/0017-Use-system-zlib-for-build-tools.patch
+++ b/0017-Use-system-zlib-for-build-tools.patch
@@ -1,7 +1,7 @@
-From cc57486884fe4e07c1f57bfdf3b2bd8105eaa55d Mon Sep 17 00:00:00 2001
+From 07e0162c5efd8621043e7c6fecc815080e406377 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
+Subject: [PATCH 17/33] Use system zlib for build tools
---
src/tools/bootstrap/bootstrap.pro | 4 +++-
@@ -23,5 +23,5 @@ index 24862a07db..698e6cfb95 100644
} else {
CONFIG += no_core_dep
--
-2.31.1
+2.32.0
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch
index 352718143b2..1f39599f1b9 100644
--- a/0018-Merge-shared-and-static-library-trees.patch
+++ b/0018-Merge-shared-and-static-library-trees.patch
@@ -1,7 +1,7 @@
-From 479df475c9d5c46756f40acf5d50691c2bf4d39e Mon Sep 17 00:00:00 2001
+From 1362122e2ccf7f66461ac7eb3e57f401a1520da5 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
+Subject: [PATCH 18/33] Merge shared and static library trees
Allow installation of shared and static build in the same prefix
@@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
INSTALLS += mkspecs
--
-2.31.1
+2.32.0
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch
index e762566965b..ff67981ffaa 100644
--- a/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/0019-Use-.dll.a-as-import-lib-extension.patch
@@ -1,7 +1,7 @@
-From 6b05a19f07c9e00e56d475a13b53b7b548ebf111 Mon Sep 17 00:00:00 2001
+From 3c6f9d8a92095de476ba005de6c013ed733ff525 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
+Subject: [PATCH 19/33] Use *.dll.a as import lib extension
The variables used here are provided by
g++-win32.conf
@@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
-2.31.1
+2.32.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 b07a8e2ded1..0ee60722538 100644
--- a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,7 +1,7 @@
-From 2a23c3d45db1a49409b396cd4f3bdd3ad9588865 Mon Sep 17 00:00:00 2001
+From 56674d9cda43e40fd996377f664a209cd9fa59ba 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
+Subject: [PATCH 20/33] Pull dependencies of static libraries in CMake modules
When doing a static build of Qt, the dependencies of the Qt
libraries and plugins itself must be specified when linking
@@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644
+endif()
\ No newline at end of file
--
-2.31.1
+2.32.0
diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch
index b06677618d1..dee6a9d7758 100644
--- a/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/0021-Allow-usage-of-static-version-with-CMake.patch
@@ -1,7 +1,7 @@
-From fa8dd568cd9ad7dcfaef05dddcc157bd7ee851f8 Mon Sep 17 00:00:00 2001
+From 0a3673b27f9f405f454c2721455f027b6e76ba29 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
+Subject: [PATCH 21/33] Allow usage of static version with CMake
Allow selecting between dynamic and static Qt versions
installed in the same prefix
@@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
-2.31.1
+2.32.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 dcb79a28f5d..61e99500050 100644
--- a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,7 +1,7 @@
-From 3e2ef8be011b02cbb900717ced96bcd7b0e55a93 Mon Sep 17 00:00:00 2001
+From 591ca364284f36216d94b733199c1c4ecf3875ea 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
+Subject: [PATCH 22/33] Adjust linker flags for static build with
cmake/mingw-w64
It is not clear anymore where I picked that change up and for
@@ -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.31.1
+2.32.0
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index 30e306e3b06..ae22581e43a 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,7 +1,7 @@
-From dc17b6970cd7ac7a2aa3bcf24dc175a00e0e6175 Mon Sep 17 00:00:00 2001
+From 4c84df9ca4fd869f6f2e26adabe1bfd43be61bc0 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
+Subject: [PATCH 23/33] Use correct pkg-config --static flag
---
configure.pri | 3 +++
@@ -22,5 +22,5 @@ index 53c67f885b..8934b72291 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
-2.31.1
+2.32.0
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
index 864733eb51e..4668161c5d0 100644
--- a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,7 +1,7 @@
-From 573c8958419f112afe5600bddda1d0bd4ca132d0 Mon Sep 17 00:00:00 2001
+From 2b7cabd5dfabde92be857b8a83bb1ae165ddc40b 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
+Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic
* Otherwise the arguments aren't passed correctly leading to errors like
```
@@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
-2.31.1
+2.32.0
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index 4d9c1b1c2c5..be8477800b1 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,7 +1,7 @@
-From 54f4a5bd8e239a94f4e48d2f275cadb4dc67bf6e Mon Sep 17 00:00:00 2001
+From dc3330545d086d326388abdfada6944ab40758db 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
+Subject: [PATCH 25/33] Ignore errors about missing feature static
Not sure why this error occurs, let's hope for the best
---
@@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
-2.31.1
+2.32.0
diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch
index aa97736390d..7f208dc77c3 100644
--- a/0026-Enable-and-fix-use-of-iconv.patch
+++ b/0026-Enable-and-fix-use-of-iconv.patch
@@ -1,7 +1,7 @@
-From 9d95a07aedfba071de7a556af609de1fea435100 Mon Sep 17 00:00:00 2001
+From 67d5723aa65b298750768d935fd0cf94d0897428 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
+Subject: [PATCH 26/33] Enable and fix use of iconv
Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
---
@@ -74,5 +74,5 @@ index 9b5d19d41b..f649a9f6ef 100644
},
"icu": {
--
-2.31.1
+2.32.0
diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch
index 0da64d1bddc..e6f8ed2a7c1 100644
--- a/0027-Ignore-failing-pkg-config-test.patch
+++ b/0027-Ignore-failing-pkg-config-test.patch
@@ -1,7 +1,7 @@
-From 1d9baf03ac68d2be47d6d6b94ab78a9145dd799d Mon Sep 17 00:00:00 2001
+From 4ef00b0b3619c16b44c0a9262abc07ab535b2b03 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
+Subject: [PATCH 27/33] Ignore failing pkg-config test
Didn't investigate why it fails, let's hope for the best
---
@@ -21,5 +21,5 @@ index e308b5b7d7..928ee2afa1 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
-2.31.1
+2.32.0
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 097be77619b..94790fe9b8e 100644
--- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,7 +1,7 @@
-From 42c17e98cd3c256df07996e240fd465d53c8dbbe Mon Sep 17 00:00:00 2001
+From 1d3c12ff5e8198df944cb9698edffbaab592679e 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
+Subject: [PATCH 28/33] Prevent qmake from messing static lib dependencies
In particular, it messes resolving cyclic dependency between
static freetype2 and harfbuzz
@@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644
int libidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
--
-2.31.1
+2.32.0
diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch
index b346aff58aa..8d8c53308f0 100644
--- a/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,7 +1,7 @@
-From f3f11cb89cd14f7479d457d3a8e5df069cecade1 Mon Sep 17 00:00:00 2001
+From d938c273c62dfc0c80fbd0385702475dfce16356 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
+Subject: [PATCH 29/33] Hardcode linker flags for platform plugins
Otherwise incorrect order of libs leads to errors
when building libqminimal.dll, libqoffscreen.dll,
@@ -174,5 +174,5 @@ index 50a3bb41a9..02f74650a9 100644
include(windows.pri)
--
-2.31.1
+2.32.0
diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch
index c72418c99ee..581900ea3b1 100644
--- a/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/0030-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,7 +1,7 @@
-From a12f242f872e2c3578bb97149949541c1bed20e4 Mon Sep 17 00:00:00 2001
+From 33c9678920e94ab5793e8d5fab099dd691a394e2 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
+Subject: [PATCH 30/33] Fix linking against static plugins with qmake
Required because qtConfig(static) does not work
with 'Merge shared and static library trees'
@@ -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.31.1
+2.32.0
diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
index 6651dcfea7d..f040527a9de 100644
--- a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@@ -1,7 +1,7 @@
-From 8dd259dde3e0f8cd26ea9f9ddb64c79c541200a8 Mon Sep 17 00:00:00 2001
+From df5939796b2fd80511bfac5f9deec63b21b3b37a 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'
+Subject: [PATCH 31/33] Prevent 'Cannot find feature windows_vulkan_sdk'
See https://bugreports.qt.io/browse/QTBUG-76660
---
@@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
for (nu, LD_USES) {
--
-2.31.1
+2.32.0
diff --git a/0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch b/0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch
index 51852037726..f0a834c79a6 100644
--- a/0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch
+++ b/0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch
@@ -1,7 +1,7 @@
-From 7eb97b37768e404b3a919b2d85162943c4ed9ca3 Mon Sep 17 00:00:00 2001
+From 06f2dfec9162ad46deefb0d6a02a5a3ec0074e9c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 1 Jun 2021 13:00:33 +0200
-Subject: [PATCH 32/32] Add missing `#include <limits>` in QOffsetStringArray
+Subject: [PATCH 32/33] Add missing `#include <limits>` in QOffsetStringArray
header
At least with GCC 10/11 targeting mingw-w64 the compilation
@@ -25,5 +25,5 @@ index 4dd9e9603b..e26a57ff43 100644
QT_BEGIN_NAMESPACE
--
-2.31.1
+2.32.0
diff --git a/0033-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0033-Fix-crashes-in-rasterization-code-using-setjmp.patch
new file mode 100644
index 00000000000..0004721e0d0
--- /dev/null
+++ b/0033-Fix-crashes-in-rasterization-code-using-setjmp.patch
@@ -0,0 +1,248 @@
+From 696ff656d0ec521653a0095db09fd87c859212bb Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 26 Jun 2021 22:24:12 +0200
+Subject: [PATCH 33/33] Fix crashes in rasterization code using setjmp
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Use C++ exceptions instead of setjmp to workaround crashes
+* The setjmp/longjmp code crashes when compiling for x86_64-w64-mingw32
+ with GCC 11 and optimizations enabled┬╣. It crashes when jumping back
+ to handle the case of insufficient memory. This change uses C++
+ exceptions instead (turning the compile unit into a C++ unit instead
+ of just using C) which should behave identical but don't seem to
+ crash.
+* Fix rendering certain SVGs and possibly other graphics
+
+Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c
+
+---
+
+┬╣ See https://bugreports.qt.io/browse/QTBUG-94692 for details.
+---
+ src/gui/painting/painting.pri | 4 +-
+ .../{qgrayraster.c => qgrayraster.cpp} | 41 ++++++++-----------
+ src/gui/painting/qt_attribution.json | 2 +-
+ 3 files changed, 21 insertions(+), 26 deletions(-)
+ rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
+
+diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
+index c68e8d6e9a..a144ce9b33 100644
+--- a/src/gui/painting/painting.pri
++++ b/src/gui/painting/painting.pri
+@@ -1,5 +1,7 @@
+ # Qt gui library, paint module
+
++CONFIG += exceptions
++
+ HEADERS += \
+ painting/qbackingstore.h \
+ painting/qbezier_p.h \
+@@ -80,7 +82,7 @@ SOURCES += \
+ painting/qcosmeticstroker.cpp \
+ painting/qdrawhelper.cpp \
+ painting/qemulationpaintengine.cpp \
+- painting/qgrayraster.c \
++ painting/qgrayraster.cpp \
+ painting/qicc.cpp \
+ painting/qimagescale.cpp \
+ painting/qmatrix.cpp \
+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
+--- a/src/gui/painting/qgrayraster.c
++++ b/src/gui/painting/qgrayraster.cpp
+@@ -39,7 +39,7 @@
+
+ /***************************************************************************/
+ /* */
+-/* qgrayraster.c, derived from ftgrays.c */
++/* qgrayraster.cpp, derived from ftgrays.c */
+ /* */
+ /* A new `perfect' anti-aliasing renderer (body). */
+ /* */
+@@ -157,17 +157,12 @@
+ # include <vxWorksCommon.h> /* needed for setjmp.h */
+ #endif
+ #include <string.h> /* for qt_ft_memcpy() */
+-#include <setjmp.h>
+ #include <limits.h>
+
+ #define QT_FT_UINT_MAX UINT_MAX
+
+ #define qt_ft_memset memset
+
+-#define qt_ft_setjmp setjmp
+-#define qt_ft_longjmp longjmp
+-#define qt_ft_jmp_buf jmp_buf
+-
+ #include <stddef.h>
+ typedef ptrdiff_t QT_FT_PtrDist;
+
+@@ -177,6 +172,8 @@ typedef ptrdiff_t QT_FT_PtrDist;
+ #define ErrRaster_Memory_Overflow -4
+ #define ErrRaster_OutOfMemory -6
+
++struct RasterMemoryOverflow {};
++
+ #define QT_FT_BEGIN_HEADER
+ #define QT_FT_END_HEADER
+
+@@ -312,8 +309,6 @@ QT_FT_END_STMNT
+ int band_size;
+ int band_shoot;
+
+- qt_ft_jmp_buf jump_buffer;
+-
+ void* buffer;
+ long buffer_size;
+
+@@ -335,12 +330,14 @@ QT_FT_END_STMNT
+
+ } TRaster, *PRaster;
+
++ extern "C" {
+ int q_gray_rendered_spans(TRaster *raster)
+ {
+ if ( raster && raster->worker )
+ return raster->worker->skip_spans > 0 ? 0 : -raster->worker->skip_spans;
+ return 0;
+ }
++ }
+
+ /*************************************************************************/
+ /* */
+@@ -406,7 +403,6 @@ QT_FT_END_STMNT
+ ras.max_ey = ( ras.max_ey + 63 ) >> 6;
+ }
+
+-
+ /*************************************************************************/
+ /* */
+ /* Record the current cell in the table. */
+@@ -435,7 +431,7 @@ QT_FT_END_STMNT
+ }
+
+ if ( ras.num_cells >= ras.max_cells )
+- qt_ft_longjmp( ras.jump_buffer, 1 );
++ throw RasterMemoryOverflow();
+
+ cell = ras.cells + ras.num_cells++;
+ cell->x = x;
+@@ -1507,7 +1503,7 @@ QT_FT_END_STMNT
+
+ QT_FT_TRACE5(( " move to (%.2f, %.2f)\n",
+ v_start.x / 64.0, v_start.y / 64.0 ));
+- error = gray_move_to( &v_start, user );
++ error = gray_move_to( &v_start, static_cast<PWorker>(user) );
+ if ( error )
+ goto Exit;
+
+@@ -1529,7 +1525,7 @@ QT_FT_END_STMNT
+
+ QT_FT_TRACE5(( " line to (%.2f, %.2f)\n",
+ vec.x / 64.0, vec.y / 64.0 ));
+- gray_render_line(user, UPSCALE(vec.x), UPSCALE(vec.y));
++ gray_render_line(static_cast<PWorker>(user), UPSCALE(vec.x), UPSCALE(vec.y));
+ continue;
+ }
+
+@@ -1558,7 +1554,7 @@ QT_FT_END_STMNT
+ " with control (%.2f, %.2f)\n",
+ vec.x / 64.0, vec.y / 64.0,
+ v_control.x / 64.0, v_control.y / 64.0 ));
+- gray_render_conic(user, &v_control, &vec);
++ gray_render_conic(static_cast<PWorker>(user), &v_control, &vec);
+ continue;
+ }
+
+@@ -1572,7 +1568,7 @@ QT_FT_END_STMNT
+ " with control (%.2f, %.2f)\n",
+ v_middle.x / 64.0, v_middle.y / 64.0,
+ v_control.x / 64.0, v_control.y / 64.0 ));
+- gray_render_conic(user, &v_control, &v_middle);
++ gray_render_conic(static_cast<PWorker>(user), &v_control, &v_middle);
+
+ v_control = vec;
+ goto Do_Conic;
+@@ -1582,7 +1578,7 @@ QT_FT_END_STMNT
+ " with control (%.2f, %.2f)\n",
+ v_start.x / 64.0, v_start.y / 64.0,
+ v_control.x / 64.0, v_control.y / 64.0 ));
+- gray_render_conic(user, &v_control, &v_start);
++ gray_render_conic(static_cast<PWorker>(user), &v_control, &v_start);
+ goto Close;
+ }
+
+@@ -1617,7 +1613,7 @@ QT_FT_END_STMNT
+ vec.x / 64.0, vec.y / 64.0,
+ vec1.x / 64.0, vec1.y / 64.0,
+ vec2.x / 64.0, vec2.y / 64.0 ));
+- gray_render_cubic(user, &vec1, &vec2, &vec);
++ gray_render_cubic(static_cast<PWorker>(user), &vec1, &vec2, &vec);
+ continue;
+ }
+
+@@ -1626,7 +1622,7 @@ QT_FT_END_STMNT
+ v_start.x / 64.0, v_start.y / 64.0,
+ vec1.x / 64.0, vec1.y / 64.0,
+ vec2.x / 64.0, vec2.y / 64.0 ));
+- gray_render_cubic(user, &vec1, &vec2, &v_start);
++ gray_render_cubic(static_cast<PWorker>(user), &vec1, &vec2, &v_start);
+ goto Close;
+ }
+ }
+@@ -1635,7 +1631,7 @@ QT_FT_END_STMNT
+ /* close the contour with a line segment */
+ QT_FT_TRACE5(( " line to (%.2f, %.2f)\n",
+ v_start.x / 64.0, v_start.y / 64.0 ));
+- gray_render_line(user, UPSCALE(v_start.x), UPSCALE(v_start.y));
++ gray_render_line(static_cast<PWorker>(user), UPSCALE(v_start.x), UPSCALE(v_start.y));
+
+ Close:
+ first = last + 1;
+@@ -1663,14 +1659,11 @@ QT_FT_END_STMNT
+ {
+ volatile int error = 0;
+
+- if ( qt_ft_setjmp( ras.jump_buffer ) == 0 )
+- {
++ try {
+ error = QT_FT_Outline_Decompose( &ras.outline, &ras );
+ if ( !ras.invalid )
+ gray_record_cell( RAS_VAR );
+- }
+- else
+- {
++ } catch (const RasterMemoryOverflow &) {
+ error = ErrRaster_Memory_Overflow;
+ }
+
+@@ -1932,7 +1925,7 @@ QT_FT_END_STMNT
+ static int
+ gray_raster_new( QT_FT_Raster* araster )
+ {
+- *araster = malloc(sizeof(TRaster));
++ *araster = static_cast<TRaster *>(malloc(sizeof(TRaster)));
+ if (!*araster) {
+ *araster = 0;
+ return ErrRaster_Memory_Overflow;
+diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json
+index 7b16e8c211..38f03b73d8 100644
+--- a/src/gui/painting/qt_attribution.json
++++ b/src/gui/painting/qt_attribution.json
+@@ -4,7 +4,7 @@
+ "Name": "Anti-aliasing rasterizer from FreeType 2",
+ "QDocModule": "qtgui",
+ "QtUsage": "Used in Qt GUI.",
+- "Path": "qgrayraster.c",
++ "Path": "qgrayraster.cpp",
+
+ "Description": "FreeType is a freely available software library to render fonts.",
+ "Homepage": "http://www.freetype.org",
+--
+2.32.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 1573b5f814f..3bbf035453c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,9 +17,9 @@
_qt_module=qtbase
pkgname=mingw-w64-qt5-base
-pkgver=5.15.2+kde+r196
+pkgver=5.15.2+kde+r203
pkgrel=1
-_commit=2a2f3cd61f59ccec0eecb09e4a8795d7322edfcb
+_commit=d23de39db3b84c8c9a80da36d8d0de8da4321566
pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
arch=('i686' 'x86_64')
url='https://www.qt.io/'
@@ -67,40 +67,42 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
'0029-Hardcode-linker-flags-for-platform-plugins.patch'
'0030-Fix-linking-against-static-plugins-with-qmake.patch'
'0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch'
- '0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch')
+ '0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch'
+ '0033-Fix-crashes-in-rasterization-code-using-setjmp.patch')
sha256sums=('SKIP'
- '065c8fdb0b2f70264085b2059713ec2045ac45aac680b8f073d88c39edeb4e69'
- '63183545568e036190c1e18b3197f64e4d407eb3244ed6c1778e845ab1c74c0a'
- '6f0f8605b251df99adc45668a825bd463c8459b29fb279cc9ebd36e2af256e6c'
- '1ed4ba57d4e1393cdb3e7e38cee9c3fafe5f8e67070c5bc057c949491797c62b'
- 'bc941a7891bc4396179f7b5c0a9806610b0e20ae9e01f79561ddd4b313a9a90d'
- '15492f5f479ae53cd819805c18e20c11d4f0231c16c3db44ecd751129d987e81'
- 'b3a9d29d4068b83e5b47d56d02179784ea752edbfa60cebd4da0879a0a375530'
- 'ede3f1822f552353208d928ab4616bf00adc398e13a6c893e58062b1aeb313ed'
- '9105bdcf2802c524d766b2c0f54c76c766ccc3f87c2b1293a592bc70177a5439'
- '203499a407f81c08fb38f6bd7d6bfba2f413e27c43808376a718049ab25e13d8'
- '484c90579c250cae826ad9dbc71862f4f774634a07465cc41e05bd28138382c1'
- '08bfefd5116c0fc87b46fe3d4b11fb3f1c3263dcbca565b0f7c29e57c974b3d5'
- 'a13c6c01caf2f3135495023590a2ed8505ca5c616e588b15c7a9a82d7b8678af'
- '66e58b40d7c4dfdf0ea897cd63c72a9a6bac12af93c33268477500fafacd5f07'
- '8b44e4f820c0a0728cc7c4f1167224f3d95b02a49f968c2947f9942c8b84c873'
- '7623991f9cb71c1c1b9c08bb7e2734826cb133c72ba2d07a4ca718b7b0d7bb03'
- 'fe07fea05d61b6c9263370874ba7fb46153982c74aafa89288098ce07b6e0a36'
- 'a29334543322bef8fc755ae1462f3a1c792bbf9a693b45acaa1254d0942c3336'
- 'ed24d868094e854529e5237c66d339550ce584ad21031c671c57cd831f5a6e5b'
- '7dff27c29399e2e708c6bcd539442cba87eb212017efe4f48287d65d0ff1e9fe'
- '9c186a1ecc5e16af01549a5cf9228e6ec135ae28c76772a9730ea8b3caf27409'
- '3412b4cd71a645778ca9e7c106682281f291f2ece2c5f106ee9f6e427d4e140f'
- 'a8589883158e2060fae6a0f0cb352ba1f3c7d739b1ed21c022c3fcc5792ce871'
- '17fdc20875941a3d7ee0e99c3cfeddf79ed8939e4049614809b444734053b96b'
- 'df8d6552ecb8a0617d919b9483f44543b27fbcf53468c8cfb8f4bbb400f689cb'
- '7174b00cfb20401e35133a4736ec081e1ea526b4658f2fb67d05064858cafb93'
- '0203c09fd27a3e181e418e83f296ca7e6036d2e2f645ae3801be08f5c12006bc'
- '399a832701ceeb4529a58533fe6152112ba97ec942afff0a0671efdd8f2438c1'
- 'de4fa5b45d6cc3366014a82b167eacb867b5441478ce2f484f4d77132f3e3b80'
- 'd1842d8096aaf4baf6cb9c160eb5a0d3c2ed17ce2ca91239416ab0c8f4f76ca5'
- 'e884e79264f8b98c5021bdd5dbb03044f4c178e68f60449d3a37918f94d39a54'
- 'bf55e0b7198807301edb1468af14e86ab9821d7209136f05e28df483e676bcf9')
+ '8613f8d23c5440a46d4a0f9c4539381005e2818b90ea496193eed92786edb16f'
+ '679799aa865366497d7475bab40464a5957328cc3c0e5da28a0db878c8f8573b'
+ 'b56fdf550506c9d44838c5fda6652193cf592106779fb54ebe4a45ef320a6af9'
+ '30a32bfc481ba0c314d2767cc4a064fbc07802469a641f271629cebd2ac9a761'
+ '3144ef696efd1364a24de1badf9bb80b4101c77edb7939fb8718a903d7bf26c2'
+ '13c2e0c1af4ef8465c7f342c7a5eff418a276de750dc7fabb5c203332ec9e64c'
+ '369919f5b9ceb7cceafc05bd5c65e3c81c35e93a44c735ce3aba7deeb8f424ff'
+ '46bbcc0ff97daba70cda9f2e80b56f929f3e601ad3350ae00c78c68aabed1570'
+ '8fafbc2c0b124ab8489a99860062d96f98305b81e9dd91d32b500710ef4ed0af'
+ '5bbce61594fd594cbef497689ffb11df5ef9fdfb1ac568b0e111c1aaf8f4c665'
+ '97bfd341b18a0c22085ed451351a9709d536b7a93fdf4b994bd171ec5f913ca2'
+ '0dcba5a7d147fc84cf4e2744a03c268aadbaffba0f2e2958a3fa75d4fa958f1b'
+ 'a545af810eab032617aabef87dbd951c2f73019f223180c4b771e3e020dc9edb'
+ '9f850469676a4b8ba4fc1ee6eefb321ad09a5cd1395e999cb1f765aeb774e1a4'
+ '493bfc5d6db5199648656525780183c6f52f4afb7695b2aa22d2e96cf6d70507'
+ 'ca0888582955a0ccf92b68829c8f0441aa5ece9d0bfec496c3b8d3f8c88bd5ea'
+ 'da49b774077d4759bbbc5d5c2a5d1ec52b9a3c53621da996d870945d4e393b1c'
+ '4242302b53bd487faf399d4fad193dc312e377a9583ea5ebefa5c0368bf77117'
+ '3fed7f019a61ca0ed1df4cb9456c78e75bacf3daa75ac1ab2206d2c8cfce1199'
+ 'eede73419d13d66b093e005f455a657505f6d6063b38de691c8cdb56358f3cb8'
+ 'ea60c37493ec14d9048cefead9dc8dbc7acafb1dca5543b3d480b1ea84280a04'
+ '39ce306ab1d3b264ed567f72f5c3e397c4a9d6c562741ff0df1a1d97a21cc92a'
+ '5ae44f415817a53106ff9a9a3c64aabdb44d8f200bda302bdd51491597b83951'
+ '1e95190e1cfc9ab7692ad796c0217144a770f3f644697939f2bcb93a0c8aa569'
+ 'dec83c48a3d337d47e480e75fbb853a6f2563d0901f39cbb76b84e8c5483f069'
+ '680854dabbfa446dc9d50c270be1eeff01faf8fc83594e0cea08f9df6602553a'
+ 'fa8d9f78d4a6b329303a20d6511b4ee46722536f8621fc77721bf45185244251'
+ '3e834ad4bc6f4e28fcb9afba31531d91e8ec962775e21014bce977b2467c5054'
+ '0e3fb673f45ededf99c6b13c922cc8873202f4ba066b9ba05e8c47b529fe027f'
+ '8eb6a0e9cd837263728148ed00785a4f98bc524eeb7bdd658880757eeda3250e'
+ '2aa935715d8415686aaa812e8cea57b0e5e5391bead12219aee424d2aeef17c1'
+ 'e1526e6e1ddcccbdf06de55ccc411fb1983c58abfa776fd0112545392e0e9d6e'
+ 'b0a1d82dc22dc02d993224f4391ad297fdd7e992e8d2bcaabb106f28a9f243e6')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'