diff --git a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
index 107e15df..7857aeb6 100644
--- a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
@@ -16,7 +16,7 @@
 pkgname=<%= $package_name %>
 _qtver=6.6.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
diff --git a/qt6-base/android-aarch64/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch b/qt6-base/android-aarch64/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
new file mode 120000
index 00000000..5577b351
--- /dev/null
+++ b/qt6-base/android-aarch64/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
@@ -0,0 +1 @@
+../mingw-w64/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
\ No newline at end of file
diff --git a/qt6-base/android-aarch64/PKGBUILD b/qt6-base/android-aarch64/PKGBUILD
index a1ba2730..f4e653b9 100644
--- a/qt6-base/android-aarch64/PKGBUILD
+++ b/qt6-base/android-aarch64/PKGBUILD
@@ -39,20 +39,22 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         '0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch'
         '0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
         '0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
-        '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
+        '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch'
+        '0013-Allow-overriding-preference-for-shared-libzstd-libra.patch')
 sha256sums=('039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e'
-            '8835870bb7600c7f3a844baa3516f5680222944d32a29335c0c4ecb0bdb36156'
-            '25d31bfacc0a0b09ee647a6c1ca3a2f58843ac069e7f4eaea799912af185aba4'
-            '6671d730d153d7227b41e91d29e617fef1726d29b2858e710fb6cf0ded6b2827'
-            '251d6900c4ae8941580bace0a868f7a5c34acb424b85b490d1db16409b2846f4'
-            '332593f2152112b44b28dae18f9646a7925185ae3b7f4a4a3ab3d4fe6c9e0976'
-            '5123c48b9fb473e68abcef27bb6c973ce781c03b5d6833061bbeee9b8385fd6f'
-            'fbc79a9ae583abe8ac237068ece7aafd6ff079d8d55b5da7852c419baf33c222'
-            'f3e0958531d404f2a6c8940497a01e6444d96621e8a9f92018a513d831c77439'
-            'ed682bc0fabce30e883a5dd191b79ca6f097a03e86ad787a3d4d459529695737'
-            '89c3d3eec334c66e90ebf164f82977e7ca2303de378528ef7dc2fdbfc59efdee'
-            '15239108e2b6eef485114ad2323feb3ace0c44c19911a4133793ebc1c3772869'
-            '2b988b2695f1e82386a2d2bdd61ce6bd0d9ec958d6f93d1006a3e3d71373e997')
+            '76a2d1f30653f1de8738e8a84875e3b65df2742d1b9c2970d9125a110e42147c'
+            '05d8a7eb4c76f14e4671ec69698c544d2bb3d10c63f7bb6b0564cb4ad038635b'
+            '5c4ffce869c20f16f4a481b780718cec097bead67451649d96638de27a9647d4'
+            'c731472656cd4881e4371c37a9e16e89ee0afe53618fc48585f95c84d13cf080'
+            'b7681214860c627ccc7a6628e8d2b2d5fd14c72fbd48b453a74fbe8c4122973f'
+            'd1f41b62738376bbe981760d7b8eb6980bda2830a4208341e25eda40b0440121'
+            '622d16f443c9e4a1ded1cf1af264a923e64c880f4a2885d2a63d9be7fbbe95f2'
+            '5186fb24fd3a746f1ad06a423a9c11379f63e260dcee574391940240f6fa93bb'
+            'c72b8e8bcbb9bc4dc3b9008bff109a52e29694443d9a164906ed3c5ba78c20a7'
+            'e6842b36b691cfa4a595ba62ea2bc3bddf616a1aa0a308c4b7c95f7c29c2ceb2'
+            '26ab4278577b58a2f038378a5f7038053d36639ab3af1071c54745c254bcc888'
+            '641bce64d7a8ba16238e2ed4285c3bcf49edb82287e9528379f4b69a0159b9e6'
+            '8fc74155ae001841f01e372813dc1b42de791e38310590331089e73d9427a584')
 
 prepare () {
   cd $_pkgfqn
diff --git a/qt6-base/mingw-w64-static/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch b/qt6-base/mingw-w64-static/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
new file mode 120000
index 00000000..5577b351
--- /dev/null
+++ b/qt6-base/mingw-w64-static/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
@@ -0,0 +1 @@
+../mingw-w64/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
\ No newline at end of file
diff --git a/qt6-base/mingw-w64-static/PKGBUILD b/qt6-base/mingw-w64-static/PKGBUILD
index acbda0af..4e33d8ff 100644
--- a/qt6-base/mingw-w64-static/PKGBUILD
+++ b/qt6-base/mingw-w64-static/PKGBUILD
@@ -13,7 +13,7 @@
 pkgname=mingw-w64-qt6-base-static
 _qtver=6.6.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -42,20 +42,22 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         '0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch'
         '0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
         '0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
-        '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
+        '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch'
+        '0013-Allow-overriding-preference-for-shared-libzstd-libra.patch')
 sha256sums=('039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e'
-            '8835870bb7600c7f3a844baa3516f5680222944d32a29335c0c4ecb0bdb36156'
-            '25d31bfacc0a0b09ee647a6c1ca3a2f58843ac069e7f4eaea799912af185aba4'
-            '6671d730d153d7227b41e91d29e617fef1726d29b2858e710fb6cf0ded6b2827'
-            '251d6900c4ae8941580bace0a868f7a5c34acb424b85b490d1db16409b2846f4'
-            '332593f2152112b44b28dae18f9646a7925185ae3b7f4a4a3ab3d4fe6c9e0976'
-            '5123c48b9fb473e68abcef27bb6c973ce781c03b5d6833061bbeee9b8385fd6f'
-            'fbc79a9ae583abe8ac237068ece7aafd6ff079d8d55b5da7852c419baf33c222'
-            'f3e0958531d404f2a6c8940497a01e6444d96621e8a9f92018a513d831c77439'
-            'ed682bc0fabce30e883a5dd191b79ca6f097a03e86ad787a3d4d459529695737'
-            '89c3d3eec334c66e90ebf164f82977e7ca2303de378528ef7dc2fdbfc59efdee'
-            '15239108e2b6eef485114ad2323feb3ace0c44c19911a4133793ebc1c3772869'
-            '2b988b2695f1e82386a2d2bdd61ce6bd0d9ec958d6f93d1006a3e3d71373e997')
+            '76a2d1f30653f1de8738e8a84875e3b65df2742d1b9c2970d9125a110e42147c'
+            '05d8a7eb4c76f14e4671ec69698c544d2bb3d10c63f7bb6b0564cb4ad038635b'
+            '5c4ffce869c20f16f4a481b780718cec097bead67451649d96638de27a9647d4'
+            'c731472656cd4881e4371c37a9e16e89ee0afe53618fc48585f95c84d13cf080'
+            'b7681214860c627ccc7a6628e8d2b2d5fd14c72fbd48b453a74fbe8c4122973f'
+            'd1f41b62738376bbe981760d7b8eb6980bda2830a4208341e25eda40b0440121'
+            '622d16f443c9e4a1ded1cf1af264a923e64c880f4a2885d2a63d9be7fbbe95f2'
+            '5186fb24fd3a746f1ad06a423a9c11379f63e260dcee574391940240f6fa93bb'
+            'c72b8e8bcbb9bc4dc3b9008bff109a52e29694443d9a164906ed3c5ba78c20a7'
+            'e6842b36b691cfa4a595ba62ea2bc3bddf616a1aa0a308c4b7c95f7c29c2ceb2'
+            '26ab4278577b58a2f038378a5f7038053d36639ab3af1071c54745c254bcc888'
+            '641bce64d7a8ba16238e2ed4285c3bcf49edb82287e9528379f4b69a0159b9e6'
+            '8fc74155ae001841f01e372813dc1b42de791e38310590331089e73d9427a584')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch
index de88bb59..4ec022f5 100644
--- a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,7 +1,7 @@
 From b13fda4a1deefb1c795503535bc20615731a8d0a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 22:08:10 +0100
-Subject: [PATCH 01/12] Use CMake's default import library suffix
+Subject: [PATCH 01/13] Use CMake's default import library suffix
 
 Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
 ---
@@ -110,5 +110,5 @@ index 349bb4b419..d666082998 100644
              get_target_property(target_type ${target} TYPE)
              if(target_type STREQUAL "STATIC_LIBRARY")
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch
index 5c55a139..ed6e525f 100644
--- a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch
+++ b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch
@@ -1,7 +1,7 @@
 From 9641a56b56014409f9c44ae3223d2f22f5412ae2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 7 Oct 2020 12:13:37 +0200
-Subject: [PATCH 02/12] Fix finding D-Bus
+Subject: [PATCH 02/13] Fix finding D-Bus
 
 Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
 ---
@@ -20,5 +20,5 @@ index e2a58790c4..8e0ed81f89 100644
 +    set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
 +endif()
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index 0c2a5de4..3ad138c0 100644
--- a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,7 +1,7 @@
 From cfbe16ce8474c2e1a39454873a55fcbbbbb80ecf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:13:19 +0100
-Subject: [PATCH 03/12] Fix using static PCRE2 and DBus-1
+Subject: [PATCH 03/13] Fix using static PCRE2 and DBus-1
 
 When making a static build of Qt we're using the static version of these
 libraries and must define the corresponding macros.
@@ -44,5 +44,5 @@ index e3008be761..9c745c16c4 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch
index 66f5778b..76446218 100644
--- a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,7 +1,7 @@
 From bfe5828cd356200514dcc3ed3ed2e2a0bc90d93c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:59:33 +0100
-Subject: [PATCH 04/12] Fix transitive dependencies (of static libraries)
+Subject: [PATCH 04/13] Fix transitive dependencies (of static libraries)
 
 The dependencies of these libraries are not reliably picked up by their
 corresponding find modules. This change allows adding the required
@@ -132,5 +132,5 @@ index d392f4dfa5..165c345e1b 100644
          Qt::CorePrivate
          Qt::SqlPrivate
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
index 16009cd7..0e42a507 100644
--- a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@@ -1,7 +1,7 @@
 From ad552b55e4c1861178ae02fb67db5221a8eefd3e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 2 Nov 2020 13:47:45 +0100
-Subject: [PATCH 05/12] Fix libjpeg workaround for conflict with rpcndr.h
+Subject: [PATCH 05/13] Fix libjpeg workaround for conflict with rpcndr.h
 
 Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of
 libjpeg seems to take care of the conflict already as long as jconfig.h is
@@ -25,5 +25,5 @@ index 0d72ba01d0..a706fb4cea 100644
  #ifdef const
  #  undef const          // remove crazy C hackery in jconfig.h
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch
index be311724..4ffeb4fc 100644
--- a/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch
@@ -1,7 +1,7 @@
 From 8b967a657f4814b834f805a4c3139ba342e126dd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:33:12 +0100
-Subject: [PATCH 06/12] Support finding static MariaDB client library
+Subject: [PATCH 06/13] Support finding static MariaDB client library
 
 We need to reverse the order to look for mariadb first (and only then
 for mysql) because otherwise it would pick up the static library
@@ -34,5 +34,5 @@ index b61d0107f2..6fb26e51f1 100644
  endif()
  
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
index 18ddc90c..e3669e96 100644
--- a/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,7 +1,7 @@
 From c4643677a73f0277e472a867039fd0b09656d71a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:34:09 +0100
-Subject: [PATCH 07/12] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
+Subject: [PATCH 07/13] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
  static libraries
 
 Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
@@ -25,5 +25,5 @@ index e8e981542c..bd3dca6970 100644
  #
  # Macros and functions for building Qt modules
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/qt6-base/mingw-w64/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
index 12b75464..5904e921 100644
--- a/qt6-base/mingw-w64/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/qt6-base/mingw-w64/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
@@ -1,7 +1,7 @@
 From b83084b3bbd07fbed4017a78d3464ace6187a86f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 Jun 2021 22:24:12 +0200
-Subject: [PATCH 08/12] Fix crashes in rasterization code using setjmp
+Subject: [PATCH 08/13] Fix crashes in rasterization code using setjmp
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -248,5 +248,5 @@ index 59c03053e9..43d9033d38 100644
          "Description": "FreeType is a freely available software library to render fonts.",
          "Homepage": "http://www.freetype.org",
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/qt6-base/mingw-w64/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
index e0fa7c72..8a3af325 100644
--- a/qt6-base/mingw-w64/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
+++ b/qt6-base/mingw-w64/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
@@ -1,7 +1,7 @@
 From e7bbea84b04d164f0098f073d591d788be327fda Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 24 Apr 2022 23:00:27 +0200
-Subject: [PATCH 09/12] Find fontconfig via pkg-config for correct handling of
+Subject: [PATCH 09/13] Find fontconfig via pkg-config for correct handling of
  its dependencies
 
 CMake's own find module unforunately does not consider fontconfig's deps so
@@ -59,5 +59,5 @@ index 02a80130d5..4b8ef6e83d 100644
  qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm)
  qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz)
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch b/qt6-base/mingw-w64/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
index ed80c636..fd1245f6 100644
--- a/qt6-base/mingw-w64/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
+++ b/qt6-base/mingw-w64/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
@@ -1,7 +1,7 @@
 From 13f30391a77138f59308bc2280140aec63e989d6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 24 Apr 2022 23:49:36 +0200
-Subject: [PATCH 10/12] Fix dependency of xcb-image on xcb-util
+Subject: [PATCH 10/13] Fix dependency of xcb-image on xcb-util
 
 Considering this linker error, xcb-image apparently depends on xcb-util:
 ```
@@ -44,5 +44,5 @@ index dc60289401..3dd06d4cd0 100644
  set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
  set(XCB_XVMC_component_deps XCB XV)
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch b/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
index 2e133180..7e4000e0 100644
--- a/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
+++ b/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
@@ -1,7 +1,7 @@
 From 318957c27021b56074b706bb35ac5e0088abb9f8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 26 Apr 2022 20:16:31 +0200
-Subject: [PATCH 11/12] Allow using properties of PkgConfig targets for glib2
+Subject: [PATCH 11/13] Allow using properties of PkgConfig targets for glib2
  to handle deps of static glib2
 
 Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908
@@ -70,5 +70,5 @@ index a6a16b494f..a5da57824c 100644
  set_package_properties(GLIB2 PROPERTIES
    URL "https://wiki.gnome.org/Projects/GLib"
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch b/qt6-base/mingw-w64/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
index 8fd158e5..9fa25562 100644
--- a/qt6-base/mingw-w64/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
+++ b/qt6-base/mingw-w64/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
@@ -1,7 +1,7 @@
 From 0274361d39e2f3118d3bf5f7a6b04b3e2dcbd6fd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 1 May 2022 23:28:26 +0200
-Subject: [PATCH 12/12] Allow using properties of PkgConfig targets for Wayland
+Subject: [PATCH 12/13] Allow using properties of PkgConfig targets for Wayland
  to handle deps of static libs
 
 Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27
@@ -49,5 +49,5 @@ index 233cc88d02..875c71377c 100644
  set_package_properties(Wayland PROPERTIES
      URL "http://wayland.freedesktop.org"
 -- 
-2.42.0
+2.42.1
 
diff --git a/qt6-base/mingw-w64/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch b/qt6-base/mingw-w64/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
new file mode 100644
index 00000000..f2ed9906
--- /dev/null
+++ b/qt6-base/mingw-w64/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
@@ -0,0 +1,38 @@
+From ef3dd72e5f18ff2bbefb941f860e44b9bbe6d64d Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Tue, 7 Nov 2023 23:58:54 +0100
+Subject: [PATCH 13/13] Allow overriding preference for shared libzstd library
+
+As of 3f45905953d57e0174059d7d9d6bc75c3c1c406c Qt prefers the shared zstd
+library. This breaks static builds. With this change the static library is
+preferred again when CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE is set (which is
+done by the CMake toolchain file used by Arch Linux mingw-w64 packaging).
+
+Change-Id: I38b8a15929e6b7044d827c095f13a27e0adf11da
+---
+ cmake/FindWrapZSTD.cmake | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/FindWrapZSTD.cmake b/cmake/FindWrapZSTD.cmake
+index fb424236b8..12a3178518 100644
+--- a/cmake/FindWrapZSTD.cmake
++++ b/cmake/FindWrapZSTD.cmake
+@@ -28,10 +28,12 @@ include(FindPackageHandleStandardArgs)
+ if(TARGET zstd::libzstd_static OR TARGET zstd::libzstd_shared)
+     find_package_handle_standard_args(WrapZSTD
+                                       REQUIRED_VARS zstd_VERSION VERSION_VAR zstd_VERSION)
+-    if(TARGET zstd::libzstd_shared)
+-        set(zstdtargetsuffix "_shared")
+-    else()
++
++    if ((CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE AND TARGET zstd::libzstd_static)
++        OR (NOT TARGET zstd::libzstd_shared))
+         set(zstdtargetsuffix "_static")
++    else()
++        set(zstdtargetsuffix "_shared")
+     endif()
+     if(NOT TARGET WrapZSTD::WrapZSTD)
+         add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED)
+-- 
+2.42.1
+
diff --git a/qt6-base/mingw-w64/PKGBUILD b/qt6-base/mingw-w64/PKGBUILD
index ccb9f6b2..de24d5bd 100644
--- a/qt6-base/mingw-w64/PKGBUILD
+++ b/qt6-base/mingw-w64/PKGBUILD
@@ -13,7 +13,7 @@
 pkgname=mingw-w64-qt6-base
 _qtver=6.6.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -42,20 +42,22 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         '0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch'
         '0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
         '0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
-        '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
+        '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch'
+        '0013-Allow-overriding-preference-for-shared-libzstd-libra.patch')
 sha256sums=('039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e'
-            '8835870bb7600c7f3a844baa3516f5680222944d32a29335c0c4ecb0bdb36156'
-            '25d31bfacc0a0b09ee647a6c1ca3a2f58843ac069e7f4eaea799912af185aba4'
-            '6671d730d153d7227b41e91d29e617fef1726d29b2858e710fb6cf0ded6b2827'
-            '251d6900c4ae8941580bace0a868f7a5c34acb424b85b490d1db16409b2846f4'
-            '332593f2152112b44b28dae18f9646a7925185ae3b7f4a4a3ab3d4fe6c9e0976'
-            '5123c48b9fb473e68abcef27bb6c973ce781c03b5d6833061bbeee9b8385fd6f'
-            'fbc79a9ae583abe8ac237068ece7aafd6ff079d8d55b5da7852c419baf33c222'
-            'f3e0958531d404f2a6c8940497a01e6444d96621e8a9f92018a513d831c77439'
-            'ed682bc0fabce30e883a5dd191b79ca6f097a03e86ad787a3d4d459529695737'
-            '89c3d3eec334c66e90ebf164f82977e7ca2303de378528ef7dc2fdbfc59efdee'
-            '15239108e2b6eef485114ad2323feb3ace0c44c19911a4133793ebc1c3772869'
-            '2b988b2695f1e82386a2d2bdd61ce6bd0d9ec958d6f93d1006a3e3d71373e997')
+            '76a2d1f30653f1de8738e8a84875e3b65df2742d1b9c2970d9125a110e42147c'
+            '05d8a7eb4c76f14e4671ec69698c544d2bb3d10c63f7bb6b0564cb4ad038635b'
+            '5c4ffce869c20f16f4a481b780718cec097bead67451649d96638de27a9647d4'
+            'c731472656cd4881e4371c37a9e16e89ee0afe53618fc48585f95c84d13cf080'
+            'b7681214860c627ccc7a6628e8d2b2d5fd14c72fbd48b453a74fbe8c4122973f'
+            'd1f41b62738376bbe981760d7b8eb6980bda2830a4208341e25eda40b0440121'
+            '622d16f443c9e4a1ded1cf1af264a923e64c880f4a2885d2a63d9be7fbbe95f2'
+            '5186fb24fd3a746f1ad06a423a9c11379f63e260dcee574391940240f6fa93bb'
+            'c72b8e8bcbb9bc4dc3b9008bff109a52e29694443d9a164906ed3c5ba78c20a7'
+            'e6842b36b691cfa4a595ba62ea2bc3bddf616a1aa0a308c4b7c95f7c29c2ceb2'
+            '26ab4278577b58a2f038378a5f7038053d36639ab3af1071c54745c254bcc888'
+            '641bce64d7a8ba16238e2ed4285c3bcf49edb82287e9528379f4b69a0159b9e6'
+            '8fc74155ae001841f01e372813dc1b42de791e38310590331089e73d9427a584')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qt6-base/static-compat/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch b/qt6-base/static-compat/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
new file mode 120000
index 00000000..5577b351
--- /dev/null
+++ b/qt6-base/static-compat/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
@@ -0,0 +1 @@
+../mingw-w64/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
\ No newline at end of file
diff --git a/qt6-base/static-compat/PKGBUILD b/qt6-base/static-compat/PKGBUILD
index bcce151b..735a6d18 100644
--- a/qt6-base/static-compat/PKGBUILD
+++ b/qt6-base/static-compat/PKGBUILD
@@ -41,20 +41,22 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         '0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch'
         '0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
         '0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
-        '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
+        '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch'
+        '0013-Allow-overriding-preference-for-shared-libzstd-libra.patch')
 sha256sums=('039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e'
-            '8835870bb7600c7f3a844baa3516f5680222944d32a29335c0c4ecb0bdb36156'
-            '25d31bfacc0a0b09ee647a6c1ca3a2f58843ac069e7f4eaea799912af185aba4'
-            '6671d730d153d7227b41e91d29e617fef1726d29b2858e710fb6cf0ded6b2827'
-            '251d6900c4ae8941580bace0a868f7a5c34acb424b85b490d1db16409b2846f4'
-            '332593f2152112b44b28dae18f9646a7925185ae3b7f4a4a3ab3d4fe6c9e0976'
-            '5123c48b9fb473e68abcef27bb6c973ce781c03b5d6833061bbeee9b8385fd6f'
-            'fbc79a9ae583abe8ac237068ece7aafd6ff079d8d55b5da7852c419baf33c222'
-            'f3e0958531d404f2a6c8940497a01e6444d96621e8a9f92018a513d831c77439'
-            'ed682bc0fabce30e883a5dd191b79ca6f097a03e86ad787a3d4d459529695737'
-            '89c3d3eec334c66e90ebf164f82977e7ca2303de378528ef7dc2fdbfc59efdee'
-            '15239108e2b6eef485114ad2323feb3ace0c44c19911a4133793ebc1c3772869'
-            '2b988b2695f1e82386a2d2bdd61ce6bd0d9ec958d6f93d1006a3e3d71373e997')
+            '76a2d1f30653f1de8738e8a84875e3b65df2742d1b9c2970d9125a110e42147c'
+            '05d8a7eb4c76f14e4671ec69698c544d2bb3d10c63f7bb6b0564cb4ad038635b'
+            '5c4ffce869c20f16f4a481b780718cec097bead67451649d96638de27a9647d4'
+            'c731472656cd4881e4371c37a9e16e89ee0afe53618fc48585f95c84d13cf080'
+            'b7681214860c627ccc7a6628e8d2b2d5fd14c72fbd48b453a74fbe8c4122973f'
+            'd1f41b62738376bbe981760d7b8eb6980bda2830a4208341e25eda40b0440121'
+            '622d16f443c9e4a1ded1cf1af264a923e64c880f4a2885d2a63d9be7fbbe95f2'
+            '5186fb24fd3a746f1ad06a423a9c11379f63e260dcee574391940240f6fa93bb'
+            'c72b8e8bcbb9bc4dc3b9008bff109a52e29694443d9a164906ed3c5ba78c20a7'
+            'e6842b36b691cfa4a595ba62ea2bc3bddf616a1aa0a308c4b7c95f7c29c2ceb2'
+            '26ab4278577b58a2f038378a5f7038053d36639ab3af1071c54745c254bcc888'
+            '641bce64d7a8ba16238e2ed4285c3bcf49edb82287e9528379f4b69a0159b9e6'
+            '8fc74155ae001841f01e372813dc1b42de791e38310590331089e73d9427a584')
 
 prepare () {
   cd $_pkgfqn