Disable debug packages

It's too expensive for our 16GB 4 core systems to handle debug
information for this particular package. Until we get higher memory
capacity systems we should just keep it disabled.

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -13,3 +13,6 @@
 /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.40.1.tar.xz.asc

build.patch

@@ -0,0 +1,19 @@
+diff --git a/Source/WebCore/platform/graphics/SourceBrush.cpp b/Source/WebCore/platform/graphics/SourceBrush.cpp
+index f4d299be82f1..4bf4d6842aea 100644
+--- a/Source/WebCore/platform/graphics/SourceBrush.cpp
++++ b/Source/WebCore/platform/graphics/SourceBrush.cpp
+@@ -65,12 +65,12 @@ Pattern* SourceBrush::pattern() const
+ 
+ void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& spaceTransform)
+ {
+-    m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
++    m_brush = Brush { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
+ }
+ 
+ void SourceBrush::setPattern(Ref<Pattern>&& pattern)
+ {
+-    m_brush = { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
++    m_brush = Brush { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
+ }
+ 
+ WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)

fix-installed-headers.patch

@@ -1,62 +0,0 @@
-From 166cdf23242165c9c84f621a4121c80432211c50 Mon Sep 17 00:00:00 2001
-From: Adrian Perez de Castro <aperez@igalia.com>
-Date: Mon, 20 Feb 2023 16:26:28 +0200
-Subject: [PATCH] [GLib] Installed API headers are unusable with the new 2022
- API https://bugs.webkit.org/show_bug.cgi?id=252562
-
-Reviewed by NOBODY (OOPS!).
-
-* Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in: Only
-  include JavaScriptCore/JSBase.h with the old API, change a !USE(GTK4)
-  guard to !ENABLE(2022_GLIB_API) as it is more correct.
-* Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in: Ditto.
----
- Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in | 4 ++--
- Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in          | 4 +++-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in b/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in
-index b7eece231000..78ba2120b225 100644
---- a/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in
-@@ -26,7 +26,7 @@
- #include <glib-object.h>
- #include <@API_INCLUDE_PREFIX@/WebKitDefines.h>
- 
--#if PLATFORM(GTK)
-+#if PLATFORM(GTK) && !ENABLE(2022_GLIB_API)
- #include <JavaScriptCore/JSBase.h>
- #endif
- 
-@@ -46,7 +46,7 @@ webkit_javascript_result_ref                (WebKitJavascriptResult *js_result);
- WEBKIT_API void
- webkit_javascript_result_unref              (WebKitJavascriptResult *js_result);
- 
--#if PLATFORM(GTK) && !USE(GTK4)
-+#if PLATFORM(GTK) && !ENABLE(2022_GLIB_API)
- WEBKIT_DEPRECATED JSGlobalContextRef
- webkit_javascript_result_get_global_context (WebKitJavascriptResult *js_result);
- 
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in b/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in
-index 45949e44e4a3..293aa3841695 100644
---- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in
-@@ -59,7 +59,9 @@
- #endif
- 
- #if PLATFORM(GTK)
-+#if !ENABLE(2022_GLIB_API)
- #include <JavaScriptCore/JSBase.h>
-+#endif
- #include <webkit/WebKitColorChooserRequest.h>
- #include <webkit/WebKitWebInspector.h>
- #include <webkit/WebKitWebViewBase.h>
-@@ -628,7 +630,7 @@ webkit_web_view_execute_editing_command_with_argument(WebKitWebView
- WEBKIT_API WebKitFindController *
- webkit_web_view_get_find_controller                  (WebKitWebView             *web_view);
- 
--#if PLATFORM(GTK) && !USE(GTK4)
-+#if PLATFORM(GTK) && !ENABLE(2022_GLIB_API)
- WEBKIT_DEPRECATED JSGlobalContextRef
- webkit_web_view_get_javascript_global_context        (WebKitWebView             *web_view);
- #endif

no-debug-fission.patch

@@ -1,29 +0,0 @@
-diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
-index 94b9740c8a82..43b961c996c3 100644
---- a/Source/cmake/OptionsCommon.cmake
-+++ b/Source/cmake/OptionsCommon.cmake
-@@ -154,19 +154,11 @@ if (USE_THIN_ARCHIVES)
- endif ()
- 
- set(ENABLE_DEBUG_FISSION_DEFAULT OFF)
--check_cxx_compiler_flag(-gsplit-dwarf CXX_COMPILER_SUPPORTS_GSPLIT_DWARF)
--if (CXX_COMPILER_SUPPORTS_GSPLIT_DWARF AND LD_SUPPORTS_SPLIT_DEBUG)
--  set(ENABLE_DEBUG_FISSION_DEFAULT ON)
--endif ()
--
--if (ENABLE_DEBUG_FISSION_DEFAULT AND SCCACHE_FOUND AND COMPILER_IS_CLANG AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
--    # https://github.com/mozilla/sccache/issues/1593
--    message("The SCCache clang backend doesn't support split-dwarf for non-debug builds yet. Keeping default value of DEBUG_FISSION to OFF.")
--    set(ENABLE_DEBUG_FISSION_DEFAULT OFF)
--endif ()
--
--if (CMAKE_GENERATOR MATCHES "Visual Studio")
--    set(ENABLE_DEBUG_FISSION_DEFAULT OFF)
-+if ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
-+    check_cxx_compiler_flag(-gsplit-dwarf CXX_COMPILER_SUPPORTS_GSPLIT_DWARF)
-+    if (CXX_COMPILER_SUPPORTS_GSPLIT_DWARF AND LD_SUPPORTS_SPLIT_DEBUG)
-+        set(ENABLE_DEBUG_FISSION_DEFAULT ON)
-+    endif ()
- endif ()
- 
- option(DEBUG_FISSION "Use Debug Fission support" ${ENABLE_DEBUG_FISSION_DEFAULT})

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.39.90.tar.xz) = 1a17a60443072253c9b2a4a04356213ea9a3f36976ebad048048b1bf6a5dd15a9fb161df1cabbf4258b001a5ab326161887cc8e6f1863a3e32834a35f607e4d4
+SHA512 (webkitgtk-2.40.1.tar.xz) = e94b9a651b3c120e3dc918831c8a7fcfbd35f6760a53b7b39a07c7d792ddf99082030bf8b44a522001df4a7368c2b9145606f7a1cc8e0ed60498a0b78325bc5c
-SHA512 (webkitgtk-2.39.90.tar.xz.asc) = 772e584f3caa3141d3cdc0abdd747c2c08990c244740f138fe9f64f3aedb01a08f39fea59e27906e27063aaebf41432a25a6326f4841af7b3075c4da70b16f09
+SHA512 (webkitgtk-2.40.1.tar.xz.asc) = 105496359f3fdb2e4ab97696c5db8efcf55d17a4d560fa62f59febd62e1bba5094ad700e837a19ead15e5654e7ffbc4275761c70983d8cd81f8175bd5a446252

super-sampler.patch

@@ -1,12 +0,0 @@
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-index 97e22b7ec4c1..64397ee50cf7 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-@@ -39,6 +39,7 @@
- #include "LLIntData.h"
- #include "LLIntSlowPaths.h"
- #include "JSCInlines.h"
-+#include "SuperSampler.h"
- #include <wtf/Assertions.h>
- #include <wtf/MathExtras.h>
-

webkitgtk.spec

@@ -1,6 +1,3 @@
-# https://bugs.webkit.org/show_bug.cgi?id=249368
-%global _lto_cflags %{nil}
-
 ## NOTE: Lots of files in various subdirectories have the same name (such as
 ## "LICENSE") so this short macro allows us to distinguish them by using their
 ## directory names (from the source tree) as prefixes for the files.
@@ -18,9 +15,15 @@
 # any warning during WebKit docs build is fatal!
 %bcond_without docs
 
+%ifarch riscv64
+%global _lto_cflags %{nil}
+# 16GB on 4 core system is not enough to handle debug information.
+%global debug_package %{nil}
+%endif
+
 Name:           webkitgtk
-Version:        2.39.90
+Version:        2.40.1
-Release:        %autorelease
+Release:        %autorelease -e 0.riscv64
 Summary:        GTK web content engine library
 
 License:        LGPLv2
@@ -32,14 +35,8 @@ Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
 Source2:        webkitgtk-keys.gpg
 
-# https://github.com/WebKit/WebKit/pull/10362
+# https://commits.webkit.org/262434@main
-Patch0:         fix-installed-headers.patch
+Patch0:         build.patch
-
-# https://bugs.webkit.org/show_bug.cgi?id=252617
-Patch1:         super-sampler.patch
-
-# https://bugs.webkit.org/show_bug.cgi?id=252679
-Patch2:         no-debug-fission.patch
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
@@ -312,6 +309,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
 # https://bugzilla.redhat.com/show_bug.cgi?id=1456261
 %global _dwz_max_die_limit_x86_64 250000000
 %global _dwz_max_die_limit_aarch64 250000000
+%global _dwz_max_die_limit_riscv64 250000000
 
 # Require 32 GB of RAM per vCPU for debuginfo processing. 16 GB is not enough.
 %global _find_debuginfo_opts %limit_build -m 32768
@@ -319,7 +317,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
 # Reduce debuginfo verbosity 32-bit builds to reduce memory consumption even more.
 # https://bugs.webkit.org/show_bug.cgi?id=140176
 # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/
-%ifarch %{ix86}
+%ifarch %{ix86} riscv64
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
@@ -434,10 +432,10 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %license _license_files/*WebCore*
 %license _license_files/*WebInspectorUI*
 %license _license_files/*WTF*
-%{_libdir}/libwebkitgtk-6.0.so.3*
+%{_libdir}/libwebkitgtk-6.0.so.4*
 %dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/WebKit-6.0.typelib
-%{_libdir}/girepository-1.0/WebKitWebExtension-6.0.typelib
+%{_libdir}/girepository-1.0/WebKitWebProcessExtension-6.0.typelib
 %{_libdir}/webkitgtk-6.0/
 %{_libexecdir}/webkitgtk-6.0/
 %exclude %{_libexecdir}/webkitgtk-6.0/MiniBrowser
@@ -478,10 +476,10 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %exclude %{_includedir}/webkitgtk-6.0/jsc
 %{_libdir}/libwebkitgtk-6.0.so
 %{_libdir}/pkgconfig/webkitgtk-6.0.pc
-%{_libdir}/pkgconfig/webkitgtk-web-extension-6.0.pc
+%{_libdir}/pkgconfig/webkitgtk-web-process-extension-6.0.pc
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/WebKit-6.0.gir
-%{_datadir}/gir-1.0/WebKitWebExtension-6.0.gir
+%{_datadir}/gir-1.0/WebKitWebProcessExtension-6.0.gir
 
 %files -n webkit2gtk4.1-devel
 %{_libexecdir}/webkit2gtk-4.1/MiniBrowser
@@ -560,7 +558,7 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/javascriptcoregtk-6.0/
 %{_datadir}/gtk-doc/html/webkitgtk-6.0/
-%{_datadir}/gtk-doc/html/webkitgtk-web-extension-6.0/
+%{_datadir}/gtk-doc/html/webkitgtk-web-process-extension-6.0/
 
 %files -n webkit2gtk4.1-doc
 %dir %{_datadir}/gtk-doc