diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 1948e76..997fc88 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -7,7 +7,7 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-initial-setup -Version: 43.1 +Version: 44~alpha.2 Release: %autorelease Summary: Bootstrapping your OS @@ -16,11 +16,8 @@ URL: https://wiki.gnome.org/Design/OS/InitialSetup Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz 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 +Patch0: webkitgtk-2.39.5.patch BuildRequires: desktop-file-utils BuildRequires: gcc diff --git a/sources b/sources index 6f9b38c..5ba2a71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-initial-setup-43.1.tar.xz) = e48a8bcae80d515e6fd43d1d6715a022df8a732b5431a8c2a37a1a4dca156e32e23d00040a3b0416501f02a6cd5bd08be80b7a46b03515c88b34a08605aa63a2 +SHA512 (gnome-initial-setup-44.alpha.2.tar.xz) = f44ddca48820a3efd5450e04a8939ca5bae46ca93f182914b46cb59702f4bac1f1d523a18d12a47084fd9ba58795c5122bac3ccb400c85d1e34c0e559377a2c6 diff --git a/webkitgtk-6.0.patch b/webkitgtk-6.0.patch deleted file mode 100644 index 517934d..0000000 --- a/webkitgtk-6.0.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 716516f82f975016a4ec025e6f09cbc996564365 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 5 Dec 2022 12:21:26 -0600 -Subject: [PATCH] Build against webkitgtk-6.0 - ---- - gnome-initial-setup/gis-driver.c | 2 +- - gnome-initial-setup/meson.build | 2 +- - gnome-initial-setup/pages/privacy/gis-privacy-page.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c -index 1fbf636c..e6835a5f 100644 ---- a/gnome-initial-setup/gis-driver.c -+++ b/gnome-initial-setup/gis-driver.c -@@ -26,7 +26,7 @@ - #include - #include - #include --#include -+#include - - #include "cc-common-language.h" - #include "gis-assistant.h" -diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build -index 3127803c..ce098298 100644 ---- a/gnome-initial-setup/meson.build -+++ b/gnome-initial-setup/meson.build -@@ -63,7 +63,7 @@ dependencies = [ - dependency ('libsecret-1', version: '>= 0.18.8'), - dependency ('pwquality'), - dependency ('rest-1.0'), -- dependency ('webkit2gtk-5.0'), -+ dependency ('webkitgtk-6.0'), - ibus_dep, - libmalcontent_dep, - libmalcontent_ui_dep, -diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.c b/gnome-initial-setup/pages/privacy/gis-privacy-page.c -index 40cfd882..eff481f7 100644 ---- a/gnome-initial-setup/pages/privacy/gis-privacy-page.c -+++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.c -@@ -27,7 +27,7 @@ - #include "privacy-resources.h" - #include "gis-privacy-page.h" - --#include -+#include - - #include - #include --- -2.38.1 -