From c4ed3119572e0d6e7a43aa175d400f72a0bdd426 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Sat, 21 Jan 2023 10:27:21 -0600 Subject: [PATCH] Build for WebKitGTK 2.39.5 --- evolution-data-server.spec | 8 +++++++- webkitgtk-2.39.5.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.39.5.patch diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 835fe44..a2fca0f 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -58,12 +58,15 @@ Name: evolution-data-server Version: 3.47.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Backend data server for Evolution License: LGPL-2.0-or-later URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.47/%{name}-%{version}.tar.xz +# https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/112 +Patch0: webkitgtk-2.39.5.patch + Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 @@ -488,6 +491,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{_datadir}/installed-tests %changelog +* Fri Jan 20 2023 Michael Catanzaro - 3.47.1-3 +- Build against WebKitGTK 2.39.5 + * Thu Jan 19 2023 Fedora Release Engineering - 3.47.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/webkitgtk-2.39.5.patch b/webkitgtk-2.39.5.patch new file mode 100644 index 0000000..ab30377 --- /dev/null +++ b/webkitgtk-2.39.5.patch @@ -0,0 +1,28 @@ +From 6f4d38537ec2192d7066a7ba145ca7ab0f607e56 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Thu, 19 Jan 2023 20:12:04 -0600 +Subject: [PATCH] M!112 - Update for removal of WebKitGTK sandbox API + +WebKitGTK 2.39.5 contains an ABI break. The sandbox is now mandatory, so +the function to enable/disable it has been removed. +--- + src/libedataserverui/e-credentials-prompter-impl-oauth2.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c +index 099a8f20c..0e5fb582f 100644 +--- a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c ++++ b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c +@@ -1149,7 +1149,9 @@ e_credentials_prompter_impl_oauth2_show_dialog (ECredentialsPrompterImplOAuth2 * + NULL); + + web_context = webkit_web_context_new (); ++#if !GTK_CHECK_VERSION(4, 0, 0) || !WEBKIT_CHECK_VERSION(2, 39, 5) + webkit_web_context_set_sandbox_enabled (web_context, TRUE); ++#endif + credentials_prompter_impl_oauth2_set_proxy (web_context, e_credentials_prompter_get_registry (prompter), prompter_oauth2->priv->auth_source); + + widget = g_object_new (WEBKIT_TYPE_WEB_VIEW, +-- +GitLab +