Rebase against 5.15.3

34 files changed, 143 insertions, 144 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c2484277677..ca4051c9855b 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+r274
+	pkgver = 5.15.3+kde+r133
 	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=98aa64af7e1e677bd107bfb0c432cabf7c3a5e32
+	source = git+https://invent.kde.org/qt/qt/qtbase#commit=e68ca8e51375d963b2391715f70b42707992dbd8
 	source = 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
 	source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
 	source = 0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -67,37 +67,37 @@ pkgbase = mingw-w64-qt5-base
 	source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
 	source = 0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
 	sha256sums = SKIP
-	sha256sums = 8ec72a1bb610e30a06c5bd301e0f502a4b1098e4f7709950d42f8d4f6b4529b1
-	sha256sums = 3e2150bf9fd9b7bf4e02a7355b3316f1129159de4523dd56e2e002c17461a06b
-	sha256sums = e18708d7a35920fff7b366cd98fabf87dda254b940581df2a3768dd22be86989
-	sha256sums = 8be908199db7ed2d11dfa5b1a8b037a183e1a331b818e511a62ed366e56e322b
-	sha256sums = ea9abbd04d03beb28682824750449ec734d0cd5980d18e43ee8c43a081522a39
-	sha256sums = ede654c3021e9b2b5672fe67e6f3c8841dc3e9f59a16e1119adc5581021b6584
-	sha256sums = 238a37d318d46d02e6a0632e58824ec64e323bf1a80f04fd2ca673eeb7eac167
-	sha256sums = 1afa605f868eb859192c9e4a36474e2c9d3fd9808b8bbe83bf28fe44a0c5354a
-	sha256sums = 3c9c7d80b88d7da333c13b366e0807d3d1bea7641a6e8540142c2197e00fb177
-	sha256sums = ca065a912f79b3b8bd511d076e8d15e18802a7dc4baeb4f9af2a9ad1b2d65b25
-	sha256sums = 519cf065067d7d1a15d02735457576f85d3d32ed2548650e93866e0e903e88bc
-	sha256sums = 0811548a8f4c533f3b0df2b6114de673754aa269264a7bc99cc69db4228e24a8
-	sha256sums = e8e754415d38b286c94f4227a372ef9d875d5f7d5493a88815903d0d9425f198
-	sha256sums = ddddd2c328870aa66feed1415a34437cdbb6e086e6309fe5ac640cd551fdbc8d
-	sha256sums = 9cf7eac11820012cedd0f5da75e7690e83a80e7002af0dec283d4b424142c22d
-	sha256sums = 24e7863c621ab360c392b29244fcb2ffc4d116b8a5ef1f4e2a40841218c9bee1
-	sha256sums = 790fb8562e2eee0b80bf23d6123e2f2c537021d8bbbec45053b12b8330244f93
-	sha256sums = 6ff67b6c2c17478096409a90ee3e00b2a34b3e64dc8ecf24af8c4f33fbe9b083
-	sha256sums = 3ce30f710591ba5dddb7c3a5cf0f9743da203ecc84d2e727e6d0f6a2a9502db6
-	sha256sums = 80e5af98f00d73ad4210aa4fd4aed5f3259d7b965b2933568c30e539bb8a3fe3
-	sha256sums = 9409620a23301e6410310ef9c865f19b185b35fa52593fc75f3674c1c95be81d
-	sha256sums = d5fe2bcaa51e96ae1254d4596aabd4635d31959d15c2e5e6eefd238f824f1cf2
-	sha256sums = 2bfd85eb2dad9ffbd3ca0920208091e85792c3b3673beff3467929ef3f7c399d
-	sha256sums = 11d8dc525166ccbbc431fb3ed3a56540bfe26ad69b180c99ab6d3d9322d85ccc
-	sha256sums = a633e33bf22e33ba549bd7bec1dbb3c1896922ed9041239f70fe13b32162c836
-	sha256sums = 0057e150aed1f2119dd7dff27d21ed7f160ba398e9a4630c4f8ff979203dc8c2
-	sha256sums = 30395cee07666b2cab06051033e3532140e8c4258ab6d576ef6514b90731bc8d
-	sha256sums = a7ee924a26424c15f4a639f7e11ef154e70325c67e78d7d9231e7cff51fc01b2
-	sha256sums = 431bd1f62600f985a4160fcdb2e44a6d8fec807eadb2f68738f941a649335150
-	sha256sums = ba978e69e897e5ada1dce268517a5aeb356250052738c61730718f5014a39490
-	sha256sums = f6c3027f58205167f6a18e51463ee0702c1f4a57106ff6a75dff6c3a9e654ebc
-	sha256sums = 0f6796e6c7e0436b61bbc3947197f821732a07db900d440772054cf25a9ca9de
+	sha256sums = afba71c5989978f286179a49607976a35237496d86ac89be8757c899a40d537e
+	sha256sums = b030be6a881a7e1398676079581b7aa72d439989eb1f19092630c43ce0ea95d5
+	sha256sums = 8f964778a3c1d88643e9264e883b8733a8c7b0f4b02cf939e90fdf68842caa98
+	sha256sums = 2bed971bda26f4f0dfec4cce6e3ced11c47b310de50672f68a0dda287a588849
+	sha256sums = dfb2dff89fd4e40622212f042165156fa3ed2d469b6531f942199de33caad14f
+	sha256sums = a12a73536da03752abbdb30d4a9cc969ff428e9e3152980cd021640f905ce03b
+	sha256sums = 254f0b967ba8084880542dcd27b7fb641d36969006d1f5f0da9d54e1969b30a1
+	sha256sums = b8806f862bce296d55da97cb3273f6a7dcb92e7d1266b9610f88b994e1a3ad25
+	sha256sums = 6eb966cfeb80b5170fbd36e51f968a86d89dff532d1bef9daccbcf720b0474f2
+	sha256sums = 9da382aca0cf299d1f736c1adff9033706e4047be419264c6b9ae78370a04756
+	sha256sums = 7c8a923aa2bf5600c0f2993e4e869dab663f3dd2ab27c15035310c06661e4aed
+	sha256sums = ee873b1f6a6e543cb288b39f135b6450f861f5ebcc8b4a7d367ea1bdb197170a
+	sha256sums = b4ca4c64daf48cd1a7ca9d55e91d53294b719c50dd392ba84e0bdc1a8acc597f
+	sha256sums = 8f840fb187612cb28a94bd4a8083c83e29a42b2731e28f8686dcb37411cc69a9
+	sha256sums = 867e7ad44c2aac86f858d973a7af6514385a4f50d200f4259b30d470a3551b35
+	sha256sums = 13443e40d4a470219a2f6dc2dedcd988dd481ebe724f74fb5f1e7fa4fbe29e6e
+	sha256sums = 47b0f93c86108c03641efbdd97b54809a4ac0b575b86f27b7c6217e87320cda3
+	sha256sums = fcac1dd8349e98b20ac4041856fd1d22c56326697fae5ab53e1823caeba10b01
+	sha256sums = d4a31f994dbc39c9267bd2378f10212a5606a78d60956218349a4dc0faa4f215
+	sha256sums = 03dc0efe46cc96984c971e0e744bbf32cadc9fa65a58a9d6435f0ed59169409d
+	sha256sums = d1432fe90e63616e898d7f0c541fe28588101230ca3fe2e20da39365967a64f4
+	sha256sums = d9b68a39699e83674738d507bbe35290893085c8cee5f947ba74d3ef8eaa0a36
+	sha256sums = 6711df068cc141a72ec9a9d1d8d7afa0f718c2fe9799523d03ce47d1574efad0
+	sha256sums = ea2d56b4f2eebd9a83c13706f9e4e37dfe4ba92af76195b97a81230734cbb300
+	sha256sums = b872519418f451d8196fe22182a26994fb9b81c49ad6ca151b895e23e274cc7c
+	sha256sums = 4e7f7cfd9e0ab4f7251f32c5a6cf81b05e2435172f145b5caad64a5e12487116
+	sha256sums = e69332fb658d70256ba232726db853d55372a4f45a5a5b9479a21a10fe807d67
+	sha256sums = 19c5cc4283416942f1575284357a3c3a74bc625f95aecb80d2a8dcc7d2d8c08f
+	sha256sums = b924d45463042e345630b9d54460a8547749f3fa3a3ffb7de3c4e514e92a9a9b
+	sha256sums = 97657b673e434befb42ccb1c153d1094a6d1c23044eb7725aea3a64aaf2ec5b1
+	sha256sums = 562da92bdb7bf27dd44c2ae4f45381668fc80f1e8a0241b8c039c7e2884cfbae
+	sha256sums = 6cd22e4e73ecf402af473859aaedcb4ec62173605a2e4127d72ef73c6882b323
 
 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 13738b37a42d..c953a2dfd8c9 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 927aade0a5128c794f2d43c938b4d215061f7019 Mon Sep 17 00:00:00 2001
+From 07e6639a6c703155baeb18fef4924289ad635746 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.34.1
+2.35.1
 
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 8e6608437f76..f4d6020c5e17 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 e3642b6a82884670a4be3b0ad6921ce513083cb6 Mon Sep 17 00:00:00 2001
+From b0451c4c8ab8e1640172658d2dd70c142680fa8a 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.34.1
+2.35.1
 
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 1195133228b4..603c535a3344 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 21a3c586ea36240566a19ae97f8f53bbd31a86fc Mon Sep 17 00:00:00 2001
+From 148b5050b73fb0b90d18662731c0da7e83dc51df 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.34.1
+2.35.1
 
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch
index 8194b3948f1c..ad9f53a5cee0 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 89b22a5f59e9896363e4903bdcce4b9695b8400b Mon Sep 17 00:00:00 2001
+From 868525161830dfdb98ad2ae9b8a01b7778b3d133 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 04/32] Make sure *.pc files are installed correctly
@@ -10,10 +10,10 @@ Subject: [PATCH 04/32] Make sure *.pc files are installed correctly
  3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a901332312..f1e8966123 100644
+index dfbbde3b26..a33017e19d 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3218,7 +3218,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
  }
  
  QString
@@ -22,7 +22,7 @@ index a901332312..f1e8966123 100644
  {
      QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
      if (ret.isEmpty()) {
-@@ -3243,7 +3243,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
      if(fixify) {
          if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
              ret.prepend(project->first("DESTDIR").toQString());
@@ -36,7 +36,7 @@ index a901332312..f1e8966123 100644
      return ret;
  }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index dc612c392c..7bfd2e1953 100644
+index 0ea587f607..6bf24d4708 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
 @@ -96,7 +96,7 @@ protected:
@@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.34.1
+2.35.1
 
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 cbaf468a7d89..6b0badb1f29e 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 92edc381d36a1d6842c5e7369538e9208e87bc0d Mon Sep 17 00:00:00 2001
+From c9293396ea6dad4f014c03d2b1e187e5027cb013 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.34.1
+2.35.1
 
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 a1bccf59fc11..2e321aea5380 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 425dab657c6268a8408182dba60429cafff1a237 Mon Sep 17 00:00:00 2001
+From 8a31b70973aed143bc85bcace439a626f3dac7ac Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 06/32] Prevent debug library names in pkg-config files
@@ -15,10 +15,10 @@ files for the debug build an unique file name.
  1 file changed, 3 insertions(+)
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index f1e8966123..f45b6c9fd5 100644
+index a33017e19d..62a06d3560 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3232,6 +3232,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
          if (dot != -1)
              ret = ret.left(dot);
      }
@@ -29,5 +29,5 @@ index f1e8966123..f45b6c9fd5 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.34.1
+2.35.1
 
diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch
index d437a8aa52c6..ea40917b575b 100644
--- a/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/0007-Fix-linking-against-shared-static-libpng.patch
@@ -1,4 +1,4 @@
-From 634a78d7be8e14aa00eaa07315999890539a9bc1 Mon Sep 17 00:00:00 2001
+From 1ce5d69a238d74fdaa042060b75d2b35e94c5e8c 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.34.1
+2.35.1
 
diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch
index eb3cbd89fc62..e974aeb99f86 100644
--- a/0008-Fix-linking-against-static-D-Bus.patch
+++ b/0008-Fix-linking-against-static-D-Bus.patch
@@ -1,4 +1,4 @@
-From 7babbe2dd76fd091b09b5aae1b5b0e70287a5763 Mon Sep 17 00:00:00 2001
+From f96c7e9b07643459104d381d3de77170ed5c10ba 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
@@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.34.1
+2.35.1
 
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 2f3cb912fae5..4de8bfdf7869 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 14db0a00799e773d98f75f70d829047fc9edaedd Mon Sep 17 00:00:00 2001
+From 57b2037ddf96f1254bc8c8e239bfeddd0383c916 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
@@ -25,5 +25,5 @@ index fedc80fa18..e308b5b7d7 100644
                      },
                      "condition": "config.win32 && features.shared"
 -- 
-2.34.1
+2.35.1
 
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
index 090ae4f30d9d..f8118c170486 100644
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ b/0010-Fix-linking-against-static-freetype2.patch
@@ -1,4 +1,4 @@
-From ab442dec4f84e5c206f4dcb17de8b8152dd18e40 Mon Sep 17 00:00:00 2001
+From b53ca6006f70650ccb5d9c7565c4d784d859241e 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..2fe0a018b1 100644
                  { "libs": "-lfreetype" }
              ],
 -- 
-2.34.1
+2.35.1
 
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch
index c0e67f5404bf..1b52479fa98a 100644
--- a/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/0011-Fix-linking-against-static-harfbuzz.patch
@@ -1,4 +1,4 @@
-From ec1db76a3ea8531b253dfec1d3f2e79679691994 Mon Sep 17 00:00:00 2001
+From 51095c685e065d60263c3ee14b29f3e13ce4659a 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 2fe0a018b1..ceeee23164 100644
          },
          "imf": {
 -- 
-2.34.1
+2.35.1
 
diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch
index 214304c5559c..be6f4e851582 100644
--- a/0012-Fix-linking-against-static-pcre.patch
+++ b/0012-Fix-linking-against-static-pcre.patch
@@ -1,4 +1,4 @@
-From a3cdbe8bf3c7e5ffd6df95ff5859d404ede0989e Mon Sep 17 00:00:00 2001
+From 462fdd6b868c3c0be6f499b62701d1b71e44e29a 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 d7e3cc5ee2..e17c19fbae 100644
  #include <pcre2.h>
  
 -- 
-2.34.1
+2.35.1
 
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch
index 215312d692f6..53a92c3e7cef 100644
--- a/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0013-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,4 +1,4 @@
-From ce8a8e71aa6ab234fd44e1f278c0c9e7bfead9c8 Mon Sep 17 00:00:00 2001
+From 5bb1a2aa7ac776317f9dd0d2a7ef2d9da1ae731e 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.34.1
+2.35.1
 
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
index 00a97c3e5bf6..1fe975e24cc0 100644
--- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,4 +1,4 @@
-From 55053533188a4c7bfafc69af8cf3f5f4f85eccaf Mon Sep 17 00:00:00 2001
+From 6658c3e842f014e945b4a92f8f07d161a00fc245 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.34.1
+2.35.1
 
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index 814a78efc21a..e377df967ce9 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,4 +1,4 @@
-From 03a7c67b5122002ae7a9423a36627cdb5c36f294 Mon Sep 17 00:00:00 2001
+From 41922a8bda8c15d44ebe8e3cb7fa36f3da8d2679 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.34.1
+2.35.1
 
diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch
index 03805db83702..ecbf2830d5e6 100644
--- a/0016-Enable-rpath-for-build-tools.patch
+++ b/0016-Enable-rpath-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 296a4630e1e2dd947a4d30cb504d8e4b34263470 Mon Sep 17 00:00:00 2001
+From d5903df4fe71a8dda22742452f8c2ba0e8ce0919 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.34.1
+2.35.1
 
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch
index ecfac5bd30d3..d5b45117dd1c 100644
--- a/0017-Use-system-zlib-for-build-tools.patch
+++ b/0017-Use-system-zlib-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 1cc52bf44db9a74f5173ec793bc61ae85e580fd6 Mon Sep 17 00:00:00 2001
+From 7da85c7ad051f9d5db2081e3ea33e774e8c4d854 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.34.1
+2.35.1
 
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch
index 5e7f39141bf8..b332e6a684d5 100644
--- a/0018-Merge-shared-and-static-library-trees.patch
+++ b/0018-Merge-shared-and-static-library-trees.patch
@@ -1,4 +1,4 @@
-From fdf07a6a7323b2ff9117e3d986b893504c747941 Mon Sep 17 00:00:00 2001
+From 4316cdf19818e71fb41d307af5f6ba0b06bb0fe8 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
@@ -139,10 +139,10 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index f45b6c9fd5..39221caf68 100644
+index 62a06d3560..bd8bd91438 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3235,6 +3235,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
      if (project->isActiveConfig("debug")) {
          ret += "d";
      }
@@ -152,7 +152,7 @@ index f45b6c9fd5..39221caf68 100644
      ret += Option::pkgcfg_ext;
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
-@@ -3411,11 +3414,11 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3420,11 +3423,11 @@ MakefileGenerator::writePkgConfigFile()
      t << Qt::endl;
  
      // requires
@@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
  mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
  INSTALLS += mkspecs
 -- 
-2.34.1
+2.35.1
 
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch
index 4c59547ad65d..a381b2c8b6d8 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 a4b41ca8bd9b6bb761212d49ffe72955f7c84f14 Mon Sep 17 00:00:00 2001
+From d3e4d0719bd0aafe543fb6997eeb4152c8fec6e0 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
@@ -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.34.1
+2.35.1
 
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 d1ed2e89a3d9..b7081c8b80a4 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 49bd362a2316a8458d73d8fa7bca69aa3b1ca789 Mon Sep 17 00:00:00 2001
+From 892dcb09da7c69d03be98e4fa3aaf4ceb531e306 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
@@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644
 +endif()
 \ No newline at end of file
 -- 
-2.34.1
+2.35.1
 
diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch
index 2d84c4eba16c..374875facbca 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 253d977b4ad945380287e2c27c09460490b3a036 Mon Sep 17 00:00:00 2001
+From 95ce669b134f215030dfc1a20c037dc32a777ea6 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
@@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.34.1
+2.35.1
 
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 f317cefb94ff..63cca7885a22 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 ee27a8ee0036cf79efdab7bb022a8ba2cc63dcb0 Mon Sep 17 00:00:00 2001
+From dd92ac8d02f789464af310afeec97e185bcc33cf 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.34.1
+2.35.1
 
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index 1a900a26e136..d53bf6c3fb1e 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From 088869c4c0cc55d9f2a75fb36381290cb09c6300 Mon Sep 17 00:00:00 2001
+From 8a1d0975d053a9ed231bf936418135224a546192 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
@@ -22,5 +22,5 @@ index 53c67f885b..8934b72291 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.34.1
+2.35.1
 
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
index 252f7229a111..3b87fdc65187 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 0e17318db9342d7a21c224cccbccec6185208291 Mon Sep 17 00:00:00 2001
+From 984c35e68ef3b5fc17a31d3019b675d2564fe83b 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.34.1
+2.35.1
 
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index a0ac34b28b50..210dfb7c102a 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From c9793154e618b2ee00bc03295e80315e92549be1 Mon Sep 17 00:00:00 2001
+From ebcf54083cb5a425e06d3a266ea9464db61137ea 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.34.1
+2.35.1
 
diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch
index 072a0d22f6f1..ac06309dff3e 100644
--- a/0026-Enable-and-fix-use-of-iconv.patch
+++ b/0026-Enable-and-fix-use-of-iconv.patch
@@ -1,4 +1,4 @@
-From f365c9f8672ae6b7e19db3162eef755a83e61161 Mon Sep 17 00:00:00 2001
+From 80e1027686310de70fff6a5d8065404857b8e795 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 9b5d19d41b..f649a9f6ef 100644
          },
          "icu": {
 -- 
-2.34.1
+2.35.1
 
diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch
index 5c50d46dc81f..e8ed0fb039ea 100644
--- a/0027-Ignore-failing-pkg-config-test.patch
+++ b/0027-Ignore-failing-pkg-config-test.patch
@@ -1,4 +1,4 @@
-From fb0caa03adc05ad835990a4a6e0829ce6ce50d09 Mon Sep 17 00:00:00 2001
+From b77702d4a42fe2c17c4ad4e4b3d084e33df33c97 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
@@ -21,5 +21,5 @@ index e308b5b7d7..928ee2afa1 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.34.1
+2.35.1
 
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 1c1be4f9da48..39501b85ee9f 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 e7b960e2af57c99d6843be5b8a59f8b72ce426a7 Mon Sep 17 00:00:00 2001
+From dd7bcb78b07a7fea031f18510af5acd2646f62c1 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.34.1
+2.35.1
 
diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch
index e346d631dfa6..017836df8ab7 100644
--- a/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,4 +1,4 @@
-From 59b05394ef1d6577319aee506d40764e8766c822 Mon Sep 17 00:00:00 2001
+From 8a556b7e428261a4061894e4303a327c3447cdf4 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.34.1
+2.35.1
 
diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch
index 33ac1e99d6b1..a0d5bc07da1c 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 213ff75ecdc5a996f799adbd595e612fa9a817dd Mon Sep 17 00:00:00 2001
+From a6da51cc47652a4dbc5d398304775221246a407b 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.34.1
+2.35.1
 
diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
index 7207a1686bf1..ba36aac8b3f0 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 c0198cc36d39682324b1b22b0f54827fdf0311de Mon Sep 17 00:00:00 2001
+From 3af5d47c2bde5b60b7170b417907e47bbb9f50c8 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.34.1
+2.35.1
 
diff --git a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
index 5d6f7af10819..387c8f726377 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 1ee9945ed930848e333ac5b12767cf42a7281fc8 Mon Sep 17 00:00:00 2001
+From 89dca3f775b1d5c8b3c1ffb9ec47ea7600bb330d 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 7b16e8c211..38f03b73d8 100644
          "Description": "FreeType is a freely available software library to render fonts.",
          "Homepage": "http://www.freetype.org",
 -- 
-2.34.1
+2.35.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 6478427cd828..0ca894680b7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,9 +17,10 @@
 
 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base
-pkgver=5.15.2+kde+r274
+pkgver=5.15.3+kde+r133
 pkgrel=1
-_commit=98aa64af7e1e677bd107bfb0c432cabf7c3a5e32
+_basever=${pkgver%%+*}
+_commit=e68ca8e51375d963b2391715f70b42707992dbd8
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('i686' 'x86_64')
 url='https://www.qt.io/'
@@ -69,51 +70,49 @@ 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'
-            '8ec72a1bb610e30a06c5bd301e0f502a4b1098e4f7709950d42f8d4f6b4529b1'
-            '3e2150bf9fd9b7bf4e02a7355b3316f1129159de4523dd56e2e002c17461a06b'
-            'e18708d7a35920fff7b366cd98fabf87dda254b940581df2a3768dd22be86989'
-            '8be908199db7ed2d11dfa5b1a8b037a183e1a331b818e511a62ed366e56e322b'
-            'ea9abbd04d03beb28682824750449ec734d0cd5980d18e43ee8c43a081522a39'
-            'ede654c3021e9b2b5672fe67e6f3c8841dc3e9f59a16e1119adc5581021b6584'
-            '238a37d318d46d02e6a0632e58824ec64e323bf1a80f04fd2ca673eeb7eac167'
-            '1afa605f868eb859192c9e4a36474e2c9d3fd9808b8bbe83bf28fe44a0c5354a'
-            '3c9c7d80b88d7da333c13b366e0807d3d1bea7641a6e8540142c2197e00fb177'
-            'ca065a912f79b3b8bd511d076e8d15e18802a7dc4baeb4f9af2a9ad1b2d65b25'
-            '519cf065067d7d1a15d02735457576f85d3d32ed2548650e93866e0e903e88bc'
-            '0811548a8f4c533f3b0df2b6114de673754aa269264a7bc99cc69db4228e24a8'
-            'e8e754415d38b286c94f4227a372ef9d875d5f7d5493a88815903d0d9425f198'
-            'ddddd2c328870aa66feed1415a34437cdbb6e086e6309fe5ac640cd551fdbc8d'
-            '9cf7eac11820012cedd0f5da75e7690e83a80e7002af0dec283d4b424142c22d'
-            '24e7863c621ab360c392b29244fcb2ffc4d116b8a5ef1f4e2a40841218c9bee1'
-            '790fb8562e2eee0b80bf23d6123e2f2c537021d8bbbec45053b12b8330244f93'
-            '6ff67b6c2c17478096409a90ee3e00b2a34b3e64dc8ecf24af8c4f33fbe9b083'
-            '3ce30f710591ba5dddb7c3a5cf0f9743da203ecc84d2e727e6d0f6a2a9502db6'
-            '80e5af98f00d73ad4210aa4fd4aed5f3259d7b965b2933568c30e539bb8a3fe3'
-            '9409620a23301e6410310ef9c865f19b185b35fa52593fc75f3674c1c95be81d'
-            'd5fe2bcaa51e96ae1254d4596aabd4635d31959d15c2e5e6eefd238f824f1cf2'
-            '2bfd85eb2dad9ffbd3ca0920208091e85792c3b3673beff3467929ef3f7c399d'
-            '11d8dc525166ccbbc431fb3ed3a56540bfe26ad69b180c99ab6d3d9322d85ccc'
-            'a633e33bf22e33ba549bd7bec1dbb3c1896922ed9041239f70fe13b32162c836'
-            '0057e150aed1f2119dd7dff27d21ed7f160ba398e9a4630c4f8ff979203dc8c2'
-            '30395cee07666b2cab06051033e3532140e8c4258ab6d576ef6514b90731bc8d'
-            'a7ee924a26424c15f4a639f7e11ef154e70325c67e78d7d9231e7cff51fc01b2'
-            '431bd1f62600f985a4160fcdb2e44a6d8fec807eadb2f68738f941a649335150'
-            'ba978e69e897e5ada1dce268517a5aeb356250052738c61730718f5014a39490'
-            'f6c3027f58205167f6a18e51463ee0702c1f4a57106ff6a75dff6c3a9e654ebc'
-            '0f6796e6c7e0436b61bbc3947197f821732a07db900d440772054cf25a9ca9de')
+            'afba71c5989978f286179a49607976a35237496d86ac89be8757c899a40d537e'
+            'b030be6a881a7e1398676079581b7aa72d439989eb1f19092630c43ce0ea95d5'
+            '8f964778a3c1d88643e9264e883b8733a8c7b0f4b02cf939e90fdf68842caa98'
+            '2bed971bda26f4f0dfec4cce6e3ced11c47b310de50672f68a0dda287a588849'
+            'dfb2dff89fd4e40622212f042165156fa3ed2d469b6531f942199de33caad14f'
+            'a12a73536da03752abbdb30d4a9cc969ff428e9e3152980cd021640f905ce03b'
+            '254f0b967ba8084880542dcd27b7fb641d36969006d1f5f0da9d54e1969b30a1'
+            'b8806f862bce296d55da97cb3273f6a7dcb92e7d1266b9610f88b994e1a3ad25'
+            '6eb966cfeb80b5170fbd36e51f968a86d89dff532d1bef9daccbcf720b0474f2'
+            '9da382aca0cf299d1f736c1adff9033706e4047be419264c6b9ae78370a04756'
+            '7c8a923aa2bf5600c0f2993e4e869dab663f3dd2ab27c15035310c06661e4aed'
+            'ee873b1f6a6e543cb288b39f135b6450f861f5ebcc8b4a7d367ea1bdb197170a'
+            'b4ca4c64daf48cd1a7ca9d55e91d53294b719c50dd392ba84e0bdc1a8acc597f'
+            '8f840fb187612cb28a94bd4a8083c83e29a42b2731e28f8686dcb37411cc69a9'
+            '867e7ad44c2aac86f858d973a7af6514385a4f50d200f4259b30d470a3551b35'
+            '13443e40d4a470219a2f6dc2dedcd988dd481ebe724f74fb5f1e7fa4fbe29e6e'
+            '47b0f93c86108c03641efbdd97b54809a4ac0b575b86f27b7c6217e87320cda3'
+            'fcac1dd8349e98b20ac4041856fd1d22c56326697fae5ab53e1823caeba10b01'
+            'd4a31f994dbc39c9267bd2378f10212a5606a78d60956218349a4dc0faa4f215'
+            '03dc0efe46cc96984c971e0e744bbf32cadc9fa65a58a9d6435f0ed59169409d'
+            'd1432fe90e63616e898d7f0c541fe28588101230ca3fe2e20da39365967a64f4'
+            'd9b68a39699e83674738d507bbe35290893085c8cee5f947ba74d3ef8eaa0a36'
+            '6711df068cc141a72ec9a9d1d8d7afa0f718c2fe9799523d03ce47d1574efad0'
+            'ea2d56b4f2eebd9a83c13706f9e4e37dfe4ba92af76195b97a81230734cbb300'
+            'b872519418f451d8196fe22182a26994fb9b81c49ad6ca151b895e23e274cc7c'
+            '4e7f7cfd9e0ab4f7251f32c5a6cf81b05e2435172f145b5caad64a5e12487116'
+            'e69332fb658d70256ba232726db853d55372a4f45a5a5b9479a21a10fe807d67'
+            '19c5cc4283416942f1575284357a3c3a74bc625f95aecb80d2a8dcc7d2d8c08f'
+            'b924d45463042e345630b9d54460a8547749f3fa3a3ffb7de3c4e514e92a9a9b'
+            '97657b673e434befb42ccb1c153d1094a6d1c23044eb7725aea3a64aaf2ec5b1'
+            '562da92bdb7bf27dd44c2ae4f45381668fc80f1e8a0241b8c039c7e2884cfbae'
+            '6cd22e4e73ecf402af473859aaedcb4ec62173605a2e4127d72ef73c6882b323')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 pkgver() {
   cd $_pkgfqn
-  echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
 }
 
 prepare() {
   cd "${srcdir}/${_pkgfqn}"
 
-  git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
-
   # apply patches; further descriptions can be found in patch files itself
   for patch in "$srcdir/"*.patch; do
     msg2 "Applying patch $patch"