From af7d090c4244f7fdb4d1cb4ba7bf11c7db817f578d88be50a824b82b5a004317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 21 Apr 2023 07:15:08 +0000 Subject: [PATCH 1/2] Accepting request 1080941 from GNOME:Next - Update to version 2.40.1 (boo#1210295): + The Bubblewrap sandbox no longer requires setting an application identifier via GApplication to operate correctly. Using GApplication is still recommended, but optional. + Adjust the scrolling speed for mouse wheels to make it feel more natural. + Allow pasting content using the Asynchronous Clipboard API when the origin is the same as the clipboard contents. + Improvements to the GStreamer multimedia playback, in particular around MSE, WebRTC, and seeking. + Make all supported image types appear in the Accept HTTP header. + Fix text caret blinking when blinking is disabled in the GTK settings. + Fix default database quota size definition. + Fix application of all caps tags listed in the font-feature-settings CSS property. + Fix the build with journald support enabled when using elogind instead of the systemd libraries. + Fix the build when libgcrypt provides a libgcrypt-config script instead of a pkg-config module file. + Fix font height calculations for the font-size-adjust CSS property. + Fix the build when ccache is used in certain setups. + Fix the build for RISC-V 64-bit targets. + Fix the build with GCC 13. + Fix several crashes and rendering issues. + Security fixes: CVE-2023-28205. - Drop regression-fix.patch and fix-gst-crash.patch: fixed upstream. - Rebase gcc13-fix.patch. OBS-URL: https://build.opensuse.org/request/show/1080941 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=398 --- fix-gst-crash.patch | 66 ------------------------------------- gcc13-fix.patch | 13 ++++---- regression-fix.patch | 35 -------------------- webkit2gtk3.changes | 35 ++++++++++++++++++++ webkit2gtk3.spec | 10 ++---- webkitgtk-2.40.0.tar.xz | 3 -- webkitgtk-2.40.0.tar.xz.asc | 6 ---- webkitgtk-2.40.1.tar.xz | 3 ++ webkitgtk-2.40.1.tar.xz.asc | 6 ++++ 9 files changed, 53 insertions(+), 124 deletions(-) delete mode 100644 fix-gst-crash.patch delete mode 100644 regression-fix.patch delete mode 100644 webkitgtk-2.40.0.tar.xz delete mode 100644 webkitgtk-2.40.0.tar.xz.asc create mode 100644 webkitgtk-2.40.1.tar.xz create mode 100644 webkitgtk-2.40.1.tar.xz.asc diff --git a/fix-gst-crash.patch b/fix-gst-crash.patch deleted file mode 100644 index 659bb32..0000000 --- a/fix-gst-crash.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Philippe Normand -Subject: Fix crash in webkit_media_stream_src_class_init() -Bug: https://bugs.webkit.org/show_bug.cgi?id=254025 -Origin: https://github.com/WebKit/WebKit/commit/358ce3a4bd7353c8edaa5720c949301f31c9a5e9 -Index: webkitgtk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -=================================================================== ---- webkitgtk.orig/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -+++ webkitgtk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -@@ -2647,6 +2647,9 @@ MediaPlayer::SupportsType MediaPlayerPri - #endif - } - -+ if (!ensureGStreamerInitialized()) -+ return result; -+ - GST_DEBUG("Checking mime-type \"%s\"", parameters.type.raw().utf8().data()); - if (parameters.type.isEmpty()) - return result; -Index: webkitgtk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp -=================================================================== ---- webkitgtk.orig/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp -+++ webkitgtk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp -@@ -439,22 +439,13 @@ void MediaPlayerPrivateGStreamerMSE::get - - MediaPlayer::SupportsType MediaPlayerPrivateGStreamerMSE::supportsType(const MediaEngineSupportParameters& parameters) - { -- static std::optional videoDecodingLimits; --#ifdef VIDEO_DECODING_LIMIT -- static std::once_flag onceFlag; -- std::call_once(onceFlag, [] { -- videoDecodingLimits = videoDecoderLimitsDefaults(); -- if (!videoDecodingLimits) { -- GST_WARNING("Parsing VIDEO_DECODING_LIMIT failed"); -- ASSERT_NOT_REACHED(); -- } -- }); --#endif -- - MediaPlayer::SupportsType result = MediaPlayer::SupportsType::IsNotSupported; - if (!parameters.isMediaSource) - return result; - -+ if (!ensureGStreamerInitialized()) -+ return result; -+ - auto containerType = parameters.type.containerType(); - - // YouTube TV provides empty types for some videos and we want to be selected as best media engine for them. -@@ -476,6 +467,16 @@ MediaPlayer::SupportsType MediaPlayerPri - if (!ok) - height = 0; - -+ static std::optional videoDecodingLimits; -+#ifdef VIDEO_DECODING_LIMIT -+ static std::once_flag onceFlag; -+ std::call_once(onceFlag, [] { -+ videoDecodingLimits = videoDecoderLimitsDefaults(); -+ if (!videoDecodingLimits) -+ GST_WARNING("Parsing VIDEO_DECODING_LIMIT failed"); -+ }); -+#endif -+ - if (videoDecodingLimits && (width > videoDecodingLimits->mediaMaxWidth || height > videoDecodingLimits->mediaMaxHeight)) - return result; - - diff --git a/gcc13-fix.patch b/gcc13-fix.patch index 098ef13..63476e1 100644 --- a/gcc13-fix.patch +++ b/gcc13-fix.patch @@ -1,19 +1,18 @@ -diff --git a/Source/WebCore/platform/graphics/SourceBrush.cpp b/Source/WebCore/platform/graphics/SourceBrush.cpp -index d7ff7292..48ae0e61 100644 ---- a/Source/WebCore/platform/graphics/SourceBrush.cpp -+++ b/Source/WebCore/platform/graphics/SourceBrush.cpp +diff -urp webkitgtk-2.40.1.orig/Source/WebCore/platform/graphics/SourceBrush.cpp webkitgtk-2.40.1/Source/WebCore/platform/graphics/SourceBrush.cpp +--- webkitgtk-2.40.1.orig/Source/WebCore/platform/graphics/SourceBrush.cpp 2023-04-12 08:07:29.748326800 -0500 ++++ webkitgtk-2.40.1/Source/WebCore/platform/graphics/SourceBrush.cpp 2023-04-20 11:31:00.456319923 -0500 @@ -65,12 +65,12 @@ Pattern* SourceBrush::pattern() const void SourceBrush::setGradient(Ref&& gradient, const AffineTransform& spaceTransform) { - m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } }; -+ m_brush = Brush { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } }; ++ m_brush = Brush { Brush::LogicalGradient { { WTFMove(gradient) }, spaceTransform } }; } void SourceBrush::setPattern(Ref&& pattern) { -- m_brush = { WTFMove(pattern) }; -+ m_brush = Brush { WTFMove(pattern) }; +- m_brush = { Brush::Variant { std::in_place_type>, WTFMove(pattern) } }; ++ m_brush = Brush { Brush::Variant { std::in_place_type>, WTFMove(pattern) } }; } WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush) diff --git a/regression-fix.patch b/regression-fix.patch deleted file mode 100644 index 7eb4b4e..0000000 --- a/regression-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7bcb97382f2f347dc348c3c31416ae7fd760ce6b Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 17 Mar 2023 15:39:52 -0500 -Subject: [PATCH] REGRESSION(261320@main): [GLib] Broke - WebKitUserContentManager::script-message-received - https://bugs.webkit.org/show_bug.cgi?id=254089 - -Reviewed by NOBODY (OOPS!). - -I forgot to update the marshaller used by -WebKitUserContentManager::script-message-received. It worked perfectly -fine in my development environment for whatever reason, but was broken -in at least Ephy Tech Preview. - -* Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp: ---- - Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp -index af2d963bb3b3..f778b19bc816 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp -+++ b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp -@@ -106,7 +106,11 @@ static void webkit_user_content_manager_class_init(WebKitUserContentManagerClass - G_TYPE_FROM_CLASS(gObjectClass), - static_cast(G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED), - 0, nullptr, nullptr, -+#if ENABLE(2022_GLIB_API) -+ g_cclosure_marshal_VOID__OBJECT, -+#else - g_cclosure_marshal_VOID__BOXED, -+#endif - G_TYPE_NONE, 1, - #if ENABLE(2022_GLIB_API) - JSC_TYPE_VALUE); diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index fe87630..59b1dbf 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Thu Apr 20 14:21:35 UTC 2023 - Michael Gorse + +- Update to version 2.40.1 (boo#1210295): + + The Bubblewrap sandbox no longer requires setting an + application identifier via GApplication to operate correctly. + Using GApplication is still recommended, but optional. + + Adjust the scrolling speed for mouse wheels to make it feel + more natural. + + Allow pasting content using the Asynchronous Clipboard API when + the origin is the same as the clipboard contents. + + Improvements to the GStreamer multimedia playback, in + particular around MSE, WebRTC, and seeking. + + Make all supported image types appear in the Accept HTTP + header. + + Fix text caret blinking when blinking is disabled in the GTK + settings. + + Fix default database quota size definition. + + Fix application of all caps tags listed in the + font-feature-settings CSS property. + + Fix the build with journald support enabled when using elogind + instead of the systemd libraries. + + Fix the build when libgcrypt provides a libgcrypt-config script + instead of a pkg-config module file. + + Fix font height calculations for the font-size-adjust CSS + property. + + Fix the build when ccache is used in certain setups. + + Fix the build for RISC-V 64-bit targets. + + Fix the build with GCC 13. + + Fix several crashes and rendering issues. + + Security fixes: CVE-2023-28205. +- Drop regression-fix.patch and fix-gst-crash.patch: fixed + upstream. +- Rebase gcc13-fix.patch. + ------------------------------------------------------------------- Tue Mar 28 08:22:05 UTC 2023 - Bjørn Lie diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 3c6268b..56483bf 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -72,7 +72,7 @@ ExclusiveArch: do-not-build %endif Name: webkit2%{_gtknamesuffix} -Version: 2.40.0 +Version: 2.40.1 Release: 0 Summary: Library for rendering web content, GTK+ Port License: BSD-3-Clause AND LGPL-2.0-or-later @@ -83,14 +83,10 @@ Source1: %{url}/releases/%{_name}-%{version}.tar.xz.asc Source98: baselibs.conf Source99: webkit2gtk3.keyring -# PATCH-FIX-UPSTREAM regression-fix.patch -- [GLib] Broke WebKitUserContentManager::script-message-received -Patch0: regression-fix.patch +# PATCH-FEATURE-OPENSUSE reproducibility.patch -- Make build reproducible +Patch0: reproducibility.patch # PATCH-FIX-UPSTREAM Fix rejected code by GCC 13: https://github.com/WebKit/WebKit/pull/11910 Patch1: gcc13-fix.patch -# PATCH-FIX-UPSTREAM fix-gst-crash.patch -- Fix crash in webkit_media_stream_src_class_init() -Patch2: fix-gst-crash.patch -# PATCH-FEATURE-OPENSUSE reproducibility.patch -- Make build reproducible -Patch3: reproducibility.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel diff --git a/webkitgtk-2.40.0.tar.xz b/webkitgtk-2.40.0.tar.xz deleted file mode 100644 index 2df02a4..0000000 --- a/webkitgtk-2.40.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393 -size 40042140 diff --git a/webkitgtk-2.40.0.tar.xz.asc b/webkitgtk-2.40.0.tar.xz.asc deleted file mode 100644 index 0a9829f..0000000 --- a/webkitgtk-2.40.0.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCZBRcPwAKCRDz0yLQ7EWC -w9N0AJkBppB/tddEYzLkxOWIOqCTv4OUaQCgjauy+5yDquyWFZbHaxU7Eh/ofLg= -=XWt1 ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.40.1.tar.xz b/webkitgtk-2.40.1.tar.xz new file mode 100644 index 0000000..ae1ca76 --- /dev/null +++ b/webkitgtk-2.40.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64e526984f8cd2161ef03ae949af99c002ff333d615e6386b460164a3c1b7ef6 +size 39599544 diff --git a/webkitgtk-2.40.1.tar.xz.asc b/webkitgtk-2.40.1.tar.xz.asc new file mode 100644 index 0000000..7285970 --- /dev/null +++ b/webkitgtk-2.40.1.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCZEBCkQAKCRCRxVnb5MkS +O8umAJ4lwUaJE5wc06yCJ6KxQV3D040EkQCffYgpjfNmTer2Niy9lhrfMmAK+Gk= +=81MT +-----END PGP SIGNATURE----- From 3d4d3aa08d3bfb7e30dda1656a660010d83b8de1e632d4a9632c9c26c7176b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 21 Apr 2023 17:14:39 +0000 Subject: [PATCH 2/2] Accepting request 1082104 from GNOME:Next Add fixed CVES to changes OBS-URL: https://build.opensuse.org/request/show/1082104 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=399 --- webkit2gtk3.changes | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 59b1dbf..008ca44 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Apr 20 14:21:35 UTC 2023 - Michael Gorse -- Update to version 2.40.1 (boo#1210295): +- Update to version 2.40.1 (boo#1210295 boo#1210731): + The Bubblewrap sandbox no longer requires setting an application identifier via GApplication to operate correctly. Using GApplication is still recommended, but optional. @@ -28,7 +28,8 @@ Thu Apr 20 14:21:35 UTC 2023 - Michael Gorse + Fix the build for RISC-V 64-bit targets. + Fix the build with GCC 13. + Fix several crashes and rendering issues. - + Security fixes: CVE-2023-28205. + + Security fixes: CVE-2022-0108, CVE-2023-28205, CVE-2022-32885, + CVE-2023-27932, CVE-2023-27954. - Drop regression-fix.patch and fix-gst-crash.patch: fixed upstream. - Rebase gcc13-fix.patch. @@ -324,8 +325,9 @@ Fri Sep 16 22:44:55 UTC 2022 - Bjørn Lie + MediaSession is enabled by default, allowing remote media control using MPRIS. + Add support for PDF documents using PDF.js. -+ Security fixes: CVE-2022-32886, CVE-2022-32888, CVE-2022-32912, - CVE-2022-32923, CVE-2022-42863. + + Security fixes: CVE-2022-32886, CVE-2022-32888, CVE-2022-32912, + CVE-2022-32923, CVE-2022-42863, CVE-2023-25358, CVE-2023-25360, + CVE-2023-25361, CVE-2023-25362, CVE-2023-25363. ------------------------------------------------------------------- Mon Sep 5 06:25:57 UTC 2022 - Bjørn Lie