Update to 6.5.0

15 files changed, 95 insertions, 95 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8b187ab47d9e..df45b6de69dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt6-base
 	pkgdesc = A cross-platform application and UI framework (mingw-w64)
-	pkgver = 6.4.3
+	pkgver = 6.5.0
 	pkgrel = 1
 	url = https://www.qt.io
 	arch = any
@@ -35,7 +35,7 @@ pkgbase = mingw-w64-qt6-base
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz
+	source = https://download.qt.io/official_releases/qt/6.5/6.5.0/submodules/qtbase-everywhere-src-6.5.0.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
@@ -48,18 +48,18 @@ pkgbase = mingw-w64-qt6-base
 	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 = 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60
-	sha256sums = 90910e209a4ee9e5ce7a8e6352bd3d53197a8d11a6f6385b2cbc1be2732c10b0
-	sha256sums = 12089a41e68e5708707301dac514e69578791c57926f79903b6011ddfedaf3b3
-	sha256sums = a6aa4d12dd99c1cfa4dc53f6f8d348e3f0a9f5a4f56ef55934d93763540af1b0
-	sha256sums = e9ba0c08d4ba390d501f7b0973c59effe71902d6fb577db2b1eda070e50036c0
-	sha256sums = 6dcdb034cebe1c3db9e3c26e3eb3ed5cd73b2f32b2a69ec65b2d490ebc28eadb
-	sha256sums = 35e3e9f71af5bff857f4d8fec2f7805b5e74e998212f9e0468713fb79b5bc28b
-	sha256sums = a023ba4db23599ef8141da35e576c169fd2d98266b3c33af0b555da971299b51
-	sha256sums = 6b417acac9059b5b2da850a3da48432526ac3f95fa6b713a6cad9ad1cc9c2c2e
-	sha256sums = 58fdfd58b66a4ee2c968b7190c47b058b576c374483f3860e59e44f5856e6fe0
-	sha256sums = 47434e7a794ac04e689658458331abdb839abb0407577d9edf50272fe864d329
-	sha256sums = 0fbc4aee0aaf9fbb34f1b9ffaf82b1ceeb07d1d0bd25f3a2a441a13b06d650ac
-	sha256sums = a98277ea7bfa934ae9f3378125dc5b6d9849dfe861da787f760e89208f99c763
+	sha256sums = fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef
+	sha256sums = 0cb9c1a10d04575b36b0abe4a422af1e7279b3e07249b2af5fa7631dcc93d262
+	sha256sums = a26661954e7c1b1c74bb1563d8d269f8b7dfda196640e30eded9c03be27656e1
+	sha256sums = 61fd2877aff4ba0d471ec88cf85c08dac8e522d0a0312739c134fb1a483474f0
+	sha256sums = 95d18cb173cc0c13323a8394f8c536c2f78157928d6ddc959f20031a913f3960
+	sha256sums = 004a09d1e475f3288f599f83c6ec183e479ba58ed8e12286e0050935428ee470
+	sha256sums = e3ea83b5c934ff3f5f8d9c48ecc3831eb66379f134247d61664a10837107bd46
+	sha256sums = fb3b3e2c49d0e3466410dd03a936dc127b7669e5de7e11dbbe721baed8544043
+	sha256sums = 32f80d7cedbb4b32e4689c28b4d0ddb64ea4e4d74612738a56c771d9179eecf7
+	sha256sums = a2d54f21fa6205fb4273dd8f7b51b679c9c20f91021af46ccfd251addce775b8
+	sha256sums = 4c8f6c5aec035a6fbe59973e88adb0817b24464881f958d70eff030c42884072
+	sha256sums = 3bdbbab00cbef3915031f7eb1d174e54107fee8b326f17c8291d5129ba0d606f
+	sha256sums = 0908f24881d7ae5c09abe58a1d5a1ca81a6f8139fcf15924cae9fc9feb6eb4dc
 
 pkgname = mingw-w64-qt6-base
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch
index f3b90da855a8..7cb03396e019 100644
--- a/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,4 +1,4 @@
-From 089202508f01a9663a2d184ed49a4970032eaeea Mon Sep 17 00:00:00 2001
+From c8094f63d266880d6137acc3d5a2995b65dd81c5 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
@@ -13,10 +13,10 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
  5 files changed, 21 insertions(+), 6 deletions(-)
 
 diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
-index b8c238c203..431c9b44db 100644
+index c619a50f30..903c49133e 100644
 --- a/cmake/QtPriHelpers.cmake
 +++ b/cmake/QtPriHelpers.cmake
-@@ -507,9 +507,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
+@@ -518,9 +518,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
          qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
          list(APPEND pri_files "${private_pri_file_path}")
  
@@ -31,7 +31,7 @@ index b8c238c203..431c9b44db 100644
              ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
              ${CMAKE_STATIC_LIBRARY_SUFFIX})
          if(MSVC)
-@@ -939,9 +943,13 @@ CONFIG += ${private_config_joined}
+@@ -971,9 +975,13 @@ CONFIG += ${private_config_joined}
          list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
      endforeach()
  
@@ -47,10 +47,10 @@ index b8c238c203..431c9b44db 100644
          ${CMAKE_STATIC_LIBRARY_SUFFIX})
      if(MSVC)
 diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
-index 298bc44c9b..6978fe25fc 100644
+index 45bfaedcdf..a433c98fe8 100644
 --- a/cmake/QtPrlHelpers.cmake
 +++ b/cmake/QtPrlHelpers.cmake
-@@ -121,11 +121,17 @@ ${prl_step1_content_libs}
+@@ -123,11 +123,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 ccfba93899..7fc87a8403 100644
+index 18576eead0..21b66c64e5 100644
 --- a/src/corelib/Qt6CoreMacros.cmake
 +++ b/src/corelib/Qt6CoreMacros.cmake
-@@ -520,7 +520,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
+@@ -524,7 +524,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 ccfba93899..7fc87a8403 100644
              get_target_property(target_type ${target} TYPE)
              if(target_type STREQUAL "STATIC_LIBRARY")
 -- 
-2.39.2
+2.40.0
 
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index 4d4c49415f27..0ded28904e05 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,4 +1,4 @@
-From bb7889fda3d2bb7e84f93879e545559809425fa8 Mon Sep 17 00:00:00 2001
+From 6a509943be2621f77ab5914bb52b905670a885db 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
@@ -9,10 +9,10 @@ Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
  1 file changed, 3 insertions(+)
 
 diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
-index e227d224e0..bdbcab9eb3 100644
+index e2a58790c4..8e0ed81f89 100644
 --- a/cmake/FindWrapDBus1.cmake
 +++ b/cmake/FindWrapDBus1.cmake
-@@ -45,3 +45,6 @@ include(FindPackageHandleStandardArgs)
+@@ -48,3 +48,6 @@ include(FindPackageHandleStandardArgs)
  find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
                                              DBus1_LIBRARY DBus1_INCLUDE_DIR WrapDBus1_FOUND
                                              VERSION_VAR DBus1_VERSION)
@@ -20,5 +20,5 @@ index e227d224e0..bdbcab9eb3 100644
 +    set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
 +endif()
 -- 
-2.39.2
+2.40.0
 
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index 151e96c49017..2c46e5274963 100644
--- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,4 +1,4 @@
-From dee6d0767a7eda9fdd184512fdc15e953af22dc4 Mon Sep 17 00:00:00 2001
+From f107e9d917723329e1fbdfd8a1477f182bbaf93a 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
@@ -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 a523a64788..d64a4b3963 100644
+index 8b3cf63dd2..42988c6300 100644
 --- a/src/corelib/text/qregularexpression.cpp
 +++ b/src/corelib/text/qregularexpression.cpp
 @@ -20,6 +20,11 @@
@@ -44,5 +44,5 @@ index e3008be761..9c745c16c4 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.39.2
+2.40.0
 
diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch
index 15190d4280e7..6f0313b82aa1 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,4 +1,4 @@
-From 42c085d4a746a12ef0ffde8e29fc7fef048bfb19 Mon Sep 17 00:00:00 2001
+From d35043f858eada057e7b12f49354ed95281c6f97 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)
@@ -36,10 +36,10 @@ index 24a194c9cb..a6a16b494f 100644
  endif()
  
 diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
-index f5cad361d7..cdfb469c71 100644
+index d191d1ac0a..b61d0107f2 100644
 --- a/cmake/FindMySQL.cmake
 +++ b/cmake/FindMySQL.cmake
-@@ -80,6 +80,7 @@ if(MySQL_FOUND)
+@@ -83,6 +83,7 @@ if(MySQL_FOUND)
      add_library(MySQL::MySQL UNKNOWN IMPORTED)
      set_target_properties(MySQL::MySQL PROPERTIES
                            IMPORTED_LOCATION "${MySQL_LIBRARIES}"
@@ -48,20 +48,20 @@ index f5cad361d7..cdfb469c71 100644
      if(MySQL_LIBRARY_DEBUG)
        set_target_properties(MySQL::MySQL PROPERTIES
 diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
-index bdbcab9eb3..06e9af49f6 100644
+index 8e0ed81f89..0aec7dbb77 100644
 --- a/cmake/FindWrapDBus1.cmake
 +++ b/cmake/FindWrapDBus1.cmake
-@@ -47,4 +47,5 @@ find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
+@@ -50,4 +50,5 @@ find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
                                              VERSION_VAR DBus1_VERSION)
  if(TARGET dbus-1)
      set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
 +    set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}")
  endif()
 diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake
-index 7b6dccb1d2..550c5134fb 100644
+index a4341271fe..be6ac7003a 100644
 --- a/cmake/FindWrapOpenSSL.cmake
 +++ b/cmake/FindWrapOpenSSL.cmake
-@@ -11,7 +11,7 @@ set(WrapOpenSSL_FOUND OFF)
+@@ -14,7 +14,7 @@ set(WrapOpenSSL_FOUND OFF)
  find_package(WrapOpenSSLHeaders ${WrapOpenSSL_FIND_VERSION})
  
  if(TARGET OpenSSL::SSL)
@@ -70,7 +70,7 @@ index 7b6dccb1d2..550c5134fb 100644
          get_target_property(libType OpenSSL::Crypto TYPE)
          if(libType STREQUAL "ALIAS")
              get_target_property(writableLib OpenSSL::Crypto ALIASED_TARGET)
-@@ -26,7 +26,7 @@ if(TARGET OpenSSL::SSL)
+@@ -29,7 +29,7 @@ if(TARGET OpenSSL::SSL)
      set(WrapOpenSSL_FOUND ON)
  
      add_library(WrapOpenSSL::WrapOpenSSL INTERFACE IMPORTED)
@@ -80,10 +80,10 @@ index 7b6dccb1d2..550c5134fb 100644
  
  include(FindPackageHandleStandardArgs)
 diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake
-index 2cf6caca19..23dc161e4c 100644
+index d0c27a9f0f..64e14c584c 100644
 --- a/cmake/FindWrapSystemFreetype.cmake
 +++ b/cmake/FindWrapSystemFreetype.cmake
-@@ -44,7 +44,7 @@ find_package_handle_standard_args(WrapSystemFreetype
+@@ -47,7 +47,7 @@ find_package_handle_standard_args(WrapSystemFreetype
  if(WrapSystemFreetype_FOUND)
      add_library(WrapSystemFreetype::WrapSystemFreetype INTERFACE IMPORTED)
      target_link_libraries(WrapSystemFreetype::WrapSystemFreetype
@@ -93,10 +93,10 @@ index 2cf6caca19..23dc161e4c 100644
  unset(__freetype_target_name)
  unset(__freetype_found)
 diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake
-index fc6233d942..1e6105a00c 100644
+index 07b3405bc0..10fb738d7c 100644
 --- a/cmake/FindWrapSystemHarfbuzz.cmake
 +++ b/cmake/FindWrapSystemHarfbuzz.cmake
-@@ -70,7 +70,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz
+@@ -73,7 +73,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz
  if(WrapSystemHarfbuzz_FOUND)
      add_library(WrapSystemHarfbuzz::WrapSystemHarfbuzz INTERFACE IMPORTED)
      target_link_libraries(WrapSystemHarfbuzz::WrapSystemHarfbuzz
@@ -106,10 +106,10 @@ index fc6233d942..1e6105a00c 100644
  unset(__harfbuzz_target_name)
  unset(__harfbuzz_find_include_dirs_hints)
 diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake
-index 372a064ff4..a363bfd31b 100644
+index 967ccc5c02..9a7d5150dc 100644
 --- a/cmake/FindWrapSystemPNG.cmake
 +++ b/cmake/FindWrapSystemPNG.cmake
-@@ -33,7 +33,7 @@ find_package_handle_standard_args(WrapSystemPNG
+@@ -36,7 +36,7 @@ find_package_handle_standard_args(WrapSystemPNG
  if(WrapSystemPNG_FOUND)
      add_library(WrapSystemPNG::WrapSystemPNG INTERFACE IMPORTED)
      target_link_libraries(WrapSystemPNG::WrapSystemPNG
@@ -119,10 +119,10 @@ index 372a064ff4..a363bfd31b 100644
  unset(__png_target_name)
  unset(__png_found)
 diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
-index d3a6a8588e..743154fc50 100644
+index d392f4dfa5..165c345e1b 100644
 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt
 +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
-@@ -16,7 +16,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
+@@ -17,7 +17,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
          QT_NO_CAST_FROM_ASCII
          QT_NO_CAST_TO_ASCII
      LIBRARIES
@@ -132,5 +132,5 @@ index d3a6a8588e..743154fc50 100644
          Qt::CorePrivate
          Qt::SqlPrivate
 -- 
-2.39.2
+2.40.0
 
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 8b93a86d791f..53c318ab26c7 100644
--- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@@ -1,4 +1,4 @@
-From 86a8b29852b1063b1a793177de80c93c326b23a6 Mon Sep 17 00:00:00 2001
+From 0a83b64b3bf63004cdecc9a5b9717dac9e846310 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
@@ -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 6472702fdd..fe9c19d1a2 100644
+index 0d72ba01d0..a706fb4cea 100644
 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
 +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
 @@ -26,6 +26,7 @@
@@ -25,5 +25,5 @@ index 6472702fdd..fe9c19d1a2 100644
  #ifdef const
  #  undef const          // remove crazy C hackery in jconfig.h
 -- 
-2.39.2
+2.40.0
 
diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch
index 8b4eba5252c0..4825a9b56139 100644
--- a/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/0006-Support-finding-static-MariaDB-client-library.patch
@@ -1,4 +1,4 @@
-From 4bd1150d0750b5eb0f9d2ca0aa262d34fcab11aa Mon Sep 17 00:00:00 2001
+From cef672609c101ed359828c7e4b7762f7f464fa20 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
@@ -14,10 +14,10 @@ Change-Id: I8f9ba27e638619dba411ad0e37f2f03eab4775bf
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
-index cdfb469c71..bd634d6cbb 100644
+index b61d0107f2..6fb26e51f1 100644
 --- a/cmake/FindMySQL.cmake
 +++ b/cmake/FindMySQL.cmake
-@@ -60,13 +60,13 @@ find_path(MySQL_INCLUDE_DIR
+@@ -63,13 +63,13 @@ find_path(MySQL_INCLUDE_DIR
  
  find_library(MySQL_LIBRARY
               NO_PACKAGE_ROOT_PATH
@@ -34,5 +34,5 @@ index cdfb469c71..bd634d6cbb 100644
  endif()
  
 -- 
-2.39.2
+2.40.0
 
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 98421c2ac383..c0b5a79893d5 100644
--- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,4 +1,4 @@
-From ba72e0065156596ba81556e618ae8ff6c7aec091 Mon Sep 17 00:00:00 2001
+From 1c52bbeebea4325f7e6ff5adaa987c1aaaedcebe 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
@@ -10,12 +10,12 @@ Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
  1 file changed, 4 insertions(+)
 
 diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index f51e4d6ab5..175671ebcd 100644
+index 5246d67c37..4637820272 100644
 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-@@ -1,6 +1,10 @@
+@@ -4,6 +4,10 @@
  # These values should be kept in sync with those in qtbase/.cmake.conf
- cmake_minimum_required(VERSION 3.16...3.20)
+ cmake_minimum_required(VERSION 3.16...3.21)
  
 +if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE)
 +    set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}")
@@ -25,5 +25,5 @@ index f51e4d6ab5..175671ebcd 100644
  #
  # Macros and functions for building Qt modules
 -- 
-2.39.2
+2.40.0
 
diff --git a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
index c24d7e29c4f6..e4483a424366 100644
--- a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
@@ -1,4 +1,4 @@
-From 7d188c5f8e0fb4646ba339b429b94f400f7853b3 Mon Sep 17 00:00:00 2001
+From 3a6c3bf10d77edc588264f496f4a437579223fb7 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
@@ -28,10 +28,10 @@ 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 36dae764d7..0aa24cca77 100644
+index 5b8bc278e9..e3e2ca1829 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
-@@ -167,7 +167,7 @@ qt_internal_add_module(Gui
+@@ -175,7 +175,7 @@ qt_internal_add_module(Gui
          painting/qdrawingprimitive_sse2_p.h
          painting/qemulationpaintengine.cpp painting/qemulationpaintengine_p.h
          painting/qfixed_p.h
@@ -40,8 +40,8 @@ index 36dae764d7..0aa24cca77 100644
          painting/qicc.cpp painting/qicc_p.h
          painting/qimagescale.cpp painting/qimagescale_p.h
          painting/qmath_p.h
-@@ -274,6 +274,11 @@ qt_internal_add_module(Gui
-     GENERATE_CPP_EXPORTS
+@@ -284,6 +284,11 @@ qt_internal_add_module(Gui
+         "(^|/)qplatform.+\\.h$|(^|/)qwindowsystem.+\\.h$"
  )
  
 +# enable exceptions for painting/qgrayraster.cpp
@@ -248,5 +248,5 @@ index d0f2468e6a..d1d7d2e17a 100644
          "Description": "FreeType is a freely available software library to render fonts.",
          "Homepage": "http://www.freetype.org",
 -- 
-2.39.2
+2.40.0
 
diff --git a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
index c53f74ab1bbb..fab30efe9552 100644
--- a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
+++ b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
@@ -1,4 +1,4 @@
-From e01c8d18eb0d74822cbacb7b8582af53d52b707b Mon Sep 17 00:00:00 2001
+From 0f4e793f81feda03ecf1b3cd21c635a0343c6841 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
@@ -33,10 +33,10 @@ index 0000000000..1a52327ae6
 +    set(Fontconfig_FOUND 1)
 +endif()
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 0aa24cca77..d144d000fb 100644
+index e3e2ca1829..8999bf76e6 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
-@@ -750,7 +750,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre
+@@ -699,7 +699,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
@@ -46,10 +46,10 @@ index 0aa24cca77..d144d000fb 100644
  
  qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS
 diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
-index 9844d778e6..c55d2ef2ab 100644
+index d8319c120b..afb3cf96bb 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
+@@ -42,7 +42,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()
@@ -59,5 +59,5 @@ index 9844d778e6..c55d2ef2ab 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.39.2
+2.40.0
 
diff --git a/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch b/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
index f1c99c8e3383..8ce7c58aeb2f 100644
--- a/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
+++ b/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
@@ -1,4 +1,4 @@
-From 6fe99004d9dd3384cab4efe81959f53536581ad2 Mon Sep 17 00:00:00 2001
+From 2400cc9196d3d472ea2632c9541f8878d4698f58 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
@@ -15,7 +15,7 @@ Change-Id: Ic87a94ec664c126a5af1012d31b068d3dc7ec947
  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
+index dc60289401..3dd06d4cd0 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
@@ -34,7 +34,7 @@ index d530d2d7f4..f5298642ca 100644
      XEVIE
      XF86DRI
      XINERAMA
-@@ -146,7 +146,7 @@ endforeach()
+@@ -142,7 +142,7 @@ endforeach()
  set(XCB_XCB_component_deps)
  set(XCB_COMPOSITE_component_deps XCB XFIXES)
  set(XCB_DAMAGE_component_deps XCB XFIXES)
@@ -44,5 +44,5 @@ index d530d2d7f4..f5298642ca 100644
  set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
  set(XCB_XVMC_component_deps XCB XV)
 -- 
-2.39.2
+2.40.0
 
diff --git a/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch b/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
index 2e8adc0deced..65024473cfec 100644
--- a/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
+++ b/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
@@ -1,4 +1,4 @@
-From 6f7fbfc9e01bea377dea78ac08958fc17f41178f Mon Sep 17 00:00:00 2001
+From b1aaada4a65ef09175f73df2059e81ec1ab590c3 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
@@ -70,5 +70,5 @@ index a6a16b494f..a5da57824c 100644
  set_package_properties(GLIB2 PROPERTIES
    URL "https://wiki.gnome.org/Projects/GLib"
 -- 
-2.39.2
+2.40.0
 
diff --git a/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch b/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
index 765280520b9d..81436f59950f 100644
--- a/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
+++ b/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
@@ -1,4 +1,4 @@
-From d5e7a66c30c3e6a2ccbe32b7119008654e7f78b2 Mon Sep 17 00:00:00 2001
+From c4463c0b74bd7693035b48ab609a6cf18c3480d8 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
@@ -49,5 +49,5 @@ index 233cc88d02..875c71377c 100644
  set_package_properties(Wayland PROPERTIES
      URL "http://wayland.freedesktop.org"
 -- 
-2.39.2
+2.40.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 34ebdd7578b6..7d3895df95b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase
 
 pkgname=mingw-w64-qt6-base
-_qtver=6.4.3
+_qtver=6.5.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -43,19 +43,19 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         '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=('5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60'
-            '90910e209a4ee9e5ce7a8e6352bd3d53197a8d11a6f6385b2cbc1be2732c10b0'
-            '12089a41e68e5708707301dac514e69578791c57926f79903b6011ddfedaf3b3'
-            'a6aa4d12dd99c1cfa4dc53f6f8d348e3f0a9f5a4f56ef55934d93763540af1b0'
-            'e9ba0c08d4ba390d501f7b0973c59effe71902d6fb577db2b1eda070e50036c0'
-            '6dcdb034cebe1c3db9e3c26e3eb3ed5cd73b2f32b2a69ec65b2d490ebc28eadb'
-            '35e3e9f71af5bff857f4d8fec2f7805b5e74e998212f9e0468713fb79b5bc28b'
-            'a023ba4db23599ef8141da35e576c169fd2d98266b3c33af0b555da971299b51'
-            '6b417acac9059b5b2da850a3da48432526ac3f95fa6b713a6cad9ad1cc9c2c2e'
-            '58fdfd58b66a4ee2c968b7190c47b058b576c374483f3860e59e44f5856e6fe0'
-            '47434e7a794ac04e689658458331abdb839abb0407577d9edf50272fe864d329'
-            '0fbc4aee0aaf9fbb34f1b9ffaf82b1ceeb07d1d0bd25f3a2a441a13b06d650ac'
-            'a98277ea7bfa934ae9f3378125dc5b6d9849dfe861da787f760e89208f99c763')
+sha256sums=('fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef'
+            '0cb9c1a10d04575b36b0abe4a422af1e7279b3e07249b2af5fa7631dcc93d262'
+            'a26661954e7c1b1c74bb1563d8d269f8b7dfda196640e30eded9c03be27656e1'
+            '61fd2877aff4ba0d471ec88cf85c08dac8e522d0a0312739c134fb1a483474f0'
+            '95d18cb173cc0c13323a8394f8c536c2f78157928d6ddc959f20031a913f3960'
+            '004a09d1e475f3288f599f83c6ec183e479ba58ed8e12286e0050935428ee470'
+            'e3ea83b5c934ff3f5f8d9c48ecc3831eb66379f134247d61664a10837107bd46'
+            'fb3b3e2c49d0e3466410dd03a936dc127b7669e5de7e11dbbe721baed8544043'
+            '32f80d7cedbb4b32e4689c28b4d0ddb64ea4e4d74612738a56c771d9179eecf7'
+            'a2d54f21fa6205fb4273dd8f7b51b679c9c20f91021af46ccfd251addce775b8'
+            '4c8f6c5aec035a6fbe59973e88adb0817b24464881f958d70eff030c42884072'
+            '3bdbbab00cbef3915031f7eb1d174e54107fee8b326f17c8291d5129ba0d606f'
+            '0908f24881d7ae5c09abe58a1d5a1ca81a6f8139fcf15924cae9fc9feb6eb4dc')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index 3a8af9eb8833..14dc368e8b84 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60
+fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef