Update to 6.3.1

15 files changed, 309 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79c9d34f0e27..6c61de281b21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt6-base-static
 	pkgdesc = A cross-platform application and UI framework (mingw-w64)
-	pkgver = 6.3.0
+	pkgver = 6.3.1
 	pkgrel = 1
 	url = https://www.qt.io
 	arch = any
@@ -35,7 +35,7 @@ pkgbase = mingw-w64-qt6-base-static
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://download.qt.io/official_releases/qt/6.3/6.3.0/submodules/qtbase-everywhere-src-6.3.0.tar.xz
+	source = https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtbase-everywhere-src-6.3.1.tar.xz
 	source = 0001-Use-CMake-s-default-import-library-suffix.patch
 	source = 0002-Fix-finding-D-Bus.patch
 	source = 0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -44,14 +44,22 @@ pkgbase = mingw-w64-qt6-base-static
 	source = 0006-Support-finding-static-MariaDB-client-library.patch
 	source = 0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
 	source = 0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
-	sha256sums = b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
-	sha256sums = bff8b8af7b4eec0961890190bc1d31d98c2270985698a8071b5ee1434a12f13a
-	sha256sums = bdc4834c7c88176113770356e24104040622c30779a770da3292e487d0b451c8
-	sha256sums = 08647a0b4f3beef39a2308cea4ed7b63887e58ef7b8f53294ba8d136eaf32109
-	sha256sums = e1f619607afca17031c3eebdc01a95a7de4296b8ce01b15c9797475a4e7918f1
-	sha256sums = 1994ab8f69ac4146c9332aff1bbaacecb87fcfc1d2c521ddfa0f6fd7e3b1aa63
-	sha256sums = e9170a6b158b500e34913b0ee78641bf95fcfb5f84d27934a8a7c08b7a45e345
-	sha256sums = 45a0bf8e485d0c21e916c8260ebbf4a1869d9902f4d749a41804535f05ef54b4
-	sha256sums = a018bb72f3424c30c04f1f72429d891dd6b615566c98642d55a9a72e6110fd76
+	source = 0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
+	source = 0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
+	source = 0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
+	source = 0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
+	sha256sums = 0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
+	sha256sums = b50847b70210657d5579bbc6fe88c5343f675d63e0059183705777a2d0c0fcf6
+	sha256sums = c2e2499413b281be496de2b62385ff947c38b92f98028336b4c1a06230f5a180
+	sha256sums = 16cd13db60b669f1b84bc98910b40a50b28e75b00b839883c0dd69e457a997b0
+	sha256sums = e6d6b86b2a4a9f30ce361b6baa6e5d32d1567828581d6bc65f6986a15a4ae0ab
+	sha256sums = 34d6083183e58e02d8bc53db6fbeb2059766a23b3fe9ccdc0b53c861eefbfdb0
+	sha256sums = 53e83363b0508d8005987fea8f752d2f0d804f07d434c0a7a1a39ebf9668d433
+	sha256sums = b90c472eda3caa44981d14b8081039c56653a0c85bd60175ff37d0d48ed43078
+	sha256sums = 8ee1b3c4554be7d4f2ec5ac24727887ea4c47704e1ddcf80aacece93b9e54dda
+	sha256sums = 0d8f78df6da2dd3bf7610fdc7b3018cb2698bbe6f523925ad4c3565e7ecb03c9
+	sha256sums = ae0d2140f3be5fa16ff32cb9715144de72139e509dacd937ad643c14177c14ce
+	sha256sums = c811240dc3f6e95a636bfbb8f05f5a074b6d82ac2bf623cdc32bf74cd9f39548
+	sha256sums = 87e00cc7c4e47494f3eb117f930432cb2385ee5016280e22a719e775664512c7
 
 pkgname = mingw-w64-qt6-base-static
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch
index 662bd92bebf0..d8d6b4cd1dbf 100644
--- a/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,7 +1,7 @@
-From 9636662a15e67ba2a1e9f1374537d3b390e9d04d Mon Sep 17 00:00:00 2001
+From c5188956b46429172946dcfebbe4878048579c6f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 22:08:10 +0100
-Subject: [PATCH 1/8] Use CMake's default import library suffix
+Subject: [PATCH 01/12] Use CMake's default import library suffix
 
 Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
 ---
@@ -47,10 +47,10 @@ index 61080da7ef..173c6743ba 100644
          ${CMAKE_STATIC_LIBRARY_SUFFIX})
      if(MSVC)
 diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
-index 18b230deb1..1bb4908898 100644
+index c467e9a634..dda5c41266 100644
 --- a/cmake/QtPrlHelpers.cmake
 +++ b/cmake/QtPrlHelpers.cmake
-@@ -120,11 +120,17 @@ ${prl_step1_content_libs}
+@@ -121,11 +121,17 @@ ${prl_step1_content_libs}
           CONTENT
           "FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
  
@@ -98,10 +98,10 @@ index 24ed125f12..73ebe453d3 100644
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
 diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
-index b0a5fad15f..a81297e03f 100644
+index d9219ee529..b47190f5e6 100644
 --- a/src/corelib/Qt6CoreMacros.cmake
 +++ b/src/corelib/Qt6CoreMacros.cmake
-@@ -495,7 +495,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
+@@ -497,7 +497,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
  
          # This should cover both MINGW with GCC and CLANG.
          if(NOT MSVC)
@@ -110,5 +110,5 @@ index b0a5fad15f..a81297e03f 100644
              get_target_property(target_type ${target} TYPE)
              if(target_type STREQUAL "STATIC_LIBRARY")
 -- 
-2.35.1
+2.36.1
 
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index 46bda6a66a95..03a4543f636f 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,7 +1,7 @@
-From 0ee959c716f76b22e32bbcd74d4d3c27c45054eb Mon Sep 17 00:00:00 2001
+From 5bfae9c0756e130300eb18d2e0e99ec4f5a9e3fa Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 7 Oct 2020 12:13:37 +0200
-Subject: [PATCH 2/8] Fix finding D-Bus
+Subject: [PATCH 02/12] Fix finding D-Bus
 
 Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
 ---
@@ -20,5 +20,5 @@ index e227d224e0..bdbcab9eb3 100644
 +    set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
 +endif()
 -- 
-2.35.1
+2.36.1
 
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index e4bbed146952..0356ebeaf180 100644
--- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,7 +1,7 @@
-From c32b8866da5b01a75b61c26a288d4c1497bd197b Mon Sep 17 00:00:00 2001
+From 84ec824d5bb73e85ef383b01859b8ada6e1ff686 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:13:19 +0100
-Subject: [PATCH 3/8] Fix using static PCRE2 and DBus-1
+Subject: [PATCH 03/12] 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.
@@ -13,7 +13,7 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e
  2 files changed, 9 insertions(+)
 
 diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index 1db27fc4e4..0438d1401a 100644
+index 1657ef1418..cdf8875981 100644
 --- a/src/corelib/text/qregularexpression.cpp
 +++ b/src/corelib/text/qregularexpression.cpp
 @@ -57,6 +57,11 @@
@@ -44,5 +44,5 @@ index accaa4f5ed..4b11c74caa 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.35.1
+2.36.1
 
diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch
index 44ec62394850..7b87e64a9ea3 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,7 +1,7 @@
-From ffdf568ee684a97d59e4668eea92d9e3cedaed30 Mon Sep 17 00:00:00 2001
+From 0d092aaa1b76d7e6e269fa6a7d005b83c3e159f5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:59:33 +0100
-Subject: [PATCH 4/8] Fix transitive dependencies (of static libraries)
+Subject: [PATCH 04/12] 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 d3a6a8588e..743154fc50 100644
          Qt::CorePrivate
          Qt::SqlPrivate
 -- 
-2.35.1
+2.36.1
 
diff --git a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
index ce493d443c68..80337bccb77c 100644
--- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@@ -1,7 +1,7 @@
-From dda151c4601c0f5453ffa7b80f4c77f65ae04bcd Mon Sep 17 00:00:00 2001
+From a73d029afe6c4df668c2dc620c9a9184e8081e90 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 2 Nov 2020 13:47:45 +0100
-Subject: [PATCH 5/8] Fix libjpeg workaround for conflict with rpcndr.h
+Subject: [PATCH 05/12] 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
@@ -13,7 +13,7 @@ Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e
  1 file changed, 1 insertion(+)
 
 diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
-index a17afc0f69..72708145f4 100644
+index 6d88438c47..a16dae28b1 100644
 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
 +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
 @@ -62,6 +62,7 @@
@@ -25,5 +25,5 @@ index a17afc0f69..72708145f4 100644
  #ifdef const
  #  undef const          // remove crazy C hackery in jconfig.h
 -- 
-2.35.1
+2.36.1
 
diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch
index 109b78895bbc..7acae848e4f9 100644
--- a/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/0006-Support-finding-static-MariaDB-client-library.patch
@@ -1,7 +1,7 @@
-From d0bbc1ae7e19e0622d1015f9d773a0d5d2d891f6 Mon Sep 17 00:00:00 2001
+From 99f9c62fb5836f4783007898cdcb7e4b6bee38d6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:33:12 +0100
-Subject: [PATCH 6/8] Support finding static MariaDB client library
+Subject: [PATCH 06/12] 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
@@ -27,5 +27,5 @@ index 0fcba2148e..ab4f6fdc9e 100644
  
  include(FindPackageHandleStandardArgs)
 -- 
-2.35.1
+2.36.1
 
diff --git a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
index f38bf9f8a53a..8dcad788ef91 100644
--- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,7 +1,7 @@
-From f2f0f4c188747c95a80317e95c71a1c75ccc9bd3 Mon Sep 17 00:00:00 2001
+From 76f5e2a906d00c4661eac3e8bc41ff6daa26af06 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:34:09 +0100
-Subject: [PATCH 7/8] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
+Subject: [PATCH 07/12] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
  static libraries
 
 Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
@@ -10,7 +10,7 @@ Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
  1 file changed, 4 insertions(+)
 
 diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index a515fcd43d..75fb3f6e9b 100644
+index 5c30cc76dc..0312dff582 100644
 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 @@ -1,6 +1,10 @@
@@ -25,5 +25,5 @@ index a515fcd43d..75fb3f6e9b 100644
  #
  # Macros and functions for building Qt modules
 -- 
-2.35.1
+2.36.1
 
diff --git a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
index ea99ad926ba6..ad4ec887d460 100644
--- a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
@@ -1,7 +1,7 @@
-From 3a7e6c01e86ff8b4ffaec5a7690d680198d59f57 Mon Sep 17 00:00:00 2001
+From 3e7c0f23c35895d11f1ebfc76c43f90dc85521a2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 Jun 2021 22:24:12 +0200
-Subject: [PATCH 8/8] Fix crashes in rasterization code using setjmp
+Subject: [PATCH 08/12] Fix crashes in rasterization code using setjmp
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -28,7 +28,7 @@ Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c
  rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
 
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 43a2366063..4c5c42abb6 100644
+index 8eb4e5b605..b9f4e96671 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
 @@ -165,7 +165,7 @@ qt_internal_add_module(Gui
@@ -248,5 +248,5 @@ index e2326a56c1..7b30969ec8 100644
          "Description": "FreeType is a freely available software library to render fonts.",
          "Homepage": "http://www.freetype.org",
 -- 
-2.35.1
+2.36.1
 
diff --git a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
new file mode 100644
index 000000000000..d58374081b0c
--- /dev/null
+++ b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
@@ -0,0 +1,63 @@
+From 8ac6411a3410f571d784ec3ddeea4fe640938840 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
+ its dependencies
+
+CMake's own find module unforunately does not consider fontconfig's deps so
+static builds will break due to expat missing on the linker-line.
+
+Change-Id: I331cd6b1af4f2857279c90920d777977e80fdce5
+---
+ cmake/FindFontconfig.cmake | 11 +++++++++++
+ src/gui/CMakeLists.txt     |  2 +-
+ src/gui/configure.cmake    |  2 +-
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+ create mode 100644 cmake/FindFontconfig.cmake
+
+diff --git a/cmake/FindFontconfig.cmake b/cmake/FindFontconfig.cmake
+new file mode 100644
+index 0000000000..1a52327ae6
+--- /dev/null
++++ b/cmake/FindFontconfig.cmake
+@@ -0,0 +1,11 @@
++find_package(PkgConfig QUIET)
++
++if(NOT TARGET PkgConfig::Fontconfig)
++    pkg_check_modules(Fontconfig fontconfig IMPORTED_TARGET)
++
++    if (NOT TARGET PkgConfig::Fontconfig)
++        set(Fontconfig_FOUND 0)
++    endif()
++else()
++    set(Fontconfig_FOUND 1)
++endif()
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index b9f4e96671..768bb14cb0 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -737,7 +737,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre
+         text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h
+         text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h
+     LIBRARIES
+-        Fontconfig::Fontconfig
++        PkgConfig::Fontconfig
+ )
+ 
+ qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS
+diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
+index 42ab041f99..044c90a0d1 100644
+--- a/src/gui/configure.cmake
++++ b/src/gui/configure.cmake
+@@ -39,7 +39,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr
+ if(QT_FEATURE_system_zlib)
+     qt_add_qmake_lib_dependency(freetype zlib)
+ endif()
+-qt_find_package(Fontconfig PROVIDED_TARGETS Fontconfig::Fontconfig MODULE_NAME gui QMAKE_LIB fontconfig)
++qt_find_package(Fontconfig PROVIDED_TARGETS PkgConfig::Fontconfig MODULE_NAME gui QMAKE_LIB fontconfig)
+ qt_add_qmake_lib_dependency(fontconfig freetype)
+ 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.36.1
+
diff --git a/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch b/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
new file mode 100644
index 000000000000..31ff608812e0
--- /dev/null
+++ b/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
@@ -0,0 +1,48 @@
+From 5f81bd5ed0e8609415aa1bd7ff1857063d38a66d 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
+
+Considering this linker error, xcb-image apparently depends on xcb-util:
+```
+/usr/bin/ld: /usr/static-compat/lib/libxcb-image.a(xcb_image.o): in function `xcb_create_pixmap_from_bitmap_data':
+(.text+0x14b7): undefined reference to `xcb_aux_create_gc'
+```
+
+Change-Id: Ic87a94ec664c126a5af1012d31b068d3dc7ec947
+---
+ cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
+index d530d2d7f4..f5298642ca 100644
+--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
+@@ -108,6 +108,7 @@ set(XCB_known_components
+     EWMH
+     GLX
+     ICCCM
++    UTIL
+     IMAGE
+     KEYSYMS
+     PRESENT
+@@ -117,7 +118,6 @@ set(XCB_known_components
+     RES
+     SCREENSAVER
+     SYNC
+-    UTIL
+     XEVIE
+     XF86DRI
+     XINERAMA
+@@ -146,7 +146,7 @@ endforeach()
+ set(XCB_XCB_component_deps)
+ set(XCB_COMPOSITE_component_deps XCB XFIXES)
+ set(XCB_DAMAGE_component_deps XCB XFIXES)
+-set(XCB_IMAGE_component_deps XCB SHM)
++set(XCB_IMAGE_component_deps XCB SHM UTIL)
+ set(XCB_RENDERUTIL_component_deps XCB RENDER)
+ set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
+ set(XCB_XVMC_component_deps XCB XV)
+-- 
+2.36.1
+
diff --git a/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch b/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
new file mode 100644
index 000000000000..a0f61e47f1e1
--- /dev/null
+++ b/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
@@ -0,0 +1,74 @@
+From 5f1fd6ea55dda08d201f706565f01e9825fcce5f 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
+ to handle deps of static glib2
+
+Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908
+---
+ .../find-modules/FindGLIB2.cmake              | 22 +++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
+index a6a16b494f..a5da57824c 100644
+--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
+@@ -52,7 +52,7 @@
+ #=============================================================================
+ 
+ find_package(PkgConfig QUIET)
+-pkg_check_modules(PC_GLIB2 QUIET glib-2.0)
++pkg_check_modules(PC_GLIB2 QUIET glib-2.0 IMPORTED_TARGET)
+ 
+ find_path(GLIB2_INCLUDE_DIRS
+           NAMES glib.h
+@@ -64,14 +64,14 @@ find_library(GLIB2_LIBRARIES
+              HINTS ${PC_GLIB2_LIBDIR}
+ )
+ 
+-pkg_check_modules(PC_GTHREAD2 QUIET gthread-2.0)
++pkg_check_modules(PC_GTHREAD2 QUIET gthread-2.0 IMPORTED_TARGET)
+ 
+ find_library(GTHREAD2_LIBRARIES
+              NAMES gthread-2.0
+              HINTS ${PC_GTHREAD2_LIBDIR}
+ )
+ 
+-pkg_check_modules(PC_GOBJECT QUIET gobject-2.0)
++pkg_check_modules(PC_GOBJECT QUIET gobject-2.0 IMPORTED_TARGET)
+ 
+ find_path(GLIB2_GOBJECT_INCLUDE_DIRS
+           NAMES glib-object.h
+@@ -83,7 +83,7 @@ find_library(GLIB2_GOBJECT_LIBRARIES
+              HINTS ${PC_GOBJECT_LIBDIR}
+ )
+ 
+-pkg_check_modules(PC_GIO QUIET gio-2.0)
++pkg_check_modules(PC_GIO QUIET gio-2.0 IMPORTED_TARGET)
+ 
+ find_path(GLIB2_GIO_INCLUDE_DIRS
+           NAMES gio/gio.h
+@@ -160,6 +160,20 @@ mark_as_advanced(GLIB2_INCLUDE_DIRS GLIB2_INCLUDE_DIR
+                  GLIB2_GIO_INCLUDE_DIRS GLIB2_GIO_INCLUDE_DIR
+                  GLIB2_GIO_LIBRARIES GLIB2_GIO_LIBRARY)
+ 
++option(GLIB2_USE_PKG_CONFIG "Use properties from PkgConfig targets" OFF)
++if(GLIB2_USE_PKG_CONFIG)
++  foreach(TARGET_NAME GLIB2 GOBJECT GIO)
++    if(TARGET "GLIB2::${TARGET_NAME}")
++      foreach(PROP_NAME INTERFACE_LINK_OPTIONS INTERFACE_LINK_LIBRARIES
++                        INTERFACE_COMPILE_OPTIONS INTERFACE_COMPILE_DEFINITIONS
++                        INTERFACE_INCLUDE_DIRECTORIES)
++        get_target_property(PROP_VAL "PkgConfig::PC_${TARGET_NAME}" "${PROP_NAME}")
++        set_target_properties("GLIB2::${TARGET_NAME}" PROPERTIES "${PROP_NAME}" "${PROP_VAL}")
++      endforeach()
++    endif()
++  endforeach()
++endif()
++
+ include(FeatureSummary)
+ set_package_properties(GLIB2 PROPERTIES
+   URL "https://wiki.gnome.org/Projects/GLib"
+-- 
+2.36.1
+
diff --git a/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch b/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
new file mode 100644
index 000000000000..b85d47b45cd9
--- /dev/null
+++ b/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
@@ -0,0 +1,53 @@
+From 9523e0cf6abf56d32da8c44619b9a30e32f18ffb 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
+ to handle deps of static libs
+
+Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27
+---
+ .../find-modules/FindWayland.cmake            | 21 +++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
+index 233cc88d02..875c71377c 100644
+--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
+@@ -75,6 +75,13 @@
+ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #=============================================================================
+ 
++option(WAYLAND_USE_PKG_CONFIG "Use properties from PkgConfig targets" OFF)
++if(WAYLAND_USE_PKG_CONFIG)
++  find_package(PkgConfig QUIET)
++  pkg_check_modules(PC_WAYLAND_Client QUIET wayland-client IMPORTED_TARGET)
++  pkg_check_modules(PC_WAYLAND_Server QUIET wayland-server IMPORTED_TARGET)
++endif()
++
+ include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+ 
+ ecm_find_package_version_check(Wayland)
+@@ -136,6 +143,20 @@ find_package_handle_standard_args(Wayland
+     HANDLE_COMPONENTS
+ )
+ 
++# pull dependencies via package config
++if(WAYLAND_USE_PKG_CONFIG)
++  foreach(TARGET_NAME Client Server)
++    if(TARGET "Wayland::${TARGET_NAME}")
++      foreach(PROP_NAME INTERFACE_LINK_OPTIONS INTERFACE_LINK_LIBRARIES
++                        INTERFACE_COMPILE_OPTIONS INTERFACE_COMPILE_DEFINITIONS
++                        INTERFACE_INCLUDE_DIRECTORIES)
++        get_target_property(PROP_VAL "PkgConfig::PC_WAYLAND_${TARGET_NAME}" "${PROP_NAME}")
++        set_target_properties("Wayland::${TARGET_NAME}" PROPERTIES "${PROP_NAME}" "${PROP_VAL}")
++      endforeach()
++    endif()
++  endforeach()
++endif()
++
+ include(FeatureSummary)
+ set_package_properties(Wayland PROPERTIES
+     URL "http://wayland.freedesktop.org"
+-- 
+2.36.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 92d39241ea63..d5cf3732c457 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase
 
 pkgname=mingw-w64-qt6-base-static
-_qtver=6.3.0
+_qtver=6.3.1
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -38,16 +38,24 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch'
         '0006-Support-finding-static-MariaDB-client-library.patch'
         '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch'
-        '0008-Fix-crashes-in-rasterization-code-using-setjmp.patch')
-sha256sums=('b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99'
-            'bff8b8af7b4eec0961890190bc1d31d98c2270985698a8071b5ee1434a12f13a'
-            'bdc4834c7c88176113770356e24104040622c30779a770da3292e487d0b451c8'
-            '08647a0b4f3beef39a2308cea4ed7b63887e58ef7b8f53294ba8d136eaf32109'
-            'e1f619607afca17031c3eebdc01a95a7de4296b8ce01b15c9797475a4e7918f1'
-            '1994ab8f69ac4146c9332aff1bbaacecb87fcfc1d2c521ddfa0f6fd7e3b1aa63'
-            'e9170a6b158b500e34913b0ee78641bf95fcfb5f84d27934a8a7c08b7a45e345'
-            '45a0bf8e485d0c21e916c8260ebbf4a1869d9902f4d749a41804535f05ef54b4'
-            'a018bb72f3424c30c04f1f72429d891dd6b615566c98642d55a9a72e6110fd76')
+        '0008-Fix-crashes-in-rasterization-code-using-setjmp.patch'
+        '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')
+sha256sums=('0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03'
+            'b50847b70210657d5579bbc6fe88c5343f675d63e0059183705777a2d0c0fcf6'
+            'c2e2499413b281be496de2b62385ff947c38b92f98028336b4c1a06230f5a180'
+            '16cd13db60b669f1b84bc98910b40a50b28e75b00b839883c0dd69e457a997b0'
+            'e6d6b86b2a4a9f30ce361b6baa6e5d32d1567828581d6bc65f6986a15a4ae0ab'
+            '34d6083183e58e02d8bc53db6fbeb2059766a23b3fe9ccdc0b53c861eefbfdb0'
+            '53e83363b0508d8005987fea8f752d2f0d804f07d434c0a7a1a39ebf9668d433'
+            'b90c472eda3caa44981d14b8081039c56653a0c85bd60175ff37d0d48ed43078'
+            '8ee1b3c4554be7d4f2ec5ac24727887ea4c47704e1ddcf80aacece93b9e54dda'
+            '0d8f78df6da2dd3bf7610fdc7b3018cb2698bbe6f523925ad4c3565e7ecb03c9'
+            'ae0d2140f3be5fa16ff32cb9715144de72139e509dacd937ad643c14177c14ce'
+            'c811240dc3f6e95a636bfbb8f05f5a074b6d82ac2bf623cdc32bf74cd9f39548'
+            '87e00cc7c4e47494f3eb117f930432cb2385ee5016280e22a719e775664512c7')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index c7e682d6fd1f..6e96415578a2 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03