Qt6: Update to 6.9.1

June 03, 2024 by Jani Heikkinen

We have released Qt 6.9.1 today. As a patch release, Qt 6.9.1 does not
introduce new features but contains more than 450 bug fixes, security
updates, and other improvements on top of Qt 6.9.0 release. See more
information about the most important changes and bug fixes from the Qt
6.9.1 release note.

Announcement: https://www.qt.io/blog/qt-6.9.1-released
Release note:
https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.9.1/release-note.md

We (kde@) skipped shipping Qt 6.9.0 due to unacceptable rendering bugs
in the WebEngine component, but here are the announcements and release
notes from Qt 6.9.0.

Announcement: https://www.qt.io/blog/qt-6.9-released
Release note:
https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.9.0/release-note.md

PySide6: Update to 6.9.1

PySide6 and its related components have been updated alongside the Qt
release for compatibility. Older versions will not build with Qt 6.9.x.

Announcement: https://www.qt.io/blog/qt-for-python-release-6.9

PyQt6: Update to 6.9.1

As with PySide6, older versions of PyQt6 will not build with Qt 6.9.x.

Support tools like py-sip and py-qtbuilder have also been updated to their
latest versions.

Announcement: https://www.riverbankcomputing.com/news/PyQt_v6.9.0_Released
              https://www.riverbankcomputing.com/news/PyQt_v6.9.1_Released

PR:		286051
Exp-run by:	antoine

6 files changed, 19 insertions, 19 deletions

diff --git a/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake b/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake
index 03598d129790..b3afbc959c8e 100644
--- a/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake
+++ b/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake
@@ -1,11 +1,11 @@
---- cmake/FindFFmpeg.cmake.orig	2024-11-22 07:31:25 UTC
+--- cmake/FindFFmpeg.cmake.orig	2025-05-04 13:16:35 UTC
 +++ cmake/FindFFmpeg.cmake
-@@ -255,7 +255,7 @@ function(__ffmpeg_internal_set_dependencies _component
- 
-     # The pkgconfig directory is always in lib/pkgconfig/, even on Windows
-     # where libs and dlls are in bin/
--    set(PC_FILE ${${_component}_LIBRARY_DIR}/../lib/pkgconfig/lib${lib}.pc)
-+    set(PC_FILE ${${_component}_LIBRARY_DIR}/../libdata/pkgconfig/lib${lib}.pc)
+@@ -278,7 +278,7 @@ function(__ffmpeg_internal_set_dependencies _component
+     if (WIN32)
+         set(PC_FILE ${${_component}_LIBRARY_DIR}/../lib/pkgconfig/lib${lib}.pc)
+     else()
+-        set(PC_FILE ${${_component}_LIBRARY_DIR}/pkgconfig/lib${lib}.pc)
++        set(PC_FILE ${${_component}_LIBRARY_DIR}/../libdata/pkgconfig/lib${lib}.pc)
+     endif()
  
      if(EXISTS ${PC_FILE})
-         file(READ ${PC_FILE} pcfile)
diff --git a/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt
index 5b783c6ccaaf..4112b1c41f56 100644
--- a/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt
+++ b/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt
@@ -1,9 +1,9 @@
 Prevent building spatialaudio_quick3d if quick3d is installed and the feature
 is disabled.
 
---- src/CMakeLists.txt.orig	2023-11-08 02:47:23 UTC
+--- src/CMakeLists.txt.orig	2025-02-20 14:13:07 UTC
 +++ src/CMakeLists.txt
-@@ -16,7 +16,7 @@ endif()
+@@ -26,7 +26,7 @@ endif()
  if(TARGET Qt::Quick)
      add_subdirectory(multimediaquick)
  endif()
diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt
index cacf6404d45e..89722fa1d38a 100644
--- a/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt
+++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/multimedia/CMakeLists.txt.orig	2024-11-22 07:31:25 UTC
+--- src/multimedia/CMakeLists.txt.orig	2025-05-04 13:16:35 UTC
 +++ src/multimedia/CMakeLists.txt
-@@ -115,7 +115,7 @@ qt_internal_extend_target(Multimedia
+@@ -136,7 +136,7 @@ qt_internal_extend_target(Multimedia
  )
  
  qt_internal_extend_target(Multimedia
diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
index 058f21834cc5..508f5cd80e34 100644
--- a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
+++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
@@ -1,6 +1,6 @@
---- src/multimedia/configure.cmake.orig	2024-11-22 07:31:25 UTC
+--- src/multimedia/configure.cmake.orig	2025-05-04 13:16:35 UTC
 +++ src/multimedia/configure.cmake
-@@ -138,7 +138,7 @@ qt_feature("ffmpeg" PRIVATE
+@@ -132,7 +132,7 @@ qt_feature("ffmpeg" PRIVATE
      LABEL "FFmpeg"
      ENABLE INPUT_ffmpeg STREQUAL 'yes'
      DISABLE INPUT_ffmpeg STREQUAL 'no'
diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp
index 42f24b8af9cb..567d571867a6 100644
--- a/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp
+++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp
@@ -1,11 +1,11 @@
 Fix 32-bit builds with PULSEAUDIO option.
 
---- src/multimedia/pulseaudio/qpulseaudiosink.cpp.orig	2025-02-20 14:13:07 UTC
+--- src/multimedia/pulseaudio/qpulseaudiosink.cpp.orig	2025-05-04 13:16:35 UTC
 +++ src/multimedia/pulseaudio/qpulseaudiosink.cpp
-@@ -496,8 +496,8 @@ qint64 QPulseAudioSink::write(const char *data, qint64
+@@ -491,8 +491,8 @@ qint64 QPulseAudioSink::write(const char *data, qint64
      // or even affect the system volume if flat volumes are enabled
  
-     QAudioHelperInternal::applyVolume(m_volume, m_format,
+     QAudioHelperInternal::applyVolume(volume(), m_format,
 -                                      QSpan{ reinterpret_cast<const std::byte *>(data), len },
 -                                      QSpan{ reinterpret_cast<std::byte *>(dest), len });
 +                                      QSpan{ reinterpret_cast<const std::byte *>(data), static_cast<qsizetype>(len) },
diff --git a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h
index f968a8db5070..83f757e0b68d 100644
--- a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h
+++ b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h
@@ -1,7 +1,7 @@
---- src/plugins/multimedia/ffmpeg/qv4l2camera_p.h.orig	2024-03-19 05:09:26 UTC
+--- src/plugins/multimedia/ffmpeg/qv4l2camera_p.h.orig	2025-03-09 20:10:22 UTC
 +++ src/plugins/multimedia/ffmpeg/qv4l2camera_p.h
 @@ -18,6 +18,8 @@
- #include <private/qplatformcamera_p.h>
+ #include <QtMultimedia/private/qplatformcamera_p.h>
  #include <sys/time.h>
  
 +#include <sys/time.h> // timeval