rpms
/
webkitgtk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to 2.39.91

This commit is contained in:
Michael Catanzaro 2023-03-08 09:01:51 -06:00
parent fac6852e56
commit 1c16daccce
6 changed files with 109 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

148
fix-installed-headers.patch
View File

@ -1,62 +1,110 @@
From 166cdf23242165c9c84f621a4121c80432211c50 Mon Sep 17 00:00:00 2001
From 53a8890833684fe813efd7b7a2b7417dbfa7b826 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
Date: Wed, 8 Mar 2023 04:27:56 -0800
Subject: [PATCH] REGRESSION(261320@main): [GLib] Clean builds fail with
ENABLE_2022_GLIB_API https://bugs.webkit.org/show_bug.cgi?id=253563
Reviewed by NOBODY (OOPS!).
Unreviewed build fix.
* 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/WebKitWebView.h.in: Guard the
inclusion of WebKitJavascriptResult.h with !ENABLE(2022_GLIB_API).
Canonical link: https://commits.webkit.org/261367@main
---
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(-)
Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in | 2 ++
1 file changed, 2 insertions(+)
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
index cc60ef336afc..6f1afac40e2b 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)
@@ -36,7 +36,9 @@
#include <@API_INCLUDE_PREFIX@/WebKitFormSubmissionRequest.h>
#include <@API_INCLUDE_PREFIX@/WebKitHitTestResult.h>
#include <@API_INCLUDE_PREFIX@/WebKitInputMethodContext.h>
+#if !ENABLE(2022_GLIB_API)
#include <JavaScriptCore/JSBase.h>
#include <@API_INCLUDE_PREFIX@/WebKitJavascriptResult.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);
#include <@API_INCLUDE_PREFIX@/WebKitNavigationAction.h>
#include <@API_INCLUDE_PREFIX@/WebKitNotification.h>
#include <@API_INCLUDE_PREFIX@/WebKitOptionMenu.h>
From 10c9256883bf38b9fbcfbc91577783d4df90d1bd Mon Sep 17 00:00:00 2001
From: Adrian Perez de Castro <aperez@igalia.com>
Date: Wed, 8 Mar 2023 05:21:28 -0800
Subject: [PATCH] REGRESSION(261320@main): [GLib] Clean builds fail with
ENABLE_2022_GLIB_API https://bugs.webkit.org/show_bug.cgi?id=253563
Unreviewed build fix.
* Source/WebKit/UIProcess/API/glib/WebKitAutocleanups.h.in: Remove the
autocleanup for WebKitJavascriptResult when building with the new API.
* Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp:
Conditionally include WebKitJavascriptResultPrivate.h.
* Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp: Ditto.
Canonical link: https://commits.webkit.org/261368@main
---
Source/WebKit/UIProcess/API/glib/WebKitAutocleanups.h.in | 2 ++
.../WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp | 5 ++++-
Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitAutocleanups.h.in b/Source/WebKit/UIProcess/API/glib/WebKitAutocleanups.h.in
index b56fb3f302cc..f68ed748046f 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitAutocleanups.h.in
+++ b/Source/WebKit/UIProcess/API/glib/WebKitAutocleanups.h.in
@@ -87,7 +87,9 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitApplicationInfo, webkit_application_info_un
G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitCredential, webkit_credential_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitITPFirstParty, webkit_itp_first_party_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitITPThirdParty, webkit_itp_third_party_unref)
+#if !ENABLE(2022_GLIB_API)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitJavascriptResult, webkit_javascript_result_unref)
+#endif
G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitMemoryPressureSettings, webkit_memory_pressure_settings_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitNavigationAction, webkit_navigation_action_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitNetworkProxySettings, webkit_network_proxy_settings_free)
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
index 39a57d194c0d..af2d963bb3b3 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
@@ -23,7 +23,6 @@
#include "APISerializedScriptValue.h"
#include "InjectUserScriptImmediately.h"
#include "WebKitInitialize.h"
-#include "WebKitJavascriptResultPrivate.h"
#include "WebKitUserContentManagerPrivate.h"
#include "WebKitUserContentPrivate.h"
#include "WebKitWebContextPrivate.h"
@@ -32,6 +31,10 @@
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/WTFGType.h>
-#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);
+#if !ENABLE(2022_GLIB_API)
+#include "WebKitJavascriptResultPrivate.h"
+#endif
+
#if PLATFORM(WPE)
#include "WPEView.h"
#endif
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
index 1b3b6273bd14..837aa061fcab 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
@@ -46,7 +46,6 @@
#include "WebKitHitTestResultPrivate.h"
#include "WebKitIconLoadingClient.h"
#include "WebKitInputMethodContextPrivate.h"
-#include "WebKitJavascriptResultPrivate.h"
#include "WebKitNavigationClient.h"
#include "WebKitNotificationPrivate.h"
#include "WebKitPermissionStateQueryPrivate.h"
@@ -106,6 +105,8 @@
#if ENABLE(2022_GLIB_API)
#include "WebKitNetworkSessionPrivate.h"
+#else
+#include "WebKitJavascriptResultPrivate.h"
#endif
using namespace WebKit;

29
no-debug-fission.patch
View File

@ -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})

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (webkitgtk-2.39.90.tar.xz) = 1a17a60443072253c9b2a4a04356213ea9a3f36976ebad048048b1bf6a5dd15a9fb161df1cabbf4258b001a5ab326161887cc8e6f1863a3e32834a35f607e4d4
SHA512 (webkitgtk-2.39.90.tar.xz.asc) = 772e584f3caa3141d3cdc0abdd747c2c08990c244740f138fe9f64f3aedb01a08f39fea59e27906e27063aaebf41432a25a6326f4841af7b3075c4da70b16f09
SHA512 (webkitgtk-2.39.91.tar.xz) = e31ebdef30c700139e78e1aef77298f3bda8f2b90c30987ed578beba939a153b540cff081c28a235963e20bb5fa38100c87e4e8daa7c707c921efc8a3980aba2
SHA512 (webkitgtk-2.39.91.tar.xz.asc) = 6d682c802684b2e38c7668c1d926ba1219991ec90f6d4aa7e5e8405a52340827ee1349583455ad35d279f140db23131809bbca18e2a5bb432940872bc14050ac

12
super-sampler.patch
View File

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

21
webkitgtk.spec
View File

@ -19,7 +19,7 @@
%bcond_without docs
Name: webkitgtk
Version: 2.39.90
Version: 2.39.91
Release: %autorelease
Summary: GTK web content engine library
@ -32,15 +32,10 @@ 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://github.com/WebKit/WebKit/pull/11221
# https://github.com/WebKit/WebKit/pull/11222
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
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: cmake
@ -434,10 +429,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 +473,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 +555,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