diff --git a/0001-Remove-short-circuit-from-should_skip_page-to-fix-pa.patch b/0001-Remove-short-circuit-from-should_skip_page-to-fix-pa.patch deleted file mode 100644 index 5fb93ad..0000000 --- a/0001-Remove-short-circuit-from-should_skip_page-to-fix-pa.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4afa9dde74ea48f55032c98d1439f9ff633cae9a Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 12 Aug 2022 22:44:33 -0700 -Subject: [PATCH] Remove short circuit from should_skip_page to fix page - skipping - -For some reason, the GTK4 port (MR #134) introduced this short- -circuit to `should_skip_page` which means it will never return -TRUE and page skipping will never work. We (Fedora) rather want -page skipping to work so, er, let's put it back! - -Signed-off-by: Adam Williamson ---- - gnome-initial-setup/gnome-initial-setup.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c -index 81df2499..113ded36 100644 ---- a/gnome-initial-setup/gnome-initial-setup.c -+++ b/gnome-initial-setup/gnome-initial-setup.c -@@ -94,8 +94,6 @@ should_skip_page (const gchar *page_id, - if (strcmp (page_id, "welcome") == 0) - return !should_skip_page ("language", skip_pages); - -- return FALSE; -- - /* check through our skip pages list for pages we don't want */ - if (skip_pages) { - while (skip_pages[i]) { --- -2.37.1 - diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index b65bec4..76c755a 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -8,7 +8,7 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-initial-setup -Version: 43~beta +Version: 43~rc Release: %autorelease Summary: Bootstrapping your OS @@ -17,10 +17,6 @@ URL: https://wiki.gnome.org/Design/OS/InitialSetup Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz Source1: vendor.conf -# Fix page skipping -# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/156 -Patch0: 0001-Remove-short-circuit-from-should_skip_page-to-fix-pa.patch - BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: meson diff --git a/sources b/sources index 31bfd14..5fa41d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-initial-setup-43.beta.tar.xz) = f168001fc58d516d783750497d309eec4001635d476ee21359dcc1d14e1e900474bba870cf7a318505ae18deecf74357fdcb41e5d1cb4b3392da31ea70c7b90a +SHA512 (gnome-initial-setup-43.rc.tar.xz) = 8b58b0e1e3fe0f951421a5a1c48a1633866eb86d056b0164f8c8bbfa1fae8f167d4150db337a0e0de362e674160ebecc11131d39ac256100663e543e662aa38c