From cc62fc79d6f8efb16acd47392dd313dda794f033 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Sat, 21 Jan 2023 10:27:37 -0600 Subject: [PATCH] Build for WebKitGTK 2.39.5 --- gnome-initial-setup.spec | 2 ++ webkitgtk-2.39.5.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 webkitgtk-2.39.5.patch diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 95a7431..1948e76 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -18,7 +18,9 @@ Source1: vendor.conf # https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/164 # https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/165 +# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/177 Patch0: webkitgtk-6.0.patch +Patch1: webkitgtk-2.39.5.patch BuildRequires: desktop-file-utils BuildRequires: gcc diff --git a/webkitgtk-2.39.5.patch b/webkitgtk-2.39.5.patch new file mode 100644 index 0000000..866ef7f --- /dev/null +++ b/webkitgtk-2.39.5.patch @@ -0,0 +1,28 @@ +From 1a8f9ecfceb2e3106910b7bf7987f0fc75886670 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Thu, 19 Jan 2023 20:07:40 -0600 +Subject: [PATCH] Update for removal of WebKitGTK sandbox API + +WebKitGTK 2.39.5 contains an ABI break. The sandbox is now mandatory, so +the API to enable/disable it is gone. +--- + gnome-initial-setup/gis-driver.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c +index 1ddf3c6a..3d48629e 100644 +--- a/gnome-initial-setup/gis-driver.c ++++ b/gnome-initial-setup/gis-driver.c +@@ -788,7 +788,9 @@ gis_driver_startup (GApplication *app) + + G_APPLICATION_CLASS (gis_driver_parent_class)->startup (app); + ++#if !WEBKIT_CHECK_VERSION(2, 39, 5) + webkit_web_context_set_sandbox_enabled (context, TRUE); ++#endif + + if (driver->mode == GIS_DRIVER_MODE_NEW_USER) + connect_to_gdm (driver); +-- +GitLab +