Update mingw-w64-qt5-base to 5.15.6+kde+r179

Rebase patches against latest KDE commit and adapt them to glib2 now using pcre2.
2022-10-04 17:39:08 +02:00 · 2022-10-04 17:39:08 +02:00 · 057fb81690
parent 91f026dd84
commit 057fb81690
35 changed files with 105 additions and 105 deletions
--- a/devel/generator/generate.pl
+++ b/devel/generator/generate.pl
@ -80,7 +80,7 @@ my %kde_fork_revisions = (
    activeqt => [0, 'ccc9a61d10404a4999dec61fdb513aa50f265cc3'],
    winextras => [0, 'a2ef397d1833c7417138a14ae23c880ae434d8a6'],
    '3d' => [6, 'fe5fca853c09c7e03a2ff66dac21584e3307984d'],
-    base => [165, 'eeadc036d77b75bec5b7c41869688c7db9a2e221'],
+    base => [179, 'e44097b63d17ba3178a637df7fac51ddc51cb48b'],
    charts => [0, '841083c263f16f8acb81e4915bf24bbed0461c9a'],
    connectivity => [5, '01e8b04b121712ea0a2b2793ce13f4dd5e9cfcf8'],
    datavis3d => [0, '502612c72a2cd3b3b0c4cff926e7764d74106d33'],
--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@ -17,10 +17,10 @@

 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base-static
-pkgver=5.15.6+kde+r165
+pkgver=5.15.6+kde+r179
 pkgrel=1
 _basever=${pkgver%%+*}
-_commit=eeadc036d77b75bec5b7c41869688c7db9a2e221
+_commit=e44097b63d17ba3178a637df7fac51ddc51cb48b
 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'
-            'c41a27864036608b0356c240d48fb105b6afbd47a976e36908c9aed327d7b7cb'
-            'a69ef91d9f42adc4d5796dd268dd58710fd080fb938fa3a65889b6ad517ccaf0'
-            '260a3fb5f812c2dfa515eb2585c395ffb2b00a5ee86ab21f580c70ba2ef6ece5'
-            '5a6539b00e1459016554d04c4c4e7951989528c012dd5ed01a5ef5a1a01d326e'
-            'b029b7a73680b9b972d8c29be109133b75834c76b3c99533382e7145d9cdadff'
-            '40267b7089d95c59899b5fb2a2ce8c9ce66b284e8ca222ecf56839bbc8619be6'
-            '75afb4b6eab560d55058f170565944774fb534bcfe077acf95035f331dce321f'
-            'e76976133fa5b31d57a4b05b8aad5369559f50c93f9e4a3cb75a4645fee0c017'
-            'f4867d176bda13c506543b630931d1efe3b0c8e02d80fd81cca6de9a53ed9fea'
-            '2049f9afc17877edc8014ad1abfa7492d7208fc6a1e97f90c6ff3e8fd89ed853'
-            'b8d69fa14f6e14aaf98e2e9ca201b0e54ea066c70f514d84e652e2dc06d75bba'
-            'c021e47b0452c47a7b486596324f62fdc192665a6c476cb7fad9207340b7fe5f'
-            '0aa2ec748924f3fa1ebe16645c581f6b5d5bf82186e58407c8ee0597e7547a10'
-            'b2ffe203da527c95936806121d646bcf03026b0a7cc8ada2f60d4d26284028b3'
-            'bfddd2c8c44bab7f7995623bdcb89fd3ff8fbe9125522b1bb50b43efe297ee13'
-            'a9e9ac55bd881390b41b49a06f11c3441a008409527f7fce3d337df6820598c6'
-            'fb8de523d608ded6a6f6ca82d884af7bd086091e10d492902363f4f3f90f1a5b'
-            '4d6f76f552cd0eaae0ae8e9ea8232f36ad140680c2d04ed70e792c11b85c86ac'
-            'bb0bfd9431d103af36d4b09134f3f9f1ac7a05feeb7779e6c15d447593ce6381'
-            'af6014fb1c311b91a1390898d25622d6aba555a0a30724dd953af2ea17cad6c5'
-            'ab620d4da6897d0b5fed70f8ac01febb46b9ff6e04e8fb49b4c1a2cb8527994f'
-            'e7217028a44537e40ddac73ac49630f77a361ecd20d6c40f6482517ae3103939'
-            '7937d08e1aaf5bb59161e84ecd23cb0ea6a251eae0b98a8291e126442bf048f1'
-            'ed37dc1bef6aee8e842c347ebe4fb3a4435887a15664f98487466d771d85f15e'
-            '071cce97add50db7e4703c6798afc42500405276043b2e5e6e9a5cf80556726c'
-            '62ae5fbeace74ba9830c185f45432decd5f0f8305767d9a3b9bfac27647f5a7c'
-            '9fae7c2dc88a27322bdb32748ea03fac1a04d8d35327acce05be511dd00b04e2'
-            '06836073078a6cb304931443eab9306baee29d1c19f167765cff238bd34ae78d'
-            '484996266fe418c1b5db76eec61d1bce1bc163546f534acf8343b0f77796cab7'
-            '94852f7bd841f0ded357e9d0a5c6e53434711df1b701674da49f4f1a8f61a26b'
-            '242f068c25d72ed8f67790d2c629b4aea2f13053760a9c8de43cab26c620bfe1'
-            '5f83de1635acee180f65019ccd37112f284552d6d4831b770a1a0c0119f17f5e')
+            '698abbc6cef393afeb1c71a66ae4ae5d15b7a2fb08ac4d9e866888626d0d597f'
+            '7655005a5dd10f73fa7bb71ef3c442d172aae45720fb372db2123f8302a972a8'
+            '5a4ac45868287f554a30d781fa34be31a83ab6a905a71e5b28d2acd64b42d892'
+            'd9e6f5a2cac54a71dac7bd506ba66d411190d267818e30178fcb9051a954f458'
+            '89b03b77bb4f1b9afe75bd1d4fcb440cfd853a814a8ef9a374096d075dda575d'
+            '13027f566ae778edb6f2c9f80ab1f64fd875a3b1ac4b9ea4a3f983e288062706'
+            '3ba187087e2105350c325188524b6f69c469ae639f80275f9e103b34614fb2cb'
+            '67970565da4ac1d744b55156ffff4ef8f2069ece91a16e29080be998725de8e1'
+            'ffae985d1a6a2414f70ff3ceeae60d5083059efb1303611cb3110107d0756041'
+            'ad5f00c0b5d9497a33d5fb623d7580e6106d03497ff7afc60b2e013c48a6c512'
+            'ef08db5c2a2c2f11e9bdafb6adc4e664447bbde40c3241dc3b601c66b9d78f44'
+            '40101736067b59cc3fc7e18fc39dec4d5a229f33509b01be92d33c0eff4086f3'
+            'cd9170025b521627346642c6e3b5d4974230d590783cebbb0978770863ceed70'
+            '169036da1354db3661c158bf821d7f7c32d73eb03b5effec686398a6d6da2a18'
+            '15af4eee3abbeea0f6bae9f2d37573b433f8c1c750a2a485056710d2502eaef4'
+            '2cc82a94822e7576ff70816aa5dece3623093afced71bb2cbad3be2d2003fa6e'
+            '907aabe29cecb7200630d8cb1a7a108eaa32895e81ea0b7cf3058cd22bedc71c'
+            '326e594c6626dcd00107a487fdeb937bd1b9052cfadab3c4dbfd3e8d7f76f5b3'
+            'affabd45f334412818c3f36ca2f85494f7de167c79f046f714c3692e935358b9'
+            '5b2608ec74dc906f387d27ff064c115e1088655cc2f67922326a85fa37c23e4e'
+            '2214ec0bdd023a1f209690b3deecc5b75e7e89c320b518a102eaeab7969f998a'
+            'e75fa52f44b2960f50350a100f09cb51658c6bc2c7dab69d7f0a9af0da99e6b2'
+            '1c51b93938d4794d9ab2c86b57b4f6c7c48818ae18b1fde7ac45389691ceef69'
+            'a60f94db4999a8a11557c9d341402d72db480018b315da1cf8eef654fb305555'
+            '931c2212ce55fe4fc06845c27bb1363c033ffa3649b0501b78631c816a81e60f'
+            'aea15ff6b63a55bfbbb786c37d5f4974ac2d5d05387b05da1ef858f6877e34eb'
+            'ea9afd1891e9b52efc650b292e379f00382dee318931635a0df2e4db726208de'
+            '87884f4228604d786a8c0a58efe219f96a044c193c80ba28dc4485b14faabc55'
+            '8cb484534dc83a3a1143cdd1042911790aa7ae47492b02dacb5f95abaa927a92'
+            'a72b7c52cbdf50e0ab4c0a153f999bb90c1edb8596161d834098d104d79cb0ae'
+            'dc8f45bbef25e13a1ec638edc71a763c484084961271041aa8548e41c0e7b72d'
+            'aad0e43b94e5030a3adeb88b6d5cdebc03c51003323e3154e8e3a5e0c5ca9ffe')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,4 +1,4 @@
-From 28fc8a754e54a24bbb1575cce719538629e5042a Mon Sep 17 00:00:00 2001
+From b536b4aa847df6447e042e257c30358d83725566 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
--- a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@ -1,4 +1,4 @@
-From d8a666bc84523bb256f5b78f1876af0efab6cb16 Mon Sep 17 00:00:00 2001
+From 52c30aca92089003ccd477a743e119d1ccb015ca 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
--- a/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -1,4 +1,4 @@
-From 0f134acc8fadb65198b0c8f43c63a7c67c4fa89c Mon Sep 17 00:00:00 2001
+From 81b47bbb1c648fcbb440bc7d860fd4ccdb159120 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
--- a/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch
@ -1,4 +1,4 @@
-From 0d645ca83b306f66cc806bc1a487b02de963b612 Mon Sep 17 00:00:00 2001
+From e58f2252b012a32fdd558a83f45214bcae62d2b8 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
--- a/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -1,4 +1,4 @@
-From f74d7894cd7c75ac0eba7dae3c413212b5c9aeef Mon Sep 17 00:00:00 2001
+From 28e88ffbb79a6e0023e13347f1e8c1421dea0d4a 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
--- a/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@ -1,4 +1,4 @@
-From 94c2309628c6276358e515abf7db2f047c4c6ea4 Mon Sep 17 00:00:00 2001
+From 6a52153b70af9f585551888736e9ca894986076b 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
--- a/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch
@ -1,4 +1,4 @@
-From c1500438c0431ec3ad710ba5e1da6bafcbfbe09f Mon Sep 17 00:00:00 2001
+From f63ba718d481d114ed92e588bd0b0d93e0410ba8 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
--- a/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch
@ -1,4 +1,4 @@
-From 4e4b4ef2a7722f09547903ab92a1f1c7cf527ce6 Mon Sep 17 00:00:00 2001
+From d274147bcb2fe8afaa5ec4974e8768ab8e302c00 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
--- a/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -1,4 +1,4 @@
-From 709f40bf4118e2409ef0d6b0e9ea6fecdbaaf220 Mon Sep 17 00:00:00 2001
+From f57f9558cca22aeda1161456b751dcc2b819bac2 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
--- a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch
@ -1,4 +1,4 @@
-From 9ad4e8f478409ea2e1ea979aff8752bff71e2c6d Mon Sep 17 00:00:00 2001
+From 3deacbd3286d0c9daf61cef211f3d8bf4fe7d18d 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
@ -9,7 +9,7 @@ Change-Id: I6e4a2baa25beb5f63b46f25153bd7bac52a2262f
 1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index e0043542ec..2fe0a018b1 100644
+index e0043542ec..3f77f67a07 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
@@ -238,8 +238,10 @@
@ -19,7 +19,7 @@ index e0043542ec..2fe0a018b1 100644
 -                { "type": "pkgConfig", "args": "freetype2" },
 -                { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
 +                { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
-+                { "libs": "-lfreetype -lharfbuzz -lfreetype -lbrotlidec-static -lbrotlicommon-static -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
+                { "libs": "-lfreetype -lharfbuzz -lfreetype -lbrotlidec-static -lbrotlicommon-static -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre2-8 -lintl -lpcre2-8 -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
--- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch
@ -1,4 +1,4 @@
-From ec97898dc6b1446c10a2e357627ffb198b614a81 Mon Sep 17 00:00:00 2001
+From 3c9701cd97287da483664e391b43590db0b16884 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 2fe0a018b1..ceeee23164 100644
+index 3f77f67a07..f6da787b13 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
@@ -305,7 +305,11 @@
@ -18,7 +18,7 @@ index 2fe0a018b1..ceeee23164 100644
 -                "-lharfbuzz"
 +                { "type": "pkgConfig", "args": "--static --libs harfbuzz", "condition": "!features.shared" },
 +                { "type": "pkgConfig", "args": "--libs harfbuzz", "condition": "features.shared" },
-+                { "libs": "-lharfbuzz  -lfreetype -lharfbuzz -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" },
+                { "libs": "-lharfbuzz  -lfreetype -lharfbuzz -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre2-8 -lintl -lpcre2-8 -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" },
 +                { "libs": "-Wl,-Bdynamic -lharfbuzz -Wl,-Bstatic", "condition": "!features.shared" },
 +                { "libs": "-lharfbuzz", "condition": "features.shared" }
             ]
--- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch
@ -1,4 +1,4 @@
-From 907d2c90e2321ee3e269ebc8491ac62c902bc0c7 Mon Sep 17 00:00:00 2001
+From 8eb4ef294239e6d9188dedd7be9b3a3b9cf32d3c 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
--- a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From b9b333884c7fae07ab6bb8601e6f915c65fd1423 Mon Sep 17 00:00:00 2001
+From b4e7134166b5a1ed7384cd00fdd814bbd40023b0 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
--- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 47e906fc890136daf25f1afb512bc3105ddb0e04 Mon Sep 17 00:00:00 2001
+From b58abc91dea892e80ed4954c58ce73a2a4a226a1 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
--- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch
@ -1,4 +1,4 @@
-From 34553edae8fd18e8f3e88056d17625c6d7a8e8c5 Mon Sep 17 00:00:00 2001
+From 887e66295c43eb6ea2ab998c6f9f6ec2d2288323 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
--- a/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch
@ -1,4 +1,4 @@
-From 68d31dfebc88da9640d54282aff55e09b16d66bb Mon Sep 17 00:00:00 2001
+From 3109e4fbfa72b4a077c0a9e404f004a436afc986 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
--- a/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From 72b1e80f59d79a032ad1c1805cb511d3285ed440 Mon Sep 17 00:00:00 2001
+From 8b719bce574b4780a7533b8aab1d32d4fab7d51e 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
--- a/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From 4329157e0a3f2a59d839da9aaf38b9415391c3da Mon Sep 17 00:00:00 2001
+From a01fbd691dc895f8b47080d8abc51dc1560af68a 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
--- a/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From 2baddbdcdde10ac0610bfd81b37020f174561dc3 Mon Sep 17 00:00:00 2001
+From f3e03f941d0152e07d6f535d5f632d87b136183b 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
--- a/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From 296e4bdadaedd8b2ec38ba98b53b24c337edde5c Mon Sep 17 00:00:00 2001
+From 50f55cd4971e196241b02111533c2779278d9766 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
--- a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From 9eac4a7941ee50c585a74b5555e0bd15b7bff786 Mon Sep 17 00:00:00 2001
+From f04981df88e88947a5704633d7179dae74779e33 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
--- a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From 0352e345a0d67776eaacfe26a2047d5f5b06cb3b Mon Sep 17 00:00:00 2001
+From 1ac963fca35b3033f7932f56fa0b7d186b1c0fbf 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
--- a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From c9fe6b198963a628779fb708d044b325deb154af Mon Sep 17 00:00:00 2001
+From 54bc062f269326d9587241c56eace8a75fd24d2e 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
--- a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From 531447697fcfaecad46f1169e9a2b3a684993a45 Mon Sep 17 00:00:00 2001
+From 6900cd77a4d921d2908c36a2687642c9550bcc74 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
--- a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From 5a96b713cfd0f59571eacbaad496e13e30a29192 Mon Sep 17 00:00:00 2001
+From ad827e36838a649a8d986ad2ffc473b2c4ab6728 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
--- a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From 1bfc05dc42edfc5fdd694fd81db6fb2a4e0362dd Mon Sep 17 00:00:00 2001
+From c57341b93b519fcf027422ff9b85986834bbccec 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
--- a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From e87edd3a17d9c1ff4eb4e60ae71ae276af9d93f6 Mon Sep 17 00:00:00 2001
+From b15590822a59c7faa83118a1163335334c757558 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
--- a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From f78cf68b18981cd16c8c0034f4d46517c7905f02 Mon Sep 17 00:00:00 2001
+From 48a01a52f3e39c2abf4f1e9b36659b65255abb73 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
--- a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From d5e12ed7959fac200b629da221b22e65f11c999d Mon Sep 17 00:00:00 2001
+From a391524fc205594e890bced50a9ce1c6af01dc0e 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
--- a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From 7f833b6849bc91b24f7a2361f8a090b71ed90826 Mon Sep 17 00:00:00 2001
+From 4d3a43981b30e5dce6a39caa9a996a3715747bb2 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
--- a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@ -1,4 +1,4 @@
-From 0dcb8192c585eaff536b8f9c22abe7fe4ada06d0 Mon Sep 17 00:00:00 2001
+From 5c0e058198480e06d49539990b636d5e98dd02a7 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'
--- a/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
@ -1,4 +1,4 @@
-From b0d04c84efd9a26e76cea53e17b526e2073a1bb1 Mon Sep 17 00:00:00 2001
+From e61e98725ef69ac99fa9dcca2efae50084b31ab3 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
--- a/qt5-base/mingw-w64/PKGBUILD
+++ b/qt5-base/mingw-w64/PKGBUILD
@ -17,10 +17,10 @@

 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base
-pkgver=5.15.6+kde+r165
+pkgver=5.15.6+kde+r179
 pkgrel=1
 _basever=${pkgver%%+*}
-_commit=eeadc036d77b75bec5b7c41869688c7db9a2e221
+_commit=e44097b63d17ba3178a637df7fac51ddc51cb48b
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('i686' 'x86_64')
 url='https://www.qt.io/'
@ -70,38 +70,38 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
        '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch'
        '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch')
 sha256sums=('SKIP'
-            'c41a27864036608b0356c240d48fb105b6afbd47a976e36908c9aed327d7b7cb'
-            'a69ef91d9f42adc4d5796dd268dd58710fd080fb938fa3a65889b6ad517ccaf0'
-            '260a3fb5f812c2dfa515eb2585c395ffb2b00a5ee86ab21f580c70ba2ef6ece5'
-            '5a6539b00e1459016554d04c4c4e7951989528c012dd5ed01a5ef5a1a01d326e'
-            'b029b7a73680b9b972d8c29be109133b75834c76b3c99533382e7145d9cdadff'
-            '40267b7089d95c59899b5fb2a2ce8c9ce66b284e8ca222ecf56839bbc8619be6'
-            '75afb4b6eab560d55058f170565944774fb534bcfe077acf95035f331dce321f'
-            'e76976133fa5b31d57a4b05b8aad5369559f50c93f9e4a3cb75a4645fee0c017'
-            'f4867d176bda13c506543b630931d1efe3b0c8e02d80fd81cca6de9a53ed9fea'
-            '2049f9afc17877edc8014ad1abfa7492d7208fc6a1e97f90c6ff3e8fd89ed853'
-            'b8d69fa14f6e14aaf98e2e9ca201b0e54ea066c70f514d84e652e2dc06d75bba'
-            'c021e47b0452c47a7b486596324f62fdc192665a6c476cb7fad9207340b7fe5f'
-            '0aa2ec748924f3fa1ebe16645c581f6b5d5bf82186e58407c8ee0597e7547a10'
-            'b2ffe203da527c95936806121d646bcf03026b0a7cc8ada2f60d4d26284028b3'
-            'bfddd2c8c44bab7f7995623bdcb89fd3ff8fbe9125522b1bb50b43efe297ee13'
-            'a9e9ac55bd881390b41b49a06f11c3441a008409527f7fce3d337df6820598c6'
-            'fb8de523d608ded6a6f6ca82d884af7bd086091e10d492902363f4f3f90f1a5b'
-            '4d6f76f552cd0eaae0ae8e9ea8232f36ad140680c2d04ed70e792c11b85c86ac'
-            'bb0bfd9431d103af36d4b09134f3f9f1ac7a05feeb7779e6c15d447593ce6381'
-            'af6014fb1c311b91a1390898d25622d6aba555a0a30724dd953af2ea17cad6c5'
-            'ab620d4da6897d0b5fed70f8ac01febb46b9ff6e04e8fb49b4c1a2cb8527994f'
-            'e7217028a44537e40ddac73ac49630f77a361ecd20d6c40f6482517ae3103939'
-            '7937d08e1aaf5bb59161e84ecd23cb0ea6a251eae0b98a8291e126442bf048f1'
-            'ed37dc1bef6aee8e842c347ebe4fb3a4435887a15664f98487466d771d85f15e'
-            '071cce97add50db7e4703c6798afc42500405276043b2e5e6e9a5cf80556726c'
-            '62ae5fbeace74ba9830c185f45432decd5f0f8305767d9a3b9bfac27647f5a7c'
-            '9fae7c2dc88a27322bdb32748ea03fac1a04d8d35327acce05be511dd00b04e2'
-            '06836073078a6cb304931443eab9306baee29d1c19f167765cff238bd34ae78d'
-            '484996266fe418c1b5db76eec61d1bce1bc163546f534acf8343b0f77796cab7'
-            '94852f7bd841f0ded357e9d0a5c6e53434711df1b701674da49f4f1a8f61a26b'
-            '242f068c25d72ed8f67790d2c629b4aea2f13053760a9c8de43cab26c620bfe1'
-            '5f83de1635acee180f65019ccd37112f284552d6d4831b770a1a0c0119f17f5e')
+            '698abbc6cef393afeb1c71a66ae4ae5d15b7a2fb08ac4d9e866888626d0d597f'
+            '7655005a5dd10f73fa7bb71ef3c442d172aae45720fb372db2123f8302a972a8'
+            '5a4ac45868287f554a30d781fa34be31a83ab6a905a71e5b28d2acd64b42d892'
+            'd9e6f5a2cac54a71dac7bd506ba66d411190d267818e30178fcb9051a954f458'
+            '89b03b77bb4f1b9afe75bd1d4fcb440cfd853a814a8ef9a374096d075dda575d'
+            '13027f566ae778edb6f2c9f80ab1f64fd875a3b1ac4b9ea4a3f983e288062706'
+            '3ba187087e2105350c325188524b6f69c469ae639f80275f9e103b34614fb2cb'
+            '67970565da4ac1d744b55156ffff4ef8f2069ece91a16e29080be998725de8e1'
+            'ffae985d1a6a2414f70ff3ceeae60d5083059efb1303611cb3110107d0756041'
+            'ad5f00c0b5d9497a33d5fb623d7580e6106d03497ff7afc60b2e013c48a6c512'
+            'ef08db5c2a2c2f11e9bdafb6adc4e664447bbde40c3241dc3b601c66b9d78f44'
+            '40101736067b59cc3fc7e18fc39dec4d5a229f33509b01be92d33c0eff4086f3'
+            'cd9170025b521627346642c6e3b5d4974230d590783cebbb0978770863ceed70'
+            '169036da1354db3661c158bf821d7f7c32d73eb03b5effec686398a6d6da2a18'
+            '15af4eee3abbeea0f6bae9f2d37573b433f8c1c750a2a485056710d2502eaef4'
+            '2cc82a94822e7576ff70816aa5dece3623093afced71bb2cbad3be2d2003fa6e'
+            '907aabe29cecb7200630d8cb1a7a108eaa32895e81ea0b7cf3058cd22bedc71c'
+            '326e594c6626dcd00107a487fdeb937bd1b9052cfadab3c4dbfd3e8d7f76f5b3'
+            'affabd45f334412818c3f36ca2f85494f7de167c79f046f714c3692e935358b9'
+            '5b2608ec74dc906f387d27ff064c115e1088655cc2f67922326a85fa37c23e4e'
+            '2214ec0bdd023a1f209690b3deecc5b75e7e89c320b518a102eaeab7969f998a'
+            'e75fa52f44b2960f50350a100f09cb51658c6bc2c7dab69d7f0a9af0da99e6b2'
+            '1c51b93938d4794d9ab2c86b57b4f6c7c48818ae18b1fde7ac45389691ceef69'
+            'a60f94db4999a8a11557c9d341402d72db480018b315da1cf8eef654fb305555'
+            '931c2212ce55fe4fc06845c27bb1363c033ffa3649b0501b78631c816a81e60f'
+            'aea15ff6b63a55bfbbb786c37d5f4974ac2d5d05387b05da1ef858f6877e34eb'
+            'ea9afd1891e9b52efc650b292e379f00382dee318931635a0df2e4db726208de'
+            '87884f4228604d786a8c0a58efe219f96a044c193c80ba28dc4485b14faabc55'
+            '8cb484534dc83a3a1143cdd1042911790aa7ae47492b02dacb5f95abaa927a92'
+            'a72b7c52cbdf50e0ab4c0a153f999bb90c1edb8596161d834098d104d79cb0ae'
+            'dc8f45bbef25e13a1ec638edc71a763c484084961271041aa8548e41c0e7b72d'
+            'aad0e43b94e5030a3adeb88b6d5cdebc03c51003323e3154e8e3a5e0c5ca9ffe')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'