Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-webengine for openSUSE:Factory checked in at 2025-04-07 17:35:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-webengine (Old) and /work/SRC/openSUSE:Factory/.qt6-webengine.new.1907 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-webengine" Mon Apr 7 17:35:30 2025 rev:42 rq:1266670 version:6.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-webengine/qt6-webengine.changes 2025-03-17 22:15:03.668132782 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-webengine.new.1907/qt6-webengine.changes 2025-04-07 17:35:53.186989786 +0200 @@ -1,0 +2,11 @@ +Wed Apr 2 11:03:45 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 6.9.0: + * https://www.qt.io/blog/qt-6.9-released +- Drop patches, merged upstream: + * 0001-Build-system-remove-libxml2-compilation-test.patch + * qtwebengine-ffmpeg-playback-fix.patch +- Add patch: + * qtwebengine-pipewire-1.4.patch + +------------------------------------------------------------------- Old: ---- 0001-Build-system-remove-libxml2-compilation-test.patch qtwebengine-everywhere-src-6.8.2.tar.xz qtwebengine-ffmpeg-playback-fix.patch New: ---- qtwebengine-everywhere-src-6.9.0.tar.xz qtwebengine-pipewire-1.4.patch BETA DEBUG BEGIN: Old:- Drop patches, merged upstream: * 0001-Build-system-remove-libxml2-compilation-test.patch * qtwebengine-ffmpeg-playback-fix.patch Old: * 0001-Build-system-remove-libxml2-compilation-test.patch * qtwebengine-ffmpeg-playback-fix.patch - Add patch: BETA DEBUG END: BETA DEBUG BEGIN: New:- Add patch: * qtwebengine-pipewire-1.4.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-webengine.spec ++++++ --- /var/tmp/diff_new_pack.ytjA28/_old 2025-04-07 17:36:00.083278233 +0200 +++ /var/tmp/diff_new_pack.ytjA28/_new 2025-04-07 17:36:00.087278401 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt6-webengine # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,8 @@ # -%define real_version 6.8.2 -%define short_version 6.8 +%define real_version 6.9.0 +%define short_version 6.9 %define tar_name qtwebengine-everywhere-src %define tar_suffix %{nil} # @@ -46,8 +46,14 @@ %{?sle15_python_module_pythons} %define pyver python311 %endif +# +# Note about required versions: +# qtwebengine supports building against the latest LTS release. This (potentially) allows submitting +# updates to Leap +%global lts_version 6.8.0 +# Name: qt6-webengine%{?pkg_suffix} -Version: 6.8.2 +Version: 6.9.0 Release: 0 Summary: Web browser engine for Qt applications License: GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-only @@ -55,16 +61,15 @@ Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-webengine-rpmlintrc # Patches 0-100 are upstream patches # -Patch0: 0001-Build-system-remove-libxml2-compilation-test.patch -Patch1: qtwebengine-glibc_2.41.patch -Patch2: qtwebengine-ffmpeg-playback-fix.patch +Patch0: qtwebengine-glibc_2.41.patch # Patches 100-200 are openSUSE and/or non-upstream(able) patches # Patch100: rtc-dont-use-h264.patch Patch101: QtWebEngine_6.8_skip_xnnpack.patch -# -# Chromium/blink don't support PowerPC and zSystems and build fails on -# 32 bits archs (https://bugreports.qt.io/browse/QTBUG-102143) -ExclusiveArch: aarch64 x86_64 %x86_64 riscv64 +Patch102: qtwebengine-pipewire-1.4.patch +BuildRequires: %{pyver} +BuildRequires: %{pyver}-devel +BuildRequires: %{pyver}-html5lib +BuildRequires: %{pyver}-importlib-metadata BuildRequires: Mesa-KHR-devel BuildRequires: bison # Not pulled automatically on Leap @@ -80,21 +85,13 @@ BuildRequires: nodejs-default BuildRequires: pipewire-devel BuildRequires: pkgconfig -BuildRequires: %{pyver} -BuildRequires: %{pyver}-devel -BuildRequires: %{pyver}-html5lib -BuildRequires: %{pyver}-importlib-metadata -BuildRequires: qt6-core-private-devel -BuildRequires: qt6-gui-private-devel -BuildRequires: qt6-qml-private-devel -BuildRequires: qt6-quick-private-devel -BuildRequires: qt6-quickwidgets-private-devel -BuildRequires: qt6-widgets-private-devel +BuildRequires: qt6-core-private-devel >= %{lts_version} +BuildRequires: qt6-gui-private-devel >= %{lts_version} +BuildRequires: qt6-qml-private-devel >= %{lts_version} +BuildRequires: qt6-quick-private-devel >= %{lts_version} +BuildRequires: qt6-quickwidgets-private-devel >= %{lts_version} +BuildRequires: qt6-widgets-private-devel >= %{lts_version} BuildRequires: snappy-devel -# Note about required versions: -# qtwebengine supports building against the latest LTS release. This allows submitting -# updates to Leap -%global lts_version 6.5.0 BuildRequires: cmake(Qt6Core) >= %{lts_version} BuildRequires: cmake(Qt6Designer) >= %{lts_version} BuildRequires: cmake(Qt6Gui) >= %{lts_version} @@ -128,7 +125,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(glproto) %if %{with system_harfbuzz} -BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(harfbuzz) >= 4.3.0 %endif %if %{with system_icu} BuildRequires: pkgconfig(icu-i18n) >= 71 @@ -178,6 +175,10 @@ BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) +# Chromium/blink don't support PowerPC and zSystems and build fails on +# 32 bits archs (https://bugreports.qt.io/browse/QTBUG-102143) +ExclusiveArch: aarch64 x86_64 %{x86_64} riscv64 + %if "%{qt6_flavor}" == "docs" BuildRequires: qt6-tools %{qt6_doc_packages} @@ -238,11 +239,11 @@ %package -n qt6-pdfquick-devel Summary: Development files for the Qt 6 PdfQuick library Requires: libQt6PdfQuick6 = %{version} -Requires: qt6-pdf-private-devel = %{version} +Requires: qt6-quick-private-devel >= %{lts_version} Requires: cmake(Qt6Gui) >= %{lts_version} +Requires: cmake(Qt6PdfPrivate) = %{real_version} Requires: cmake(Qt6Qml) >= %{lts_version} Requires: cmake(Qt6Quick) >= %{lts_version} -%requires_eq qt6-quick-private-devel %description -n qt6-pdfquick-devel Development files for the Qt 6 PdfQuick library. @@ -397,7 +398,7 @@ -DFEATURE_webengine_system_ffmpeg:BOOL=FALSE \ %endif %if %{without system_harfbuzz} - -DFEATURE_webengine-system-harfbuzz:BOOL=FALSE \ + -DFEATURE_webengine_system_harfbuzz:BOOL=FALSE \ %endif %if %{with system_icu} -DFEATURE_webengine_system_icu:BOOL=TRUE \ @@ -428,6 +429,9 @@ # E: files-duplicated-waste %fdupes %{buildroot}%{_qt6_examplesdir} +# Hunspell dictionaries will be converted and added there when installing the package +mkdir -p %{buildroot}%{_qt6_datadir}/qtwebengine_dictionaries + %ldconfig_scriptlets -n libQt6Pdf6 %ldconfig_scriptlets -n libQt6PdfQuick6 %ldconfig_scriptlets -n libQt6PdfWidgets6 @@ -435,13 +439,26 @@ %ldconfig_scriptlets -n libQt6WebEngineQuick6 %ldconfig_scriptlets -n libQt6WebEngineWidgets6 +%filetriggerin -- %{_datadir}/hunspell +# Convert Hunspell dictionaries on package installation +while read filename ; do + case "$filename" in + *.dic) + bdicname=%{_qt6_datadir}/qtwebengine_dictionaries/`basename -s .dic "$filename"`.bdic + %{_qt6_libexecdir}/qwebengine_convert_dict "$filename" "$bdicname" &> /dev/null || : + ;; + esac +done + %files +%dir %{_qt6_datadir}/qtwebengine_dictionaries %dir %{_qt6_pluginsdir}/designer %{_qt6_datadir}/resources/ -%{_qt6_translationsdir}/qtwebengine_locales/ %{_qt6_libexecdir}/QtWebEngineProcess +%{_qt6_libexecdir}/qwebengine_convert_dict %{_qt6_libexecdir}/webenginedriver %{_qt6_pluginsdir}/designer/libqwebengineview.so +%{_qt6_translationsdir}/qtwebengine_locales/ %files imports %{_qt6_qmldir}/QtWebEngine/ @@ -467,6 +484,7 @@ %exclude %{_qt6_includedir}/QtPdf/%{real_version} %files -n qt6-pdf-private-devel +%{_qt6_cmakedir}/Qt6PdfPrivate/ %{_qt6_includedir}/QtPdf/%{real_version}/ %{_qt6_mkspecsdir}/modules/qt_lib_pdf_private.pri @@ -485,6 +503,7 @@ %exclude %{_qt6_includedir}/QtPdfQuick/%{real_version} %files -n qt6-pdfquick-private-devel +%{_qt6_cmakedir}/Qt6PdfQuickPrivate/ %{_qt6_includedir}/QtPdfQuick/%{real_version}/ %{_qt6_mkspecsdir}/modules/qt_lib_pdfquick_private.pri @@ -503,6 +522,7 @@ %exclude %{_qt6_includedir}/QtPdfWidgets/%{real_version} %files -n qt6-pdfwidgets-private-devel +%{_qt6_cmakedir}/Qt6PdfWidgetsPrivate/ %{_qt6_includedir}/QtPdfWidgets/%{real_version}/ %{_qt6_mkspecsdir}/modules/qt_lib_pdfwidgets_private.pri @@ -524,13 +544,13 @@ %{_qt6_libdir}/libQt6WebEngineCore.prl %{_qt6_libdir}/libQt6WebEngineCore.so %{_qt6_libexecdir}/gn -%{_qt6_libexecdir}/qwebengine_convert_dict %{_qt6_metatypesdir}/qt6webenginecore_*_metatypes.json %{_qt6_mkspecsdir}/modules/qt_lib_webenginecore.pri %{_qt6_pkgconfigdir}/Qt6WebEngineCore.pc %exclude %{_qt6_includedir}/QtWebEngineCore/%{real_version} %files -n qt6-webenginecore-private-devel +%{_qt6_cmakedir}/Qt6WebEngineCore*Private/ %{_qt6_includedir}/QtWebEngineCore/%{real_version}/ %{_qt6_mkspecsdir}/modules/qt_lib_webenginecore_private.pri @@ -557,6 +577,7 @@ %exclude %{_qt6_includedir}/QtWebEngineQuick/%{real_version} %files -n qt6-webenginequick-private-devel +%{_qt6_cmakedir}/Qt6WebEngineQuick*Private/ %{_qt6_includedir}/QtWebEngineQuick/%{real_version}/ %{_qt6_mkspecsdir}/modules/qt_lib_webenginequick_private.pri %{_qt6_mkspecsdir}/modules/qt_lib_webenginequickdelegatesqml_private.pri @@ -576,6 +597,7 @@ %exclude %{_qt6_includedir}/QtWebEngineWidgets/%{real_version} %files -n qt6-webenginewidgets-private-devel +%{_qt6_cmakedir}/Qt6WebEngineWidgetsPrivate/ %{_qt6_includedir}/QtWebEngineWidgets/%{real_version}/ %{_qt6_mkspecsdir}/modules/qt_lib_webenginewidgets_private.pri ++++++ QtWebEngine_6.8_skip_xnnpack.patch ++++++ --- /var/tmp/diff_new_pack.ytjA28/_old 2025-04-07 17:36:00.115279572 +0200 +++ /var/tmp/diff_new_pack.ytjA28/_new 2025-04-07 17:36:00.115279572 +0200 @@ -3,11 +3,11 @@ Bug ref: https://bugreports.qt.io/browse/QTBUG-129985 diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index fe4f2c3f1..729d4d3e9 100644 +index 9b9be814d..7f76ec696 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt -@@ -544,6 +544,10 @@ foreach(arch ${archs}) - ) +@@ -566,6 +566,10 @@ foreach(arch ${archs}) + list(APPEND gnArgArg libyuv_use_sve=false) endif() endif() + if(cpu MATCHES "arm.*") ++++++ qtwebengine-everywhere-src-6.8.2.tar.xz -> qtwebengine-everywhere-src-6.9.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-webengine/qtwebengine-everywhere-src-6.8.2.tar.xz /work/SRC/openSUSE:Factory/.qt6-webengine.new.1907/qtwebengine-everywhere-src-6.9.0.tar.xz differ: char 25, line 1 ++++++ qtwebengine-pipewire-1.4.patch ++++++ Fix build with pipewire 1.4 Imported from our chromium package: https://build.opensuse.org/projects/network:chromium/packages/chromium/files/fix-build-with-pipewire-1.3.82.patch?expand=1 diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc b/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc index e9f7f765a5b..9e0167de7bf 100644 --- a/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc +++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc @@ -85,7 +85,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, .param = OnNodeParam, }; - pw_node_add_listener(proxy_, &node_listener_, &node_events, this); + pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this); } // static @@ -117,7 +117,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) { uint32_t id = info->params[i].id; if (id == SPA_PARAM_EnumFormat && info->params[i].flags & SPA_PARAM_INFO_READ) { - pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); + pw_node_enum_params(reinterpret_cast<pw_node *>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); break; } } ++++++ rtc-dont-use-h264.patch ++++++ --- /var/tmp/diff_new_pack.ytjA28/_old 2025-04-07 17:36:00.195282918 +0200 +++ /var/tmp/diff_new_pack.ytjA28/_new 2025-04-07 17:36:00.199283085 +0200 @@ -4,21 +4,25 @@ Amended on 2024-01-30: also disable h265 diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni -index 5a1c43c8888..d867f7e5330 100644 +index 66ed8434ff0..cbd78d582e6 100644 --- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni +++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni -@@ -186,11 +186,10 @@ declare_args() { - # +@@ -184,7 +184,7 @@ declare_args() { # Enabling H264 when building with MSVC is currently not supported, see # bugs.webrtc.org/9213#c13 for more info. -- rtc_use_h264 = + rtc_use_h264 = - proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang) -+ rtc_use_h264 = false - - # Enable to use H265 -- rtc_use_h265 = proprietary_codecs -+ rtc_use_h265 = false - ++ false + + # Use system OpenH264 + rtc_system_openh264 = false +@@ -193,7 +193,7 @@ declare_args() { + if (build_with_chromium) { + rtc_use_h265 = enable_hevc_parser_and_hw_decoder + } else { +- rtc_use_h265 = proprietary_codecs ++ rtc_use_h265 = false + } + # Enable this flag to make webrtc::Mutex be implemented by absl::Mutex. - rtc_use_absl_mutex = false
