Add user content manager patch and reenable LTO

.gitignore

@@ -13,3 +13,5 @@
 /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

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.39.90.tar.xz.asc) = 772e584f3caa3141d3cdc0abdd747c2c08990c244740f138fe9f64f3aedb01a08f39fea59e27906e27063aaebf41432a25a6326f4841af7b3075c4da70b16f09
+SHA512 (webkitgtk-2.40.0.tar.xz) = 550dafb31d71edf984d6b7636366f839d31f6b244b87f83c6efe7af17efe3f2f63268d2c39a6a3c474afadf2b30df868efaefcf38197b30cc6b11c63de7d2ddc
+SHA512 (webkitgtk-2.40.0.tar.xz.asc) = 782887d27adad7791dd4dc8e070c9c10c711da70907bddf988b739d03c3e2f3d49f433e3afc325801cf42aebe9689110122d6145b69d9696bf8eef5ae525062c

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

unbreak-script-message-received.patch

@@ -0,0 +1,35 @@
+From 7bcb97382f2f347dc348c3c31416ae7fd760ce6b Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Fri, 17 Mar 2023 15:39:52 -0500
+Subject: [PATCH] REGRESSION(261320@main): [GLib] Broke
+ WebKitUserContentManager::script-message-received
+ https://bugs.webkit.org/show_bug.cgi?id=254089
+
+Reviewed by NOBODY (OOPS!).
+
+I forgot to update the marshaller used by
+WebKitUserContentManager::script-message-received. It worked perfectly
+fine in my development environment for whatever reason, but was broken
+in at least Ephy Tech Preview.
+
+* Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp:
+---
+ Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
+index af2d963bb3b3..f778b19bc816 100644
+--- a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
++++ b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
+@@ -106,7 +106,11 @@ static void webkit_user_content_manager_class_init(WebKitUserContentManagerClass
+             G_TYPE_FROM_CLASS(gObjectClass),
+             static_cast<GSignalFlags>(G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED),
+             0, nullptr, nullptr,
++#if ENABLE(2022_GLIB_API)
++            g_cclosure_marshal_VOID__OBJECT,
++#else
+             g_cclosure_marshal_VOID__BOXED,
++#endif
+             G_TYPE_NONE, 1,
+ #if ENABLE(2022_GLIB_API)
+             JSC_TYPE_VALUE);

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.
@@ -19,7 +16,7 @@
 %bcond_without docs
 
 Name:           webkitgtk
-Version:        2.39.90
+Version:        2.40.0
 Release:        %autorelease
 Summary:        GTK web content engine library
 
@@ -32,14 +29,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
-Patch0:         fix-installed-headers.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
+# https://github.com/WebKit/WebKit/pull/11664
+Patch0:         unbreak-script-message-received.patch
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
@@ -434,10 +425,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 +469,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 +551,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