depends: qt: update to 6.9.1

diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk
index 8da856ffcfa04958231fec706319e64f44c9ea9f..a7e70de146b539a2d47b6c9b8c6c28bd1865cb89 100644 (file)
--- a/contrib/depends/packages/native_qt.mk
+++ b/contrib/depends/packages/native_qt.mk
@@ -1,31 +1,30 @@
 package=native_qt
-$(package)_version=6.9.0
+$(package)_version=6.9.1
 $(package)_download_path=https://download.qt.io/official_releases/qt/6.9/$($(package)_version)/submodules
 $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=c1800c2ea835801af04a05d4a32321d79a93954ee3ae2172bbeacf13d1f0598c
+$(package)_sha256_hash=40caedbf83cc9a1959610830563565889878bc95f115868bbf545d1914acf28e
 $(package)_linux_dependencies=native_wayland
 $(package)_qt_libs=corelib network widgets gui plugins testlib
-$(package)_patches  = fast_fixed_dtoa_no_optimize.patch
 $(package)_patches += guix_cross_lib_path.patch
 $(package)_patches += qtbase-moc-ignore-gcc-macro.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += root_CMakeLists.txt
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=fa645589cc3f939022401a926825972a44277dead8ec8607d9f2662e6529c9a4
+$(package)_qttools_sha256_hash=90c4a562f4ccfd043fd99f34c600853e0b5ba9babc6ec616c0f306f2ce3f4b4c
 
 $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
-$(package)_qtsvg_sha256_hash=ec359d930c95935ea48af58b100c2f5d0d275968ec8ca1e0e76629b7159215fc
+$(package)_qtsvg_sha256_hash=2dfc5de5fd891ff2afd9861e519bf1a26e6deb729b3133f68a28ba763c9abbd5
 
 $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
-$(package)_qtmultimedia_sha256_hash=995c3b194f3de3e1929280639642f7661d94aa57523c459dbbf2f71dbdcaa18c
+$(package)_qtmultimedia_sha256_hash=955e36459518ee55f8e2bb79defc6e44aa94dc1edf5ac58a22d7734b2e07391d
 
 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
-$(package)_qtshadertools_sha256_hash=916c40281ac3dee23b163f6ca73fb5bdeee344838b9a922b6f36269642d6f4bb
+$(package)_qtshadertools_sha256_hash=4e1ed24cce0887fb4b6c7be4f150239853a29c330c9717f6bacfb6376f3b4b74
 
 $(package)_qtwayland_file_name=qtwayland-$($(package)_suffix)
-$(package)_qtwayland_sha256_hash=503416fcb04db503bd130e6a49c45e3e546f091e83406f774a0c703130c91805
+$(package)_qtwayland_sha256_hash=7d21ea0e687180ebb19b9a1f86ae9cfa7a25b4f02d5db05ec834164409932e3e
 
 $(package)_extra_sources += $($(package)_qttools_file_name)
 $(package)_extra_sources += $($(package)_qtsvg_file_name)
@@ -158,7 +157,6 @@ define $(package)_preprocess_cmds
   cp $($(package)_patch_dir)/root_CMakeLists.txt CMakeLists.txt && \
   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 && \
   patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch
 endef
 

diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index 6a55596e57f1cc3924531c6739198c9dd5cbf2d8..cc00305fcfe88c9aa12a6feca966ab2f3dc7e909 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -1,13 +1,12 @@
 package=qt
-$(package)_version=6.9.0
+$(package)_version=6.9.1
 $(package)_download_path=https://download.qt.io/official_releases/qt/6.9/$($(package)_version)/submodules
 $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=c1800c2ea835801af04a05d4a32321d79a93954ee3ae2172bbeacf13d1f0598c
+$(package)_sha256_hash=40caedbf83cc9a1959610830563565889878bc95f115868bbf545d1914acf28e
 $(package)_darwin_dependencies=openssl native_qt
 $(package)_mingw32_dependencies=openssl native_qt
 $(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 dbus wayland native_wayland
-$(package)_patches += fast_fixed_dtoa_no_optimize.patch
 $(package)_patches += guix_cross_lib_path.patch
 $(package)_patches += qtbase-moc-ignore-gcc-macro.patch
 $(package)_patches += qtmultimedia-fixes.patch
@@ -22,27 +21,28 @@ $(package)_patches += revert-macOS-Silence-warning-about-supporting-secure.patch
 $(package)_patches += no-resonance-audio.patch
 $(package)_patches += fix_static_qt_darwin_camera_permissions.patch
 $(package)_patches += macos-available-qtbase.patch
-$(package)_patches += macos-available-qtmultimedia.patch
-$(package)_patches += qtwayland-tabletevent-fix.patch
+$(package)_patches += qtmultimedia_windows_fix_include.patch
+$(package)_patches += qtmultimedia_macos_fix_include.patch
+$(package)_patches += qtmultimedia_macos_fix_available.patch
 #$(package)_patches += fix-static-fontconfig-static-linking.patch
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=fa645589cc3f939022401a926825972a44277dead8ec8607d9f2662e6529c9a4
+$(package)_qttools_sha256_hash=90c4a562f4ccfd043fd99f34c600853e0b5ba9babc6ec616c0f306f2ce3f4b4c
 
 $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
-$(package)_qtsvg_sha256_hash=ec359d930c95935ea48af58b100c2f5d0d275968ec8ca1e0e76629b7159215fc
+$(package)_qtsvg_sha256_hash=2dfc5de5fd891ff2afd9861e519bf1a26e6deb729b3133f68a28ba763c9abbd5
 
 $(package)_qtwebsockets_file_name=qtwebsockets-$($(package)_suffix)
-$(package)_qtwebsockets_sha256_hash=6b3add7cacf3a4e0b448d5e69d9dac42795fef63309038af1dc5a454ce514940
+$(package)_qtwebsockets_sha256_hash=98be8c863b7f02cc98eedc0b6eac07544c10a9d2fa11c685fd61f6b243f748f5
 
 $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
-$(package)_qtmultimedia_sha256_hash=995c3b194f3de3e1929280639642f7661d94aa57523c459dbbf2f71dbdcaa18c
+$(package)_qtmultimedia_sha256_hash=955e36459518ee55f8e2bb79defc6e44aa94dc1edf5ac58a22d7734b2e07391d
 
 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
-$(package)_qtshadertools_sha256_hash=916c40281ac3dee23b163f6ca73fb5bdeee344838b9a922b6f36269642d6f4bb
+$(package)_qtshadertools_sha256_hash=4e1ed24cce0887fb4b6c7be4f150239853a29c330c9717f6bacfb6376f3b4b74
 
 $(package)_qtwayland_file_name=qtwayland-$($(package)_suffix)
-$(package)_qtwayland_sha256_hash=503416fcb04db503bd130e6a49c45e3e546f091e83406f774a0c703130c91805
+$(package)_qtwayland_sha256_hash=7d21ea0e687180ebb19b9a1f86ae9cfa7a25b4f02d5db05ec834164409932e3e
 
 $(package)_extra_sources += $($(package)_qttools_file_name)
 $(package)_extra_sources += $($(package)_qtsvg_file_name)
@@ -215,7 +215,6 @@ define $(package)_preprocess_cmds
   cp $($(package)_patch_dir)/root_CMakeLists.txt CMakeLists.txt && \
   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 && \
   patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \
   patch -p1 -i $($(package)_patch_dir)/windows_func_fix.patch && \
   mv $($(package)_patch_dir)/toolchain.cmake . && \
@@ -236,9 +235,9 @@ define $(package)_preprocess_cmds
   cd ../qtmultimedia && \
   patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
   patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \
-  patch -p1 -i $($(package)_patch_dir)/macos-available-qtmultimedia.patch && \
-  cd ../qtwayland && \
-  patch -p1 -i $($(package)_patch_dir)/qtwayland-tabletevent-fix.patch
+  patch -p1 -i $($(package)_patch_dir)/qtmultimedia_windows_fix_include.patch && \
+  patch -p1 -i $($(package)_patch_dir)/qtmultimedia_macos_fix_include.patch && \
+  patch -p1 -i $($(package)_patch_dir)/qtmultimedia_macos_fix_available.patch
 endef
 
 

diff --git a/contrib/depends/patches/native_qt/fast_fixed_dtoa_no_optimize.patch b/contrib/depends/patches/native_qt/fast_fixed_dtoa_no_optimize.patch
deleted file mode 100644 (file)
index 6bf4a43..0000000
--- a/contrib/depends/patches/native_qt/fast_fixed_dtoa_no_optimize.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Modify the optimisation flags for FastFixedDtoa.
-This fixes a non-determinism issue in the asm produced for
-this function when cross-compiling on x86_64 and aarch64 for
-the arm-linux-gnueabihf HOST.
-
---- a/qtbase/src/3rdparty/double-conversion/double-conversion/fixed-dtoa.h
-+++ b/qtbase/src/3rdparty/double-conversion/double-conversion/fixed-dtoa.h
-@@ -48,9 +48,12 @@ namespace double_conversion {
- //
- // This method only works for some parameters. If it can't handle the input it
- // returns false. The output is null-terminated when the function succeeds.
-+#pragma GCC push_options
-+#pragma GCC optimize ("-O1")
- bool FastFixedDtoa(double v, int fractional_count,
-                    Vector<char> buffer, int* length, int* decimal_point);
- 
-+#pragma GCC pop_options
- }  // namespace double_conversion
- 
- #endif  // DOUBLE_CONVERSION_FIXED_DTOA_H_

diff --git a/contrib/depends/patches/qt/fast_fixed_dtoa_no_optimize.patch b/contrib/depends/patches/qt/fast_fixed_dtoa_no_optimize.patch
deleted file mode 100644 (file)
index 6bf4a43..0000000
--- a/contrib/depends/patches/qt/fast_fixed_dtoa_no_optimize.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Modify the optimisation flags for FastFixedDtoa.
-This fixes a non-determinism issue in the asm produced for
-this function when cross-compiling on x86_64 and aarch64 for
-the arm-linux-gnueabihf HOST.
-
---- a/qtbase/src/3rdparty/double-conversion/double-conversion/fixed-dtoa.h
-+++ b/qtbase/src/3rdparty/double-conversion/double-conversion/fixed-dtoa.h
-@@ -48,9 +48,12 @@ namespace double_conversion {
- //
- // This method only works for some parameters. If it can't handle the input it
- // returns false. The output is null-terminated when the function succeeds.
-+#pragma GCC push_options
-+#pragma GCC optimize ("-O1")
- bool FastFixedDtoa(double v, int fractional_count,
-                    Vector<char> buffer, int* length, int* decimal_point);
- 
-+#pragma GCC pop_options
- }  // namespace double_conversion
- 
- #endif  // DOUBLE_CONVERSION_FIXED_DTOA_H_

diff --git a/contrib/depends/patches/qt/macos-available-qtmultimedia.patch b/contrib/depends/patches/qt/macos-available-qtmultimedia.patch
deleted file mode 100644 (file)
index 8700b71..0000000
--- a/contrib/depends/patches/qt/macos-available-qtmultimedia.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm b/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm
-index 940a964b7..bab2cebe0 100644
---- a/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm
-+++ b/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm
-@@ -176,14 +176,6 @@ void QAVFVideoDevices::updateCameraDevices()
- #endif
-     ];
- 
--#if QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_14_0, __IPHONE_17_0, __TVOS_NA, __WATCHOS_NA)
--    if (@available(macOS 14, iOS 17, *)) {
--      discoveryDevices = [discoveryDevices arrayByAddingObjectsFromArray: @[
--        AVCaptureDeviceTypeExternal,
--        AVCaptureDeviceTypeContinuityCamera
--      ]];
--    } else
--#endif
-     {
- #ifdef Q_OS_MACOS
-     QT_WARNING_PUSH

diff --git a/contrib/depends/patches/qt/qtmultimedia_macos_fix_available.patch b/contrib/depends/patches/qt/qtmultimedia_macos_fix_available.patch
new file mode 100644 (file)
index 0000000..3dda0c0
--- /dev/null
+++ b/contrib/depends/patches/qt/qtmultimedia_macos_fix_available.patch
@@ -0,0 +1,18 @@
+diff --git a/src/multimedia/darwin/qavfvideodevices.mm b/src/multimedia/darwin/qavfvideodevices.mm
+index c2d1f616f..ae5bbc072 100644
+--- a/src/multimedia/darwin/qavfvideodevices.mm
++++ b/src/multimedia/darwin/qavfvideodevices.mm
+@@ -53,12 +53,7 @@ namespace {
+ #endif
+     ];
+ 
+-    if (@available(macOS 14, iOS 17, *)) {
+-        discoveryDevices = [discoveryDevices arrayByAddingObjectsFromArray: @[
+-            AVCaptureDeviceTypeExternal,
+-            AVCaptureDeviceTypeContinuityCamera
+-        ]];
+-    } else {
++    {
+ #ifdef Q_OS_MACOS
+     QT_WARNING_PUSH
+         QT_WARNING_DISABLE_DEPRECATED

diff --git a/contrib/depends/patches/qt/qtmultimedia_macos_fix_include.patch b/contrib/depends/patches/qt/qtmultimedia_macos_fix_include.patch
new file mode 100644 (file)
index 0000000..f2a01ec
--- /dev/null
+++ b/contrib/depends/patches/qt/qtmultimedia_macos_fix_include.patch
@@ -0,0 +1,12 @@
+diff --git a/src/plugins/multimedia/darwin/mediaplayer/avfdisplaylink_p.h b/src/plugins/multimedia/darwin/mediaplayer/avfdisplaylink_p.h
+index 113d37a3e..d2c608443 100644
+--- a/src/plugins/multimedia/darwin/mediaplayer/avfdisplaylink_p.h
++++ b/src/plugins/multimedia/darwin/mediaplayer/avfdisplaylink_p.h
+@@ -25,6 +25,7 @@
+ #endif
+ 
+ #include <optional>
++#include <mutex>
+ 
+ QT_BEGIN_NAMESPACE
+ 

diff --git a/contrib/depends/patches/qt/qtmultimedia_windows_fix_include.patch b/contrib/depends/patches/qt/qtmultimedia_windows_fix_include.patch
new file mode 100644 (file)
index 0000000..ca0ade1
--- /dev/null
+++ b/contrib/depends/patches/qt/qtmultimedia_windows_fix_include.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/multimedia/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp
+index ccdd5b6c5..94218a5b9 100644
+--- a/src/plugins/multimedia/windows/player/mfplayersession.cpp
++++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp
+@@ -30,7 +30,7 @@
+ #include <mfidl.h>
+ #include <mmdeviceapi.h>
+ #include <propvarutil.h>
+-#include <Wininet.h>
++#include <wininet.h>
+ #include <functiondiscoverykeys_devpkey.h>
+ 
+ //#define DEBUG_MEDIAFOUNDATION

diff --git a/contrib/depends/patches/qt/qtwayland-tabletevent-fix.patch b/contrib/depends/patches/qt/qtwayland-tabletevent-fix.patch
deleted file mode 100644 (file)
index 960bbf0..0000000
--- a/contrib/depends/patches/qt/qtwayland-tabletevent-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
-index f435b953..068834c2 100644
---- a/src/client/qwaylandinputdevice.cpp
-+++ b/src/client/qwaylandinputdevice.cpp
-@@ -609,8 +609,10 @@ void QWaylandInputDevice::setCursor(const QCursor *cursor, const QSharedPointer<
-     if (mPointer)
-         mPointer->updateCursor();
- 
-+#if QT_CONFIG(tabletevent)
-     if (mTabletSeat)
-         mTabletSeat->updateCursor();
-+#endif
- }
- #endif
-