Sync from SUSE:SLFO:Main webkit2gtk3 revision 6c5b83877e3082ccab3aaa03ae27d542

63f7badbada070ebaadd318b2801818ecf7e7ea0.patch

@@ -1,31 +0,0 @@
-From 63f7badbada070ebaadd318b2801818ecf7e7ea0 Mon Sep 17 00:00:00 2001
-From: Don Olmstead <don.olmstead@sony.com>
-Date: Sat, 26 Oct 2024 08:27:01 -0700
-Subject: [PATCH] Support ICU 76.1 build
- https://bugs.webkit.org/show_bug.cgi?id=282120
-
-Reviewed by Yusuke Suzuki.
-
-In ICU 76.1 an additional macro `U_SHOW_CPLUSPLUS_HEADER_API` was added to
-control visibility of the C++ API within ICU. Set this value to `0` since WebKit
-wants to only use the C API.
-
-* Source/WTF/wtf/Platform.h:
-
-Canonical link: https://commits.webkit.org/285727@main
----
- Source/WTF/wtf/Platform.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index 23070df2937ba..51a8dce97755e 100644
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -115,6 +115,7 @@
- /* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
- #define U_HIDE_DEPRECATED_API 1
- #define U_SHOW_CPLUSPLUS_API 0
-+#define U_SHOW_CPLUSPLUS_HEADER_API 0
- #ifdef __cplusplus
- #define UCHAR_TYPE char16_t
- #endif

webkit2gtk3.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Feb  7 18:41:40 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 2.46.6 (boo#1236946):
+  + Fix a crash when enabling Skia CPU rendering.
+  + Fix several crashes and rendering issues.
+  + Security fixes: CVE-2025-24143, CVE-2025-24150, CVE-2025-24158,
+    CVE-2024-24162.
+- Drop 63f7badbada070ebaadd318b2801818ecf7e7ea0.patch: Fixed
+  upstream.
+
+-------------------------------------------------------------------
+Fri Dec 27 16:35:15 UTC 2024 - Michael Gorse <mgorse@suse.com>
+
+- Update to version 2.46.5 (boo#1234851):
+  + Fix the build with GBM and release logs disabled.
+  + Fix several crashes and rendering issues.
+  + Security fixes: CVE-2024-54479, CVE-2024-54502, CVE-2024-54505,
+    CVE-2024-54508, CVE-2024-54543.
+
 -------------------------------------------------------------------
 Wed Nov 27 21:34:14 UTC 2024 - Michael Gorse <mgorse@suse.com>
 
@@ -98,7 +118,8 @@ Tue Sep 17 19:04:26 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
     acceleration (enabled by default).
   + Undeprecate console messages API and make it available in 6.0
     API.
-  + Security fixes: CVE-2024-40866, CVE-2024-44187, CVE-2044-44185.
+  + Security fixes: CVE-2024-40866, CVE-2024-44187, CVE-2024-44185,
+    CVE-2024-54534, CVE-2024-27856.
 
 -------------------------------------------------------------------
 Wed Sep 11 16:53:03 UTC 2024 - Michael Gorse <mgorse@suse.com>
@@ -264,7 +285,7 @@ Sat Mar 16 09:36:58 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
     GTK4.
 + Security fixes: CVE-2024-23252, CVE-2024-23254, CVE-2024-23263,
   CVE-2024-23280, CVE-2024-23284, CVE-2023-42950, CVE-2023-42956,
-  CVE-2023-42843.
+  CVE-2023-42843, CVE-2024-54658.
 - Rebase webkit2gtk3-disable-dmabuf-nvidia.patch.
 
 -------------------------------------------------------------------

webkit2gtk3.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package webkit2gtk3
 #
-# 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
@@ -79,7 +79,7 @@ ExclusiveArch:  do-not-build
 %endif
 
 Name:           webkit2%{_gtknamesuffix}
-Version:        2.46.4
+Version:        2.46.6
 Release:        0
 Summary:        Library for rendering web content, GTK+ Port
 License:        BSD-3-Clause AND LGPL-2.0-or-later
@@ -92,8 +92,6 @@ Source99:       webkit2gtk3.keyring
 
 # PATCH-FEATURE-OPENSUSE reproducibility.patch -- Make build reproducible
 Patch0:         reproducibility.patch
-# PATCH-FIX-UPSTREAM 63f7badbada070ebaadd318b2801818ecf7e7ea0.patch -- Support ICU 76.1 build
-Patch1:         https://github.com/WebKit/WebKit/commit/63f7badbada070ebaadd318b2801818ecf7e7ea0.patch
 
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGL-devel

webkitgtk-2.46.4.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmdG7mAACgkQbBAJtpOX
-U5P4/BAAi8+ZqJCyHgj/hPnhCPFxAN8fn0nv3g7Af5SHF9wOd7gWPlcTo126EIYg
-rDqVF/xTGLntJvyOcQFqAjxzJ/KTHopDs7O5qPzokB7w5eyAL4z6KLCEjsYXwGat
-Y/n80Ns4ZRVukhE429dhBONyKyQ3IAP4tq6R3Q2lG4EzRdIPXSffY6VzYsRfTf0Z
-HQ8ml5hmLADILIkFv2tiY5WNht7NommOzabGOnt6cuOY7qz7ZEFm/IJ6RRzKtqft
-NbvLj5AscwGWQh3f2zJre5YCOxn/5goLf/b+EjwiOlG1ytqTfTV+elqd8P5dXNMb
-5cojVPkyjRWf9MkQO5T1Nfof2S524m7JAemffxXAtXBhIEgu10XAJsxjPXse1vtV
-mdNgpgebbfjIc8j65DJEA0e5npAalZO0YO6YKbyf6IN149iH4p3d2MJmPDInctu/
-YDqJYbn6dtbC1xPKbE3MYXW3rlU1YWZXslxcp/OLMg2qJ+wCdDU2MK7FNzvOj8FK
-5YZrsoZYsP/N8RjGWgY+H22IhIiT7cigcUsnjWP9VHWQmr6WGVmOLyCcJgDO3VFV
-9cNLB0acuesksT4wyECGg5lsgqWPp//5PNOqtMMQO97MIYUt7/oR+A1vxx3AZHGr
-1XNeHleX0o5DxWhHk9s/DHWF/v1RKJVITaO+v70zUyKMz+hORmQ=
-=WURb
------END PGP SIGNATURE-----

webkitgtk-2.46.6.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmelwBMACgkQbBAJtpOX
+U5PpzA/9FwabX++Me+Mdte47n1ouJGaSVR5xtjLe3jee/0Q/XwEZfMvWsTxzHCf6
+F9Es+cJUWP0bOj3idWLBvRCXHbn2fo8n/jEQbijlKy14jWG9vGA6VX+tAsfp9AXR
+x+jpnHoBzTmaIJUI/DL72oXd2dyzSjDueW54KjvOGEn/9N26NiN0G7ou0Y6Q4O+z
+gutUdDC5EOOPvtPkDv4Gr/7ldcsRHM5GTTlcGeC9gBfakuLAgoVjxVgX+/tp9aYZ
+E7V7hjVmx2dqkYncZD/ICV09BbKH+rU468Z8ZWJgvlaIwlLjZYNT6whnXwq+YbqD
+9KpQ1g19/4KXniMv8Zdsb2gXQ57KjKXC7t6EwdCu24VH5QXFCMOQfH0inpz5FqzB
+Kj2lrQ03K2dpUnFTuooTeDo6jh6F4R+8EyJSAbkl6C2wbaveUWq8de9yRHJ2Sdy3
+Y4s05WT0FYFYK7INv/PLCPRFfNLTKbY8KQXgjlCQ7ZziQCVmZq+pxAnE2kDdOf6K
+nNk7fzx1zDNMSmJiqABnxOcUoZxnhGoAYjzJYWhs6d3vpBooGGBHJvxRp9LWmuqF
+Zc6GcxhHrO8N1A9vgXeZADHJQ0/VVQqUW5BT42YOWfbIzA3tCDXSLTqyQgj4mKwa
+WVOfrunlBvRywECm+8MymOB6Wr/P0emskaur2+UGQJ6PNxfn/3U=
+=nxC+
+-----END PGP SIGNATURE-----