depends: qt: bump to 6.5.0-beta1

contrib/depends/packages/libxcb_util_cursor.mk

@@ -0,0 +1,31 @@
+package=libxcb_util_cursor
+$(package)_version=0.1.4
+$(package)_download_path=https://xcb.freedesktop.org/dist
+$(package)_file_name=xcb-util-cursor-$($(package)_version).tar.gz
+$(package)_sha256_hash=cc8608ebb695742b6cf84712be29b2b66aa5f6768039528794fca0fa283022bf
+$(package)_dependencies=libxcb libxcb_util_render libxcb_util_image
+
+define $(package)_set_vars
+$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
+$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
+endef
+
+define $(package)_preprocess_cmds
+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
+endef
+
+define $(package)_config_cmds
+  $($(package)_autoconf)
+endef
+
+define $(package)_build_cmds
+  $(MAKE)
+endef
+
+define $(package)_stage_cmds
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install
+endef
+
+define $(package)_postprocess_cmds
+  rm -rf share/man share/doc lib/*.la
+endef

contrib/depends/packages/native_libxcb_util_cursor.mk

@@ -0,0 +1,31 @@
+package=native_libxcb_util_cursor
+$(package)_version=0.1.4
+$(package)_download_path=https://xcb.freedesktop.org/dist
+$(package)_file_name=xcb-util-cursor-$($(package)_version).tar.gz
+$(package)_sha256_hash=cc8608ebb695742b6cf84712be29b2b66aa5f6768039528794fca0fa283022bf
+$(package)_dependencies=native_libxcb native_libxcb_util_render native_libxcb_util_image
+
+define $(package)_set_vars
+$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
+$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
+endef
+
+define $(package)_preprocess_cmds
+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
+endef
+
+define $(package)_config_cmds
+  $($(package)_autoconf)
+endef
+
+define $(package)_build_cmds
+  $(MAKE)
+endef
+
+define $(package)_stage_cmds
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install
+endef
+
+define $(package)_postprocess_cmds
+  rm -rf share/man share/doc lib/*.la
+endef

contrib/depends/packages/native_qt.mk

@@ -1,10 +1,10 @@
 package=native_qt
-$(package)_version=6.4.1
+$(package)_version=6.5.0-beta1
-$(package)_download_path=https://download.qt.io/official_releases/qt/6.4/$($(package)_version)/submodules
+$(package)_download_path=https://download.qt.io/development_releases/qt/6.5/$($(package)_version)/submodules
 $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae
+$(package)_sha256_hash=8357aa58c86ade1eeda535177b5e40578662a1a3f75571bfb799e1eae356b2ce
-$(package)_dependencies=native_libxcb native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_wm
+$(package)_dependencies=native_libxcb native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_wm native_libxcb_util_cursor
 $(package)_mingw32_dependencies=native_cmake
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert
@@ -15,27 +15,24 @@ $(package)_patches += mac-qmake.conf
 $(package)_patches += no_pthread_cond_clockwait.patch
 $(package)_patches += no-renameat2.patch
 $(package)_patches += no-statx.patch
-$(package)_patches += no-xlib.patch
 $(package)_patches += qtbase-moc-ignore-gcc-macro.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += root_CMakeLists.txt
-$(package)_patches += Use-consistent-ordering-in-QShader.patch
-$(package)_patches += QShader_map.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=44dbc6f1d256d2048c96fa665c240e0075c2e67188c93986a39ede3556a16a12
+$(package)_qttranslations_sha256_hash=b2a9f1225d613d5958f0993e28cbdc75c115a430df2054a544cdd2bb87656982
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=9e20562c6b04c21fbdb4ed89e59226169ffeaafaab8f45f7d81ea49b0e4b0933
+$(package)_qttools_sha256_hash=ee62073cf9e0866e15c4d4f643bca094329c57a534ad3f4b1789803be45ab1af
 
 $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
-$(package)_qtsvg_sha256_hash=5e5345c5941567db883f9daf8ab25108c6f3a527453b1a13c62290849bce9ce5
+$(package)_qtsvg_sha256_hash=20e96ef340491c49b4150e7153a37263dac064b9655f7944088f6d1cbfbfd446
 
 $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
-$(package)_qtmultimedia_sha256_hash=c086d43a026e6090971fd7a697ef8370c5c455115240609cd08d5e2f840dbaaf
+$(package)_qtmultimedia_sha256_hash=3cd15bee887d49593db1f3a075c7b4b5854c1816d665862d9b31b966eabee32e
 
 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
-$(package)_qtshadertools_sha256_hash=6bc1748326088c87f562fa3a68140e33fde162fd1333fbfecb775aeb66114504
+$(package)_qtshadertools_sha256_hash=58e37ea1fabcf383768c7fa93cb74d981ea95915a2802283deea8d82134668f8
 
 $(package)_extra_sources  = $($(package)_qttranslations_file_name)
 $(package)_extra_sources += $($(package)_qttools_file_name)
@@ -176,7 +173,6 @@ endef
 define $(package)_preprocess_cmds
   cp $($(package)_patch_dir)/root_CMakeLists.txt CMakeLists.txt && \
   patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
-  patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
   patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
   patch -p1 -i $($(package)_patch_dir)/fast_fixed_dtoa_no_optimize.patch && \
@@ -184,10 +180,6 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/no-statx.patch && \
   patch -p1 -i $($(package)_patch_dir)/no-renameat2.patch && \
   patch -p1 -i $($(package)_patch_dir)/no_pthread_cond_clockwait.patch && \
-  cd qtbase && \
-  patch -p1 -i $($(package)_patch_dir)/Use-consistent-ordering-in-QShader.patch && \
-  patch -p1 -i $($(package)_patch_dir)/QShader_map.patch && \
-  cd .. && \
   mkdir -p qtbase/mkspecs/macx-clang-linux &&\
   cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
@@ -214,6 +206,7 @@ define $(package)_config_cmds
 endef
 
 define $(package)_build_cmds
+  cmake --build . --target syncqt_build && \
   $(MAKE)
 endef
 

contrib/depends/packages/packages.mk

@@ -1,5 +1,5 @@
 packages := boost openssl libiconv ldns unbound qrencode zbar sodium polyseed hidapi protobuf libusb zlib libgpg-error libgcrypt expat libzip
-native_packages := native_libxcb native_xcb_proto native_libXau native_xproto native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_wm native_qt native_protobuf
+native_packages := native_libxcb native_xcb_proto native_libXau native_xproto native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_cursor native_libxcb_util_wm native_qt native_protobuf
 
 linux_packages := eudev liblzma libarchive libfuse libsquashfuse libappimage appimage_runtime
 linux_native_packages = native_patchelf
@@ -10,7 +10,7 @@ darwin_native_packages = native_cctools native_libtapi native_clang native_ds_st
 mingw32_packages = icu4c
 mingw32_native_packages = native_cmake
 
-qt_linux_packages := libxcb xcb_proto libXau xproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm freetype fontconfig qt
+qt_linux_packages := libxcb xcb_proto libXau xproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_cursor libxcb_util_wm freetype fontconfig qt
 qt_darwin_packages := qt
 qt_mingw32_packages := qt
 

contrib/depends/packages/qt.mk

@@ -1,12 +1,12 @@
 package=qt
-$(package)_version=6.4.1
+$(package)_version=6.5.0-beta1
-$(package)_download_path=https://download.qt.io/official_releases/qt/6.4/$($(package)_version)/submodules
+$(package)_download_path=https://download.qt.io/development_releases/qt/6.5/$($(package)_version)/submodules
 $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae
+$(package)_sha256_hash=8357aa58c86ade1eeda535177b5e40578662a1a3f75571bfb799e1eae356b2ce
 $(package)_darwin_dependencies=native_cctools native_qt openssl
 $(package)_mingw32_dependencies=openssl native_cmake native_qt native_libxkbcommon
-$(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
+$(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm libxcb_util_cursor
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert
 $(package)_patches  = aarch64Toolchain.cmake
@@ -20,33 +20,31 @@ $(package)_patches += no_pthread_cond_clockwait.patch
 $(package)_patches += no-renameat2.patch
 $(package)_patches += no-statx.patch
 $(package)_patches += no_wraprt_on_apple.patch
-$(package)_patches += no-xlib.patch
 $(package)_patches += qtbase-moc-ignore-gcc-macro.patch
 $(package)_patches += qtmultimedia-fixes.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += root_CMakeLists.txt
+$(package)_patches += v4l2.patch
 $(package)_patches += windows_func_fix.patch
 $(package)_patches += WindowsToolchain.cmake
-$(package)_patches += Use-consistent-ordering-in-QShader.patch
-$(package)_patches += QShader_map.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=44dbc6f1d256d2048c96fa665c240e0075c2e67188c93986a39ede3556a16a12
+$(package)_qttranslations_sha256_hash=b2a9f1225d613d5958f0993e28cbdc75c115a430df2054a544cdd2bb87656982
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=9e20562c6b04c21fbdb4ed89e59226169ffeaafaab8f45f7d81ea49b0e4b0933
+$(package)_qttools_sha256_hash=ee62073cf9e0866e15c4d4f643bca094329c57a534ad3f4b1789803be45ab1af
 
 $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
-$(package)_qtsvg_sha256_hash=5e5345c5941567db883f9daf8ab25108c6f3a527453b1a13c62290849bce9ce5
+$(package)_qtsvg_sha256_hash=20e96ef340491c49b4150e7153a37263dac064b9655f7944088f6d1cbfbfd446
 
 $(package)_qtwebsockets_file_name=qtwebsockets-$($(package)_suffix)
-$(package)_qtwebsockets_sha256_hash=537789ea56403ea8a15e115d7f503c3ead630192e97ec99464810fcdb5d67a24
+$(package)_qtwebsockets_sha256_hash=26f207d5532fb06316fe1193f99e5a02d2a95f52986a40101effea516f2fa889
 
 $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
-$(package)_qtmultimedia_sha256_hash=c086d43a026e6090971fd7a697ef8370c5c455115240609cd08d5e2f840dbaaf
+$(package)_qtmultimedia_sha256_hash=3cd15bee887d49593db1f3a075c7b4b5854c1816d665862d9b31b966eabee32e
 
 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
-$(package)_qtshadertools_sha256_hash=6bc1748326088c87f562fa3a68140e33fde162fd1333fbfecb775aeb66114504
+$(package)_qtshadertools_sha256_hash=58e37ea1fabcf383768c7fa93cb74d981ea95915a2802283deea8d82134668f8
 
 $(package)_extra_sources  = $($(package)_qttranslations_file_name)
 $(package)_extra_sources += $($(package)_qttools_file_name)
@@ -252,7 +250,6 @@ endef
 define $(package)_preprocess_cmds
   cp $($(package)_patch_dir)/root_CMakeLists.txt CMakeLists.txt && \
   patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
-  patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
   patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
   patch -p1 -i $($(package)_patch_dir)/fast_fixed_dtoa_no_optimize.patch && \
@@ -266,12 +263,9 @@ define $(package)_preprocess_cmds
   mv $($(package)_patch_dir)/MacToolchain.cmake . && \
   mv $($(package)_patch_dir)/aarch64Toolchain.cmake . && \
   mv $($(package)_patch_dir)/gnueabihfToolchain.cmake . && \
-  cd qtbase && \
-  patch -p1 -i $($(package)_patch_dir)/Use-consistent-ordering-in-QShader.patch && \
-  patch -p1 -i $($(package)_patch_dir)/QShader_map.patch && \
-  cd .. && \
   cd qtmultimedia && \
   patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
+  patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \
   cd .. && \
   mkdir -p qtbase/mkspecs/macx-clang-linux &&\
   cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
@@ -346,6 +340,11 @@ define $(package)_build_cmds
   export LD_LIBRARY_PATH=${build_prefix}/lib/ && \
   $(MAKE)
 endef
+else ifneq (,$(findstring x86_64,$(HOST)))
+define $(package)_build_cmds
+  cmake --build . --target syncqt_build && \
+  $(MAKE)
+endef
 else
 define $(package)_build_cmds
   export LD_LIBRARY_PATH=${build_prefix}/lib/ && \

contrib/depends/patches/native_qt/Use-consistent-ordering-in-QShader.patch

@@ -1,145 +0,0 @@
-From 9dced35b41882c42f4239a6380bd86dfda4cd7f5 Mon Sep 17 00:00:00 2001
-From: Laszlo Agocs <laszlo.agocs@qt.io>
-Date: Fri, 10 Jun 2022 12:09:11 +0200
-Subject: [PATCH] Use consistent ordering in QShader
-
-Fixes: QTBUG-101923
-Change-Id: I62df3eba773350e47ed650acb00bc42b3ce6a899
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Andy Nichols <andy.nichols@qt.io>
----
- src/gui/rhi/qshader.cpp                    | 38 ++++++++++++++++++++++
- src/gui/rhi/qshader_p.h                    |  2 ++
- src/gui/rhi/qshader_p_p.h                  |  9 ++---
- tests/auto/gui/rhi/qshader/tst_qshader.cpp | 11 +++++++
- 4 files changed, 56 insertions(+), 4 deletions(-)
-
-diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp
-index 1992708ba4..cd4a9f3854 100644
---- a/src/gui/rhi/qshader.cpp
-+++ b/src/gui/rhi/qshader.cpp
-@@ -563,6 +563,22 @@ size_t qHash(const QShaderVersion &s, size_t seed) noexcept
- }
- #endif
- 
-+/*!
-+    Establishes a sorting order between the two QShaderVersion \a lhs and \a rhs.
-+
-+    \relates QShaderVersion
-+ */
-+bool operator<(const QShaderVersion &lhs, const QShaderVersion &rhs) noexcept
-+{
-+    if (lhs.version() < rhs.version())
-+        return true;
-+
-+    if (lhs.version() == rhs.version())
-+        return int(lhs.flags()) < int(rhs.flags());
-+
-+    return false;
-+}
-+
- /*!
-     \internal
-     \fn bool operator!=(const QShaderVersion &lhs, const QShaderVersion &rhs)
-@@ -584,6 +600,28 @@ bool operator==(const QShaderKey &lhs, const QShaderKey &rhs) noexcept
-             && lhs.sourceVariant() == rhs.sourceVariant();
- }
- 
-+/*!
-+    Establishes a sorting order between the two keys \a lhs and \a rhs.
-+
-+    \relates QShaderKey
-+ */
-+bool operator<(const QShaderKey &lhs, const QShaderKey &rhs) noexcept
-+{
-+    if (int(lhs.source()) < int(rhs.source()))
-+        return true;
-+
-+    if (int(lhs.source()) == int(rhs.source())) {
-+        if (lhs.sourceVersion() < rhs.sourceVersion())
-+            return true;
-+        if (lhs.sourceVersion() == rhs.sourceVersion()) {
-+            if (int(lhs.sourceVariant()) < int(rhs.sourceVariant()))
-+                return true;
-+        }
-+    }
-+
-+    return false;
-+}
-+
- /*!
-     \internal
-     \fn bool operator!=(const QShaderKey &lhs, const QShaderKey &rhs)
-diff --git a/src/gui/rhi/qshader_p.h b/src/gui/rhi/qshader_p.h
-index 690a7f44cd..c6ef338bfa 100644
---- a/src/gui/rhi/qshader_p.h
-+++ b/src/gui/rhi/qshader_p.h
-@@ -187,7 +187,9 @@ inline bool operator!=(const QShader &lhs, const QShader &rhs) noexcept
- }
- 
- Q_GUI_EXPORT bool operator==(const QShaderVersion &lhs, const QShaderVersion &rhs) noexcept;
-+Q_GUI_EXPORT bool operator<(const QShaderVersion &lhs, const QShaderVersion &rhs) noexcept;
- Q_GUI_EXPORT bool operator==(const QShaderKey &lhs, const QShaderKey &rhs) noexcept;
-+Q_GUI_EXPORT bool operator<(const QShaderKey &lhs, const QShaderKey &rhs) noexcept;
- Q_GUI_EXPORT bool operator==(const QShaderCode &lhs, const QShaderCode &rhs) noexcept;
- 
- inline bool operator!=(const QShaderVersion &lhs, const QShaderVersion &rhs) noexcept
-diff --git a/src/gui/rhi/qshader_p_p.h b/src/gui/rhi/qshader_p_p.h
-index c87f882bc5..e9d1e31aaf 100644
---- a/src/gui/rhi/qshader_p_p.h
-+++ b/src/gui/rhi/qshader_p_p.h
-@@ -17,7 +17,7 @@
- 
- #include "qshader_p.h"
- #include <QtCore/QAtomicInt>
--#include <QtCore/QHash>
-+#include <QtCore/QMap>
- #include <QtCore/QDebug>
- 
- QT_BEGIN_NAMESPACE
-@@ -54,9 +54,10 @@ struct Q_GUI_EXPORT QShaderPrivate
-     int qsbVersion = QSB_VERSION;
-     QShader::Stage stage = QShader::VertexStage;
-     QShaderDescription desc;
--    QHash<QShaderKey, QShaderCode> shaders;
--    QHash<QShaderKey, QShader::NativeResourceBindingMap> bindings;
--    QHash<QShaderKey, QShader::SeparateToCombinedImageSamplerMappingList> combinedImageMap;
-+    // QMap not QHash because we need to be able to iterate based on sorted keys
-+    QMap<QShaderKey, QShaderCode> shaders;
-+    QMap<QShaderKey, QShader::NativeResourceBindingMap> bindings;
-+    QMap<QShaderKey, QShader::SeparateToCombinedImageSamplerMappingList> combinedImageMap;
- };
- 
- QT_END_NAMESPACE
-diff --git a/tests/auto/gui/rhi/qshader/tst_qshader.cpp b/tests/auto/gui/rhi/qshader/tst_qshader.cpp
-index cd883b34d9..40aa9d9a87 100644
---- a/tests/auto/gui/rhi/qshader/tst_qshader.cpp
-+++ b/tests/auto/gui/rhi/qshader/tst_qshader.cpp
-@@ -18,6 +18,7 @@ private slots:
-     void genVariants();
-     void shaderDescImplicitSharing();
-     void bakedShaderImplicitSharing();
-+    void sortedKeys();
-     void mslResourceMapping();
-     void serializeShaderDesc();
-     void comparison();
-@@ -238,6 +239,16 @@ void tst_QShader::bakedShaderImplicitSharing()
-     }
- }
- 
-+void tst_QShader::sortedKeys()
-+{
-+    QShader s = getShader(QLatin1String(":/data/texture_all_v4.frag.qsb"));
-+    QVERIFY(s.isValid());
-+    QList<QShaderKey> availableShaders = s.availableShaders();
-+    QCOMPARE(availableShaders.count(), 7);
-+    std::sort(availableShaders.begin(), availableShaders.end());
-+    QCOMPARE(availableShaders, s.availableShaders());
-+}
-+
- void tst_QShader::mslResourceMapping()
- {
-     QShader s = getShader(QLatin1String(":/data/texture_all_v4.frag.qsb"));
--- 
-2.39.0
-

contrib/depends/patches/native_qt/no-xlib.patch

@@ -1,68 +0,0 @@
-From 0171c86423f6c5aa8becf1259d42a3e67b8da59c Mon Sep 17 00:00:00 2001
-From: tobtoht <tob@featherwallet.org>
-Date: Sun, 30 Oct 2022 17:43:43 +0100
-Subject: [PATCH] no xlib
-
----
- src/plugins/platforms/xcb/qxcbcursor.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-index 2cc39f1e85..90efc1f1fb 100644
---- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -13,7 +13,9 @@
- #include <QtGui/QWindow>
- #include <QtGui/QBitmap>
- #include <QtGui/private/qguiapplication_p.h>
-+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
- #include <X11/cursorfont.h>
-+#endif
- #include <xcb/xfixes.h>
- #include <xcb/xcb_image.h>
- 
-@@ -357,6 +359,7 @@ void QXcbCursor::changeCursor(QCursor *cursor, QWindow *window)
-     xcb_flush(xcb_connection());
- }
- 
-+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
- static int cursorIdForShape(int cshape)
- {
-     int cursorId = 0;
-@@ -410,6 +413,7 @@ static int cursorIdForShape(int cshape)
-     }
-     return cursorId;
- }
-+#endif
- 
- xcb_cursor_t QXcbCursor::createNonStandardCursor(int cshape)
- {
-@@ -524,7 +528,9 @@ static xcb_cursor_t loadCursor(void *dpy, int cshape)
- xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
- {
-     xcb_connection_t *conn = xcb_connection();
-+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
-     int cursorId = cursorIdForShape(cshape);
-+#endif
-     xcb_cursor_t cursor = XCB_NONE;
- 
- #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
-@@ -556,6 +562,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
-     // Non-standard X11 cursors are created from bitmaps
-     cursor = createNonStandardCursor(cshape);
- 
-+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
-     // Create a glyph cursor if everything else failed
-     if (!cursor && cursorId) {
-         cursor = xcb_generate_id(conn);
-@@ -563,6 +570,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
-                                 cursorId, cursorId + 1,
-                                 0xFFFF, 0xFFFF, 0xFFFF, 0, 0, 0);
-     }
-+#endif
- 
-     if (cursor && cshape >= 0 && cshape < Qt::LastCursor && connection()->hasXFixes()) {
-         const char *name = cursorNames[cshape].front();
--- 
-2.38.1
-

contrib/depends/patches/qt/QShader_map.patch

@@ -1,21 +0,0 @@
-diff --git a/src/gui/rhi/qshader_p.h b/src/gui/rhi/qshader_p.h
-index 690a7f44cd..8e5894c97f 100644
---- a/src/gui/rhi/qshader_p.h
-+++ b/src/gui/rhi/qshader_p.h
-@@ -17,6 +17,7 @@
- 
- #include <QtGui/qtguiglobal.h>
- #include <QtCore/qhash.h>
-+#include <QtCore/qmap.h>
- #include <private/qshaderdescription_p.h>
- 
- QT_BEGIN_NAMESPACE
-@@ -127,7 +128,7 @@ public:
-     QByteArray serialized() const;
-     static QShader fromSerialized(const QByteArray &data);
- 
--    using NativeResourceBindingMap = QHash<int, QPair<int, int> >; // binding -> native_binding[, native_binding]
-+    using NativeResourceBindingMap = QMap<int, QPair<int, int> >; // binding -> native_binding[, native_binding]
-     NativeResourceBindingMap nativeResourceBindingMap(const QShaderKey &key) const;
-     void setResourceBindingMap(const QShaderKey &key, const NativeResourceBindingMap &map);
-     void removeResourceBindingMap(const QShaderKey &key);

contrib/depends/patches/qt/Use-consistent-ordering-in-QShader.patch

@@ -1,145 +0,0 @@
-From 9dced35b41882c42f4239a6380bd86dfda4cd7f5 Mon Sep 17 00:00:00 2001
-From: Laszlo Agocs <laszlo.agocs@qt.io>
-Date: Fri, 10 Jun 2022 12:09:11 +0200
-Subject: [PATCH] Use consistent ordering in QShader
-
-Fixes: QTBUG-101923
-Change-Id: I62df3eba773350e47ed650acb00bc42b3ce6a899
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Andy Nichols <andy.nichols@qt.io>
----
- src/gui/rhi/qshader.cpp                    | 38 ++++++++++++++++++++++
- src/gui/rhi/qshader_p.h                    |  2 ++
- src/gui/rhi/qshader_p_p.h                  |  9 ++---
- tests/auto/gui/rhi/qshader/tst_qshader.cpp | 11 +++++++
- 4 files changed, 56 insertions(+), 4 deletions(-)
-
-diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp
-index 1992708ba4..cd4a9f3854 100644
---- a/src/gui/rhi/qshader.cpp
-+++ b/src/gui/rhi/qshader.cpp
-@@ -563,6 +563,22 @@ size_t qHash(const QShaderVersion &s, size_t seed) noexcept
- }
- #endif
- 
-+/*!
-+    Establishes a sorting order between the two QShaderVersion \a lhs and \a rhs.
-+
-+    \relates QShaderVersion
-+ */
-+bool operator<(const QShaderVersion &lhs, const QShaderVersion &rhs) noexcept
-+{
-+    if (lhs.version() < rhs.version())
-+        return true;
-+
-+    if (lhs.version() == rhs.version())
-+        return int(lhs.flags()) < int(rhs.flags());
-+
-+    return false;
-+}
-+
- /*!
-     \internal
-     \fn bool operator!=(const QShaderVersion &lhs, const QShaderVersion &rhs)
-@@ -584,6 +600,28 @@ bool operator==(const QShaderKey &lhs, const QShaderKey &rhs) noexcept
-             && lhs.sourceVariant() == rhs.sourceVariant();
- }
- 
-+/*!
-+    Establishes a sorting order between the two keys \a lhs and \a rhs.
-+
-+    \relates QShaderKey
-+ */
-+bool operator<(const QShaderKey &lhs, const QShaderKey &rhs) noexcept
-+{
-+    if (int(lhs.source()) < int(rhs.source()))
-+        return true;
-+
-+    if (int(lhs.source()) == int(rhs.source())) {
-+        if (lhs.sourceVersion() < rhs.sourceVersion())
-+            return true;
-+        if (lhs.sourceVersion() == rhs.sourceVersion()) {
-+            if (int(lhs.sourceVariant()) < int(rhs.sourceVariant()))
-+                return true;
-+        }
-+    }
-+
-+    return false;
-+}
-+
- /*!
-     \internal
-     \fn bool operator!=(const QShaderKey &lhs, const QShaderKey &rhs)
-diff --git a/src/gui/rhi/qshader_p.h b/src/gui/rhi/qshader_p.h
-index 690a7f44cd..c6ef338bfa 100644
---- a/src/gui/rhi/qshader_p.h
-+++ b/src/gui/rhi/qshader_p.h
-@@ -187,7 +187,9 @@ inline bool operator!=(const QShader &lhs, const QShader &rhs) noexcept
- }
- 
- Q_GUI_EXPORT bool operator==(const QShaderVersion &lhs, const QShaderVersion &rhs) noexcept;
-+Q_GUI_EXPORT bool operator<(const QShaderVersion &lhs, const QShaderVersion &rhs) noexcept;
- Q_GUI_EXPORT bool operator==(const QShaderKey &lhs, const QShaderKey &rhs) noexcept;
-+Q_GUI_EXPORT bool operator<(const QShaderKey &lhs, const QShaderKey &rhs) noexcept;
- Q_GUI_EXPORT bool operator==(const QShaderCode &lhs, const QShaderCode &rhs) noexcept;
- 
- inline bool operator!=(const QShaderVersion &lhs, const QShaderVersion &rhs) noexcept
-diff --git a/src/gui/rhi/qshader_p_p.h b/src/gui/rhi/qshader_p_p.h
-index c87f882bc5..e9d1e31aaf 100644
---- a/src/gui/rhi/qshader_p_p.h
-+++ b/src/gui/rhi/qshader_p_p.h
-@@ -17,7 +17,7 @@
- 
- #include "qshader_p.h"
- #include <QtCore/QAtomicInt>
--#include <QtCore/QHash>
-+#include <QtCore/QMap>
- #include <QtCore/QDebug>
- 
- QT_BEGIN_NAMESPACE
-@@ -54,9 +54,10 @@ struct Q_GUI_EXPORT QShaderPrivate
-     int qsbVersion = QSB_VERSION;
-     QShader::Stage stage = QShader::VertexStage;
-     QShaderDescription desc;
--    QHash<QShaderKey, QShaderCode> shaders;
--    QHash<QShaderKey, QShader::NativeResourceBindingMap> bindings;
--    QHash<QShaderKey, QShader::SeparateToCombinedImageSamplerMappingList> combinedImageMap;
-+    // QMap not QHash because we need to be able to iterate based on sorted keys
-+    QMap<QShaderKey, QShaderCode> shaders;
-+    QMap<QShaderKey, QShader::NativeResourceBindingMap> bindings;
-+    QMap<QShaderKey, QShader::SeparateToCombinedImageSamplerMappingList> combinedImageMap;
- };
- 
- QT_END_NAMESPACE
-diff --git a/tests/auto/gui/rhi/qshader/tst_qshader.cpp b/tests/auto/gui/rhi/qshader/tst_qshader.cpp
-index cd883b34d9..40aa9d9a87 100644
---- a/tests/auto/gui/rhi/qshader/tst_qshader.cpp
-+++ b/tests/auto/gui/rhi/qshader/tst_qshader.cpp
-@@ -18,6 +18,7 @@ private slots:
-     void genVariants();
-     void shaderDescImplicitSharing();
-     void bakedShaderImplicitSharing();
-+    void sortedKeys();
-     void mslResourceMapping();
-     void serializeShaderDesc();
-     void comparison();
-@@ -238,6 +239,16 @@ void tst_QShader::bakedShaderImplicitSharing()
-     }
- }
- 
-+void tst_QShader::sortedKeys()
-+{
-+    QShader s = getShader(QLatin1String(":/data/texture_all_v4.frag.qsb"));
-+    QVERIFY(s.isValid());
-+    QList<QShaderKey> availableShaders = s.availableShaders();
-+    QCOMPARE(availableShaders.count(), 7);
-+    std::sort(availableShaders.begin(), availableShaders.end());
-+    QCOMPARE(availableShaders, s.availableShaders());
-+}
-+
- void tst_QShader::mslResourceMapping()
- {
-     QShader s = getShader(QLatin1String(":/data/texture_all_v4.frag.qsb"));
--- 
-2.39.0
-

contrib/depends/patches/qt/no-xlib.patch

@@ -1,68 +0,0 @@
-From 0171c86423f6c5aa8becf1259d42a3e67b8da59c Mon Sep 17 00:00:00 2001
-From: tobtoht <tob@featherwallet.org>
-Date: Sun, 30 Oct 2022 17:43:43 +0100
-Subject: [PATCH] no xlib
-
----
- src/plugins/platforms/xcb/qxcbcursor.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-index 2cc39f1e85..90efc1f1fb 100644
---- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -13,7 +13,9 @@
- #include <QtGui/QWindow>
- #include <QtGui/QBitmap>
- #include <QtGui/private/qguiapplication_p.h>
-+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
- #include <X11/cursorfont.h>
-+#endif
- #include <xcb/xfixes.h>
- #include <xcb/xcb_image.h>
- 
-@@ -357,6 +359,7 @@ void QXcbCursor::changeCursor(QCursor *cursor, QWindow *window)
-     xcb_flush(xcb_connection());
- }
- 
-+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
- static int cursorIdForShape(int cshape)
- {
-     int cursorId = 0;
-@@ -410,6 +413,7 @@ static int cursorIdForShape(int cshape)
-     }
-     return cursorId;
- }
-+#endif
- 
- xcb_cursor_t QXcbCursor::createNonStandardCursor(int cshape)
- {
-@@ -524,7 +528,9 @@ static xcb_cursor_t loadCursor(void *dpy, int cshape)
- xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
- {
-     xcb_connection_t *conn = xcb_connection();
-+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
-     int cursorId = cursorIdForShape(cshape);
-+#endif
-     xcb_cursor_t cursor = XCB_NONE;
- 
- #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
-@@ -556,6 +562,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
-     // Non-standard X11 cursors are created from bitmaps
-     cursor = createNonStandardCursor(cshape);
- 
-+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
-     // Create a glyph cursor if everything else failed
-     if (!cursor && cursorId) {
-         cursor = xcb_generate_id(conn);
-@@ -563,6 +570,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
-                                 cursorId, cursorId + 1,
-                                 0xFFFF, 0xFFFF, 0xFFFF, 0, 0, 0);
-     }
-+#endif
- 
-     if (cursor && cshape >= 0 && cshape < Qt::LastCursor && connection()->hasXFixes()) {
-         const char *name = cursorNames[cshape].front();
--- 
-2.38.1
-