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 2022-04-20 16:56:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-webengine (Old) and /work/SRC/openSUSE:Factory/.qt6-webengine.new.1941 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-webengine" Wed Apr 20 16:56:12 2022 rev:8 rq:970816 version:6.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-webengine/qt6-webengine.changes 2022-04-05 19:56:12.285730985 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-webengine.new.1941/qt6-webengine.changes 2022-04-20 16:56:34.450580686 +0200 @@ -1,0 +2,9 @@ +Fri Apr 8 11:57:03 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.3.0: + * https://www.qt.io/blog/qt-6.3-released +- Drop patches, now upstream: + * CVE-2022-0971-qtwebengine-5.15.patch + * CVE-2022-1096-qtwebengine-6.2.patch + +------------------------------------------------------------------- @@ -6,0 +16,14 @@ + +------------------------------------------------------------------- +Tue Mar 29 12:28:44 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.3.0-rc +- Drop patches, fixed upstream: + * Drop sandbox-statx-futex_time64.patch + * 0001-Fix-build-with-glibc-2.34.patch +- Add upstream changes: + * qtwebengine-icu70.patch + * 0001-Find-GIO-with-QtBase-6.2.patch +- Disable build on 32 bits archs (i586, armv7l) + Build fails (QTBUG-102143) and upstream doesn't support 32 bits + archs. Old: ---- 0001-Fix-build-with-glibc-2.34.patch CVE-2022-0971-qtwebengine-5.15.patch CVE-2022-1096-qtwebengine-6.2.patch qtwebengine-everywhere-src-6.2.4.tar.xz sandbox-statx-futex_time64.patch New: ---- 0001-Find-GIO-with-QtBase-6.2.patch qtwebengine-everywhere-src-6.3.0.tar.xz qtwebengine-icu70.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-webengine.spec ++++++ --- /var/tmp/diff_new_pack.K42LWu/_old 2022-04-20 16:56:41.786587539 +0200 +++ /var/tmp/diff_new_pack.K42LWu/_new 2022-04-20 16:56:41.790587543 +0200 @@ -16,8 +16,8 @@ # -%define real_version 6.2.4 -%define short_version 6.2 +%define real_version 6.3.0 +%define short_version 6.3 %define tar_name qtwebengine-everywhere-src %define tar_suffix %{nil} # @@ -42,7 +42,7 @@ %bcond_without system_minizip # Name: qt6-webengine%{?pkg_suffix} -Version: 6.2.4 +Version: 6.3.0 Release: 0 Summary: Web browser engine for Qt applications License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only @@ -50,21 +50,19 @@ Source: 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: CVE-2022-0971-qtwebengine-5.15.patch -Patch1: CVE-2022-1096-qtwebengine-6.2.patch +Patch0: qtwebengine-icu70.patch +Patch1: 0001-Find-GIO-with-QtBase-6.2.patch # Patches 100-200 are openSUSE and/or non-upstream(able) patches # Patch100: rtc-dont-use-h264.patch -Patch101: sandbox-statx-futex_time64.patch -# PATCH-FIX-UPSTREAM -Patch102: 0001-Fix-build-with-glibc-2.34.patch # PATCH-FIX-OPENSUSE -- disable-gpu-when-using-nouveau-boo-1005323.diff # PATCH-NEEDS-REBASE %if 0 -Patch103: disable-gpu-when-using-nouveau-boo-1005323.diff +Patch101: disable-gpu-when-using-nouveau-boo-1005323.diff %endif # -# Chromium/blink don't support all archs -ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{mips} %{riscv} +# 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 riscv64 BuildRequires: Mesa-KHR-devel BuildRequires: bison # Not pulled automatically on Leap @@ -75,17 +73,13 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel >= 1.6.0 BuildRequires: memory-constraints -# nodejs-default doesn't exist on Leap 15.2 -%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150200 -BuildRequires: nodejs-common -%else BuildRequires: nodejs-default -%endif BuildRequires: pipewire-devel BuildRequires: pkgconfig BuildRequires: python BuildRequires: python-devel BuildRequires: python-xml +BuildRequires: python3-html5lib BuildRequires: qt6-core-private-devel BuildRequires: qt6-gui-private-devel BuildRequires: qt6-qml-private-devel ++++++ 0001-Find-GIO-with-QtBase-6.2.patch ++++++ >From 7c112f5c613cfc8a93ca3d85ccdab7a38b82a3c3 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen <allan.jen...@qt.io> Date: Thu, 3 Feb 2022 15:03:22 +0100 Subject: [PATCH] Find GIO with QtBase 6.2 GLIB2 doesn't find GIO with Qt 6.2, so try adding a fallback. Pick-to: 6.3 Task-number: QTBUG-100435 Change-Id: Ic98a7aea07b726dc4f6e76a65669ca92b1916b5c Reviewed-by: Kirill Burtsev <kirill.burt...@qt.io> --- src/core/api/configure.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake index 231eaa8d2..a9dd9eb09 100644 --- a/src/core/api/configure.cmake +++ b/src/core/api/configure.cmake @@ -8,6 +8,9 @@ if(NOT QT_CONFIGURE_RUNNING) pkg_check_modules(ALSA alsa IMPORTED_TARGET) pkg_check_modules(PULSEAUDIO libpulse>=0.9.10 libpulse-mainloop-glib) pkg_check_modules(XDAMAGE xdamage) + if(NOT GIO_FOUND) + pkg_check_modules(GIO gio-2.0) + endif() endif() find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET @@ -111,7 +114,7 @@ qt_feature("webengine-webrtc-pipewire" PRIVATE LABEL "PipeWire over GIO" PURPOSE "Provides PipeWire support in WebRTC using GIO." AUTODETECT false - CONDITION QT_FEATURE_webengine_webrtc AND TARGET GLIB2::GIO + CONDITION QT_FEATURE_webengine_webrtc AND GIO_FOUND ) qt_feature("webengine-full-debug-info" PRIVATE SECTION "WebEngine" -- 2.35.1 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.K42LWu/_old 2022-04-20 16:56:41.834587584 +0200 +++ /var/tmp/diff_new_pack.K42LWu/_new 2022-04-20 16:56:41.838587588 +0200 @@ -28,22 +28,11 @@ </overwrite> <overwrite> <conditions> - <arch>armv6l</arch> - <arch>armv7l</arch> - </conditions> - <hardware> - <memory> - <size unit="G">10</size> - </memory> - </hardware> - </overwrite> - <overwrite> - <conditions> <package>qt6-webengine:docs</package> </conditions> <hardware> <disk> - <size unit="G">7</size> + <size unit="G">2</size> </disk> <memory> <size unit="G">2</size> @@ -51,5 +40,4 @@ </hardware> </overwrite> </constraints> -(No newline at EOF) ++++++ qtwebengine-everywhere-src-6.2.4.tar.xz -> qtwebengine-everywhere-src-6.3.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-webengine/qtwebengine-everywhere-src-6.2.4.tar.xz /work/SRC/openSUSE:Factory/.qt6-webengine.new.1941/qtwebengine-everywhere-src-6.3.0.tar.xz differ: char 25, line 1 ++++++ qtwebengine-icu70.patch ++++++ >From 75f0f4eb1e4f2823c39fe27137f78ac2c10bc293 Mon Sep 17 00:00:00 2001 From: Kirill Burtsev <kirill.burt...@qt.io> Date: Thu, 31 Mar 2022 19:45:39 +0200 Subject: [PATCH] [FIXUP] Fix compilation with system ICU As of chromium 92.0.4480.0 after a set of fixes ending with a https://chromium-review.googlesource.com/c/chromium/src/+/2830820 the need to override UCHAR_TYPE was dropped with the result that codebase is ready for default 'char16_t'. Override was already dropped for 98-based, which already builds fine for system ICU 70.1 Task-number: QTBUG-100495 Change-Id: I0e6d422f77b77015840647b52247f51736dd8a41 Reviewed-by: Allan Sandfeld Jensen <allan.jen...@qt.io> --- diff --git a/src/3rdparty/chromium/third_party/icu/BUILD.gn b/src/3rdparty/chromium/third_party/icu/BUILD.gn index d5b1361..269de02 100644 --- a/src/3rdparty/chromium/third_party/icu/BUILD.gn +++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn @@ -410,12 +410,6 @@ "USING_SYSTEM_ICU=1", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC", ] - - if (is_win) { - defines += [ "UCHAR_TYPE=wchar_t" ] - } else { - defines += [ "UCHAR_TYPE=uint16_t" ] - } } if (use_system_icu) {
