Update to 2.46.1

Resolves: RHEL-59181

.gitignore

@@ -145,3 +145,5 @@
 /webkitgtk-2.44.3.tar.xz.asc
 /webkitgtk-2.46.0.tar.xz
 /webkitgtk-2.46.0.tar.xz.asc
+/webkitgtk-2.46.1.tar.xz
+/webkitgtk-2.46.1.tar.xz.asc

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.46.0.tar.xz) = bdb6b9acd418d1eb45a7b7d2618bd6562798cce9147d3ae794d9f868956a2dddace5676592ababaa7da5bd38b29dbdeff1a8e092c4611cfb123a62e83c2cf9ae
-SHA512 (webkitgtk-2.46.0.tar.xz.asc) = ad87727cae042cf8f5a41d92ae2fad38207417db8cdbfccc73ab4176be68480813bd54a0aacd2bc9309e9eeff4f1e413c217c5f5e08cf9363e763a4e94ab6c40
+SHA512 (webkitgtk-2.46.1.tar.xz) = e1ac92305b1d1b034eea9be6aa22cfa260249562fa0af41f0ed5c76a36916bba432073e033f228978d84d0377f245642ff31cdec324565e83aa8c82d8ea0c1f5
+SHA512 (webkitgtk-2.46.1.tar.xz.asc) = a86b2f0d8dce366edeb15f64fd758a383e083224ecd98e3cc9635b590087444929f242ce83471611cb0cbda3227659758121aea46db34a8a3173f0c2f34243c9

sysprof-capture-version.patch

@@ -1,14 +0,0 @@
-diff --git a/Source/cmake/FindSysProfCapture.cmake b/Source/cmake/FindSysProfCapture.cmake
-index 455bf032ed0f..b0345eb3c198 100644
---- a/Source/cmake/FindSysProfCapture.cmake
-+++ b/Source/cmake/FindSysProfCapture.cmake
-@@ -61,7 +61,7 @@ set(SysProfCapture_VERSION ${PC_SYSPROF_CAPTURE_VERSION})
- find_path(SysProfCapture_INCLUDE_DIR
-     NAMES sysprof-capture.h
-     HINTS ${PC_SYSPROF_CAPTURE_INCLUDEDIR} ${PC_SYSPROF_CAPTURE_INCLUDE_DIR}
--    PATH_SUFFIXES sysprof-6
-+    PATH_SUFFIXES sysprof-6 sysprof-4
- )
- 
- find_library(SysProfCapture_LIBRARY
- 

webkit2gtk3.spec

@@ -10,8 +10,12 @@
 %global with_gamepad 1
 %endif
 
-# https://skia.org/docs/user/build/#supported-and-preferred-compilers            
-%global toolchain clang
+# Clang is preferred: https://skia.org/docs/user/build/#supported-and-preferred-compilers
+#
+# FIXME: Clang toolchain is broken on i686: https://issues.redhat.com/browse/RHEL-59586
+#        Disable it everywhere to ensure we use the same toolchain on all architectures.
+#
+#%global toolchain clang
 
 # We run out of memory if building with LTO enabled on i686.
 %ifarch %{ix86}
@@ -19,7 +23,7 @@
 %endif
 
 Name:           webkit2gtk3
-Version:        2.46.0
+Version:        2.46.1
 Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
@@ -36,9 +40,6 @@ Source2:        webkitgtk-keys.gpg
 # https://github.com/llvm/llvm-project/issues/108014
 Patch:          webkitgtk-skia-musttail.patch
 
-# https://github.com/WebKit/WebKit/pull/33832
-Patch:          sysprof-capture-version.patch
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  clang
@@ -311,6 +312,10 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
 %changelog
+* Mon Sep 30 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.1-1
+- Update to 2.46.1
+  Resolves: RHEL-59181
+
 * Wed Sep 18 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.0-1
 - Upgrade to 2.46.0
   Resolves: RHEL-59181