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.

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);

monitoring.toml

@@ -1,13 +0,0 @@
-# Enable/disable monitoring
-monitoring = false
-# Enable/disable filling bugzilla ticket for new release
-# When disabled it will also disable scratch builds
-bugzilla = true
-# Enable/disable reporting only stable versions
-# Stable versions are recognized based on release-monitoring.org project settings
-stable_only = false
-# Enable/disable reporting all new versions instead of the latest one
-# Enabling this will disable scratch builds
-all_versions = false
-# Enable/disable scratch build for newly opened version
-scratch_build = false

skia-s390x.patch

@@ -1,82 +0,0 @@
-diff --git a/Source/ThirdParty/skia/include/core/SkTypes.h b/Source/ThirdParty/skia/include/core/SkTypes.h
-index 79644da049ff..fc0646e21772 100644
---- a/Source/ThirdParty/skia/include/core/SkTypes.h
-+++ b/Source/ThirdParty/skia/include/core/SkTypes.h
-@@ -33,6 +33,8 @@
- #  undef SK_DIRECT3D
- #endif
- 
-+#if !defined(SK_R32_SHIFT) || !defined(SK_G32_SHIFT) || !defined(SK_B32_SHIFT) || !defined(SK_A32_SHIFT)
-+
- // If SK_R32_SHIFT is set, we'll use that to choose RGBA or BGRA.
- // If not, we'll default to RGBA everywhere except BGRA on Windows.
- #if defined(SK_R32_SHIFT)
-@@ -52,6 +54,8 @@
- #define SK_G32_SHIFT 8
- #define SK_A32_SHIFT 24
- 
-+#endif
-+
- /**
-  * SK_PMCOLOR_BYTE_ORDER can be used to query the byte order of SkPMColor at compile time.
-  */
-diff --git a/Source/ThirdParty/skia/src/codec/SkCodecPriv.h b/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
-index c321fb77c0ae..a0a01cccd58a 100644
---- a/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
-+++ b/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
-@@ -14,6 +14,7 @@
- #include "include/core/SkTypes.h"
- #include "include/private/SkEncodedInfo.h"
- #include "modules/skcms/skcms.h"
-+#include "src/core/SkEndian.h"
- #include "src/codec/SkColorPalette.h"
- #include "src/core/SkColorData.h"
- 
-diff --git a/Source/ThirdParty/skia/src/core/Sk4px.h b/Source/ThirdParty/skia/src/core/Sk4px.h
-index d5d481e7e300..c7ef0bcd0ed0 100644
---- a/Source/ThirdParty/skia/src/core/Sk4px.h
-+++ b/Source/ThirdParty/skia/src/core/Sk4px.h
-@@ -27,7 +27,9 @@ public:
- 
-     // RGBA rgba XYZW xyzw -> AAAA aaaa WWWW wwww
-     Sk4px alphas() const {
-+#ifdef SK_CPU_LENDIAN
-         static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian.");
-+#endif
-         return Sk4px(skvx::shuffle<3,3,3,3, 7,7,7,7, 11,11,11,11, 15,15,15,15>(fV));
-     }
-     Sk4px inv() const { return Sk4px(skvx::byte16(255) - fV); }
-diff --git a/Source/ThirdParty/skia/src/core/SkColorPriv.h b/Source/ThirdParty/skia/src/core/SkColorPriv.h
-index 45471c25529e..319fec78069b 100644
---- a/Source/ThirdParty/skia/src/core/SkColorPriv.h
-+++ b/Source/ThirdParty/skia/src/core/SkColorPriv.h
-@@ -64,6 +64,20 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) {
-  *  Here we enforce this constraint.
-  */
- 
-+#ifdef SK_CPU_BENDIAN
-+
-+#define SK_RGBA_R32_SHIFT   24
-+#define SK_RGBA_G32_SHIFT   16
-+#define SK_RGBA_B32_SHIFT   8
-+#define SK_RGBA_A32_SHIFT   0
-+
-+#define SK_BGRA_B32_SHIFT   24
-+#define SK_BGRA_G32_SHIFT   16
-+#define SK_BGRA_R32_SHIFT   8
-+#define SK_BGRA_A32_SHIFT   0
-+
-+#else
-+
- #define SK_RGBA_R32_SHIFT   0
- #define SK_RGBA_G32_SHIFT   8
- #define SK_RGBA_B32_SHIFT   16
-@@ -74,6 +88,8 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) {
- #define SK_BGRA_R32_SHIFT   16
- #define SK_BGRA_A32_SHIFT   24
- 
-+#endif
-+
- #if defined(SK_PMCOLOR_IS_RGBA) || defined(SK_PMCOLOR_IS_BGRA)
-     #error "Configure PMCOLOR by setting SK_R32_SHIFT."
- #endif

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.53.91.tar.xz) = 0bb5ec4c75cf0dcd4ccc46b7cf8595722d447385b75ed6ec79333b56203f681077fa355600210edb4fe6344e4af2943c7fb5b1bff6e35a7ec1ea456d891a1951
-SHA512 (webkitgtk-2.53.91.tar.xz.asc) = 72f6f01f8f3e12228ee70202b9b9bda589c80a791086cde6d6af5f2f916b44877b984267c6a5970f4fe41ff7dac21bccfa7323f19d71f6fd3e4a87abb18be58c
+SHA512 (webkitgtk-2.48.1.tar.xz) = b78a2ae7e51942c4606e6f2f574e86f107e0c44fc685d9eda41d309457a340b9d9b6fae39cdbc3cc7c9210237b110647216eafc6b6e9b0e577106e477cd06d38
+SHA512 (webkitgtk-2.48.1.tar.xz.asc) = 072c1ed45c8f4f3d93ba79d1aa17decb2389a6535391fc6927f97f6404c4bdce4599b2e580397da1f163cc28c1c4c93efbf1eda16584ca18010b362824e35d31

webkitgtk.spec

@@ -19,7 +19,7 @@
 %endif
 
 Name:           webkitgtk
-Version:        2.53.91
+Version:        2.48.1
 Release:        %autorelease
 Summary:        GTK web content engine library
 
@@ -32,21 +32,23 @@ Summary:        GTK web content engine library
 # Source/JavaScriptCore/disassembler/zydis/* is MIT
 # Source/JavaScriptCore/runtime/JSDateMath.h is MPL 1.1/GPL 2.0/LGPL 2.1
 # Source/JavaScriptCore/runtime/MathCommon.cpp is SunPro
-# Source/JavaScriptCore/ucd/CaseFolding.txt is Unicode-TOU, which is unapproved, but the only copyrightable part is the comment at the top of the file, so seems safe to omit it
+# Source/JavaScriptCore/ucd/CaseFolding.txt is Unicode-TOU
 # Source/ThirdParty/ANGLE/include/CL/cl_d3d10.h is Apache-2.0
 # Source/ThirdParty/ANGLE/include/GLES/gl.h is MIT-Khronos (not on list see https://github.com/spdx/license-list-XML/issues/2017)
 # Source/ThirdParty/ANGLE/src/compiler/preprocessor/preprocessor_tab_autogen.cpp is GPL-3.0-or-later WITH Bison-exception-2.2
+# Source/ThirdParty/ANGLE/tools/flex-bison/third_party/m4sugar/m4sugar.m4 is GPL-3.0-only WITH Autoconf-exception-3.0
 # Source/ThirdParty/pdfjs/web/images/annotation-paperclip.svg is MPL-2.0i
 # Source/ThirdParty/pdfjs/web/standard_fonts/LICENSE_LIBERATION is OFL-1.1
-# Source/ThirdParty/xdgmime/ is AFL-2.0 OR GPL-2.0-or-later
+# Source/ThirdParty/xdgmime/ is AFL-2.0 GPL-2.0-or-later
 # Source/WebCore/dom/PseudoElement.h is BSD-Source-Code
 # Source/WebCore/dom/SecurityContext.cpp is BSD-2-Clause-Views
 # Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp is LGPL-2.1-or-later
 # Source/WTF/LICENSE-libc++.txt is NCSA OR MIT
 # Source/WTF/LICENSE-LLVM.txt is Apache-2.0 WITH LLVM-exception
+# Source/WTF/icu/LICENSE is ICU
 # Source/WTF/wtf/Markable.h is BSL-1.0
 # The license tag and above comment is up to date as of WebKitGTK 2.42.2.
-License:        LGPL-2.1-only AND BSD-2-Clause AND BSD-3-Clause AND ISC AND bzip2-1.0.6 AND NCSA AND MIT AND GPL-2.0-only AND MPL-1.1 AND SunPro AND Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND MPL-2.0 AND OFL-1.1 AND (AFL-2.0 OR GPL-2.0-or-later) AND BSD-Source-Code AND BSD-2-Clause-Views AND LGPL-2.1-or-later AND (NCSA OR MIT) AND Apache-2.0 WITH LLVM-exception AND BSL-1.0
+License:        LGPL-2.1-only AND BSD-2-Clause AND BSD-3-Clause AND ISC AND bzip2-1.0.6 AND NCSA AND MIT AND GPL-2.0-only AND MPL-1.1 AND SunPro AND Unicode-TOU AND Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-3.0-only WITH Autoconf-exception-3.0 AND MPL-2.0 AND OFL-1.1 AND (AFL-2.0 GPL-2.0-or-later) AND BSD-Source-Code AND BSD-2-Clause-Views AND LGPL-2.1-or-later AND (NCSA OR MIT) AND Apache-2.0 WITH LLVM-exception AND ICU AND BSL-1.0
 URL:            https://www.webkitgtk.org/
 Source0:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
@@ -55,8 +57,8 @@ Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
 Source2:        webkitgtk-keys.gpg
 
-# https://bugs.webkit.org/show_bug.cgi?id=312677
-Patch:          skia-s390x.patch
+# https://bugs.webkit.org/show_bug.cgi?id=286694
+Patch:          denormal-disabler-build.patch
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
@@ -64,6 +66,7 @@ BuildRequires:  clang
 BuildRequires:  cmake
 BuildRequires:  flex
 BuildRequires:  flite-devel
+BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  gi-docgen
 BuildRequires:  git
@@ -80,7 +83,6 @@ BuildRequires:  perl(bigint)
 BuildRequires:  python3
 BuildRequires:  ruby
 BuildRequires:  rubygems
-BuildRequires:  rubygem(getoptlong)
 BuildRequires:  rubygem-json
 BuildRequires:  unifdef
 BuildRequires:  xdg-dbus-proxy
@@ -121,7 +123,6 @@ BuildRequires:  pkgconfig(libwoff2dec)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(manette-0.2)
 BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(sysprof-capture-4)
 BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
@@ -130,7 +131,7 @@ BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(xt)
 
 # Filter out provides for private libraries
-%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkitgtk-6\\.0/.*\\.so)$
+%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkitgtk-6\\.0/.*\\.so)$
 
 %description
 WebKitGTK is the port of the WebKit web rendering engine to the
@@ -237,8 +238,6 @@ This package contains developer documentation for webkit2gtk4.1.
 
 %package -n     javascriptcoregtk6.0
 Summary:        JavaScript engine from webkitgtk6.0
-Provides:       bundled(simde)
-Provides:       bundled(simdutf)
 Obsoletes:      javascriptcoregtk5.0 < %{version}-%{release}
 
 %description -n javascriptcoregtk6.0
@@ -246,8 +245,6 @@ This package contains the JavaScript engine from webkitgtk6.0.
 
 %package -n     javascriptcoregtk4.1
 Summary:        JavaScript engine from webkit2gtk4.1
-Provides:       bundled(simde)
-Provides:       bundled(simdutf)
 Obsoletes:      webkit2gtk4.1-jsc < %{version}-%{release}
 
 %description -n javascriptcoregtk4.1
@@ -303,9 +300,8 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
 %global optflags %(echo %{optflags} | sed 's/-mbranch-protection=standard /-mbranch-protection=pac-ret /')
 %endif
 
-mkdir webkitgtk-6.0
-pushd webkitgtk-6.0
-%cmake -S .. \
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
+%cmake \
   -GNinja \
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
@@ -315,11 +311,9 @@ pushd webkitgtk-6.0
   -DENABLE_DOCUMENTATION=OFF \
 %endif
   %{nil}
-popd
 
-mkdir webkit2gtk-4.1
-pushd webkit2gtk-4.1
-%cmake -S .. \
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
+%cmake \
   -GNinja \
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
@@ -330,26 +324,21 @@ pushd webkit2gtk-4.1
   -DENABLE_DOCUMENTATION=OFF \
 %endif
   %{nil}
-popd
 
-pushd webkitgtk-6.0
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
 export NINJA_STATUS="[1/2][%f/%t %es] "
 %cmake_build %limit_build -m 3072
-popd
 
-pushd webkit2gtk-4.1
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
 export NINJA_STATUS="[2/2][%f/%t %es] "
 %cmake_build %limit_build -m 3072
-popd
 
 %install
-pushd webkitgtk-6.0
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
 %cmake_install
-popd
 
-pushd webkit2gtk-4.1
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
 %cmake_install
-popd
 
 %find_lang WebKitGTK-6.0
 %find_lang WebKitGTK-4.1
@@ -466,4 +455,4 @@ popd
 %endif
 
 %changelog
-%autochangelog
+%autochangelog