Add patch to fix non-x86, non-ARM build

This reverts commit 1fa3d8e3af.

Don't need this anymore as I've added a patch for the excessive CPU
issue.

.gitignore

@@ -1,33 +1,2 @@
 /webkitgtk-*.tar.xz
-/webkitgtk-2.37.1.tar.xz.asc
-/webkitgtk-2.37.90.tar.xz.asc
-/webkitgtk-2.37.91.tar.xz.asc
-/webkitgtk-2.38.0.tar.xz.asc
-/webkitgtk-2.38.1.tar.xz.asc
-/webkitgtk-2.38.2.tar.xz.asc
-/webkitgtk-2.39.1.tar.xz.asc
-/webkitgtk-2.39.2.tar.xz.asc
-/webkitgtk-2.39.3.tar.xz.asc
-/webkitgtk-2.39.4.tar.xz.asc
-/webkitgtk-2.39.5.tar.xz.asc
-/webkitgtk-2.39.6.tar.xz.asc
-/webkitgtk-2.39.7.tar.xz.asc
-/webkitgtk-2.39.90.tar.xz.asc
-/webkitgtk-2.39.91.tar.xz.asc
-/webkitgtk-2.40.0.tar.xz.asc
-/webkitgtk-2.41.1.tar.xz.asc
-/webkitgtk-2.41.2.tar.xz.asc
-/webkitgtk-2.41.3.tar.xz.asc
-/webkitgtk-2.41.4.tar.xz.asc
-/webkitgtk-2.41.5.tar.xz.asc
-/webkitgtk-2.41.6.tar.xz.asc
-/webkitgtk-2.41.90.tar.xz.asc
-/webkitgtk-2.41.91.tar.xz.asc
-/webkitgtk-2.41.92.tar.xz.asc
-/webkitgtk-2.42.0.tar.xz.asc
-/webkitgtk-2.42.1.tar.xz.asc
-/webkitgtk-2.42.2.tar.xz.asc
-/webkitgtk-2.43.1.tar.xz.asc
-/webkitgtk-2.43.2.tar.xz.asc
-/webkitgtk-2.43.3.tar.xz.asc
-/webkitgtk-2.43.4.tar.xz.asc
+/webkitgtk-*.tar.xz.asc

denormal-disabler-build.patch

@@ -0,0 +1,12 @@
+diff --git a/Source/WebCore/platform/audio/DenormalDisabler.cpp b/Source/WebCore/platform/audio/DenormalDisabler.cpp
+index 35715e663ce7..44ba08a33d5d 100644
+--- a/Source/WebCore/platform/audio/DenormalDisabler.cpp
++++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp
+@@ -91,7 +91,7 @@ DenormalDisabler::~DenormalDisabler()
+     }
+ }
+ #else
+-DenormalDisabler::DenormalDisabler() = default
++DenormalDisabler::DenormalDisabler() = default;
+ DenormalDisabler::~DenormalDisabler() = default;
+ #endif

fix-wasm.patch

@@ -0,0 +1,48 @@
+From 9140ce712aa87091613874d802787ab476be0e39 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Wed, 14 Aug 2024 14:58:05 -0500
+Subject: [PATCH] Revert "Cherry-pick 272448.770@safari-7618-branch
+ (6d311cd7fefc). https://bugs.webkit.org/show_bug.cgi?id=271175"
+ https://bugs.webkit.org/show_bug.cgi?id=278113
+
+This reverts commit 279c9d7963182cc35cf4e0bfebe87df2d83eaef8.
+
+This broke wasm, and I don't know how to fix it.
+
+Canonical link: https://commits.webkit.org/274313.373@webkitglib/2.44
+---
+ .../stress/many-calls-results-on-stack.js     | 39 -------------------
+ Source/JavaScriptCore/wasm/WasmBBQJIT.cpp     | 19 ---------
+ 2 files changed, 58 deletions(-)
+ delete mode 100644 JSTests/wasm/stress/many-calls-results-on-stack.js
+
+diff --git a/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp b/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
+index 9049865e8ce7..3f142cf5e90f 100644
+--- a/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
++++ b/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
+@@ -3958,25 +3958,6 @@ void BBQJIT::returnValuesFromCall(Vector<Value, N>& results, const FunctionSigna
+                     ASSERT(m_validFPRs.contains(returnLocation.asFPR(), Width::Width128));
+                     m_fprSet.add(returnLocation.asFPR(), Width::Width128);
+                 }
+-            } else {
+-                ASSERT(returnLocation.isStackArgument());
+-                // FIXME: Ideally, we would leave these values where they are but a subsequent call could clobber them before they are used.
+-                // That said, stack results are very rare so this isn't too painful.
+-                // Even if we did leave them where they are, we'd need to flush them to their canonical location at the next branch otherwise
+-                // we could have something like (assume no result regs for simplicity):
+-                // call (result i32 i32) $foo
+-                // if (result i32) // Stack: i32(StackArgument:8) i32(StackArgument:0)
+-                //   // Stack: i32(StackArgument:8)
+-                // else
+-                //   call (result i32 i32) $bar // Stack: i32(StackArgument:8) we have to flush the stack argument to make room for the result of bar
+-                //   drop // Stack: i32(Stack:X) i32(StackArgument:8) i32(StackArgument:0)
+-                //   drop // Stack: i32(Stack:X) i32(StackArgument:8)
+-                // end
+-                // return // Stack i32(*Conflicting locations*)
+-
+-                Location canonicalLocation = canonicalSlot(result);
+-                emitMoveMemory(result.type(), returnLocation, canonicalLocation);
+-                returnLocation = canonicalLocation;
+             }
+         }
+         bind(result, returnLocation);

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.43.4.tar.xz) = 6246137deb76192f20bdd1b98e415a183e0c90edf357b08577fa82ce0d196da295c4edf1598b1edc15a258ad6c14997654b947e46e1ea65821c9e5ce6e1dda5c
-SHA512 (webkitgtk-2.43.4.tar.xz.asc) = 25fb00babd4d6d0ef6463226561963972895f2320c86e9da1bdf06cb6acdc6cee1ad97380b418e645d20f98a1cd4ec37d20efa0cb75473a6d62ae0cae28ecce7
+SHA512 (webkitgtk-2.48.1.tar.xz) = b78a2ae7e51942c4606e6f2f574e86f107e0c44fc685d9eda41d309457a340b9d9b6fae39cdbc3cc7c9210237b110647216eafc6b6e9b0e577106e477cd06d38
+SHA512 (webkitgtk-2.48.1.tar.xz.asc) = 072c1ed45c8f4f3d93ba79d1aa17decb2389a6535391fc6927f97f6404c4bdce4599b2e580397da1f163cc28c1c4c93efbf1eda16584ca18010b362824e35d31

webkitgtk.spec

@@ -5,20 +5,21 @@
         mkdir -p _license_files ; \
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
-# No libmanette in RHEL
-%bcond gamepad %{undefined rhel}
-%bcond avif %[%{undefined rhel} || %{defined epel}]
-%bcond jpegxl %[%{undefined rhel} || %{defined epel}]
-
-%global _lto_cflags %{nil}
-
 # Build documentation by default (use `rpmbuild --without docs` to override it).
 # This is used by Coverity. Coverity injects custom compiler warnings, but
 # any warning during WebKit docs build is fatal!
 %bcond_without docs
 
+# Clang is preferred: https://skia.org/docs/user/build/#supported-and-preferred-compilers
+%global toolchain clang
+
+# We run out of memory if building with LTO enabled on i686.
+%ifarch %{ix86}
+%global _lto_cflags %{nil}
+%endif
+
 Name:           webkitgtk
-Version:        2.43.4
+Version:        2.48.1
 Release:        %autorelease
 Summary:        GTK web content engine library
 
@@ -53,17 +54,18 @@ Source0:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # Use the keys from https://webkitgtk.org/verifying.html
 # $ gpg --import aperez.key carlosgc.key
-# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
+# $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
 Source2:        webkitgtk-keys.gpg
 
-# https://bugs.webkit.org/show_bug.cgi?id=268744
-# https://bugzilla.redhat.com/show_bug.cgi?id=2253099
-Patch:          display-vblank-monitor.patch
+# https://bugs.webkit.org/show_bug.cgi?id=286694
+Patch:          denormal-disabler-build.patch
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
+BuildRequires:  clang
 BuildRequires:  cmake
 BuildRequires:  flex
+BuildRequires:  flite-devel
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  gi-docgen
@@ -90,6 +92,7 @@ BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(enchant-2)
 BuildRequires:  pkgconfig(epoxy)
+BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(gbm)
@@ -103,15 +106,11 @@ BuildRequires:  pkgconfig(gtk4)
 BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(lcms2)
-%if %{with avif}
 BuildRequires:  pkgconfig(libavif)
-%endif
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libgcrypt)
 BuildRequires:  pkgconfig(libjpeg)
-%if %{with jpegxl}
 BuildRequires:  pkgconfig(libjxl)
-%endif
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libseccomp)
@@ -122,9 +121,7 @@ BuildRequires:  pkgconfig(libtasn1)
 BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(libwoff2dec)
 BuildRequires:  pkgconfig(libxslt)
-%if %{with gamepad}
 BuildRequires:  pkgconfig(manette-0.2)
-%endif
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-client)
@@ -152,6 +149,7 @@ Recommends:     gstreamer1-plugins-good
 Recommends:     xdg-desktop-portal-gtk
 Provides:       bundled(angle)
 Provides:       bundled(pdfjs)
+Provides:       bundled(skia)
 Provides:       bundled(xdgmime)
 Obsoletes:      webkit2gtk5.0 < %{version}-%{release}
 
@@ -171,6 +169,7 @@ Recommends:     gstreamer1-plugins-good
 Recommends:     xdg-desktop-portal-gtk
 Provides:       bundled(angle)
 Provides:       bundled(pdfjs)
+Provides:       bundled(skia)
 Provides:       bundled(xdgmime)
 
 %description -n webkit2gtk4.1
@@ -310,20 +309,6 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
   -DUSE_LIBBACKTRACE=OFF \
 %if %{without docs}
   -DENABLE_DOCUMENTATION=OFF \
-%endif
-%if %{without gamepad}
-  -DENABLE_GAMEPAD=OFF \
-%endif
-%if %{without avif}
-  -DUSE_AVIF=OFF \
-%endif
-%if %{without jpegxl}
-  -DUSE_JPEGXL=OFF \
-%endif
-%if 0%{?rhel}
-%ifarch aarch64
-  -DUSE_64KB_PAGE_BLOCK=ON \
-%endif
 %endif
   %{nil}
 
@@ -337,20 +322,6 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
   -DENABLE_WEBDRIVER=OFF \
 %if %{without docs}
   -DENABLE_DOCUMENTATION=OFF \
-%endif
-%if %{without gamepad}
-  -DENABLE_GAMEPAD=OFF \
-%endif
-%if %{without avif}
-  -DUSE_AVIF=OFF \
-%endif
-%if %{without jpegxl}
-  -DUSE_JPEGXL=OFF \
-%endif
-%if 0%{?rhel}
-%ifarch aarch64
-  -DUSE_64KB_PAGE_BLOCK=ON \
-%endif
 %endif
   %{nil}
 
@@ -484,4 +455,4 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
 %endif
 
 %changelog
-%autochangelog
+%autochangelog