Upgrade to 2.40.0
This commit is contained in:
Michael Catanzaro
parent
1c16daccce
commit
5d2c1672bc
|
|
@ -14,3 +14,4 @@
|
|||
/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
|
||||
|
|
|
|||
|
|
@ -1,110 +0,0 @@
|
|||
From 53a8890833684fe813efd7b7a2b7417dbfa7b826 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Perez de Castro <aperez@igalia.com>
|
||||
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
|
||||
|
||||
Unreviewed build fix.
|
||||
|
||||
* 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/WebKitWebView.h.in | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in b/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in
|
||||
index cc60ef336afc..6f1afac40e2b 100644
|
||||
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in
|
||||
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in
|
||||
@@ -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 <@API_INCLUDE_PREFIX@/WebKitJavascriptResult.h>
|
||||
+#endif
|
||||
#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 !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;
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (webkitgtk-2.39.91.tar.xz) = e31ebdef30c700139e78e1aef77298f3bda8f2b90c30987ed578beba939a153b540cff081c28a235963e20bb5fa38100c87e4e8daa7c707c921efc8a3980aba2
|
||||
SHA512 (webkitgtk-2.39.91.tar.xz.asc) = 6d682c802684b2e38c7668c1d926ba1219991ec90f6d4aa7e5e8405a52340827ee1349583455ad35d279f140db23131809bbca18e2a5bb432940872bc14050ac
|
||||
SHA512 (webkitgtk-2.40.0.tar.xz) = 550dafb31d71edf984d6b7636366f839d31f6b244b87f83c6efe7af17efe3f2f63268d2c39a6a3c474afadf2b30df868efaefcf38197b30cc6b11c63de7d2ddc
|
||||
SHA512 (webkitgtk-2.40.0.tar.xz.asc) = 782887d27adad7791dd4dc8e070c9c10c711da70907bddf988b739d03c3e2f3d49f433e3afc325801cf42aebe9689110122d6145b69d9696bf8eef5ae525062c
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
%bcond_without docs
|
||||
|
||||
Name: webkitgtk
|
||||
Version: 2.39.91
|
||||
Version: 2.40.0
|
||||
Release: %autorelease
|
||||
Summary: GTK web content engine library
|
||||
|
||||
|
|
@ -32,10 +32,6 @@ 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/11221
|
||||
# https://github.com/WebKit/WebKit/pull/11222
|
||||
Patch0: fix-installed-headers.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: bubblewrap
|
||||
BuildRequires: cmake
|
||||
|
|
|
|||
Loading…
Reference in New Issue