From d8d686beec687cbabaac62ad5ef6e98129bcffd4 Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 15 Feb 2023 21:30:46 +0000 Subject: [PATCH] Update to 44.beta --- gnome-initial-setup.spec | 9 +++------ sources | 2 +- webkitgtk-2.39.5.patch | 28 ---------------------------- 3 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 webkitgtk-2.39.5.patch diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 997fc88..bad7806 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -7,18 +7,15 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-initial-setup -Version: 44~alpha.2 +Version: 44~beta Release: %autorelease Summary: Bootstrapping your OS -License: GPLv2+ +License: GPL-2.0-or-later URL: https://wiki.gnome.org/Design/OS/InitialSetup -Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/44/%{name}-%{tarball_version}.tar.xz Source1: vendor.conf -# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/177 -Patch0: webkitgtk-2.39.5.patch - BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: meson diff --git a/sources b/sources index 5ba2a71..a3fb989 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-initial-setup-44.alpha.2.tar.xz) = f44ddca48820a3efd5450e04a8939ca5bae46ca93f182914b46cb59702f4bac1f1d523a18d12a47084fd9ba58795c5122bac3ccb400c85d1e34c0e559377a2c6 +SHA512 (gnome-initial-setup-44.beta.tar.xz) = 60e9ecf55ffa8304fc1c8463773606c06fb5226681ee9d72fe03e4605fb35874607581f5f39ba3f4540f8d078eed57303a063bba1892e9115c8ae52ac924313a diff --git a/webkitgtk-2.39.5.patch b/webkitgtk-2.39.5.patch deleted file mode 100644 index 866ef7f..0000000 --- a/webkitgtk-2.39.5.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 -