Backport MR#156 to fix page skipping

0001-Remove-short-circuit-from-should_skip_page-to-fix-pa.patch

@@ -0,0 +1,32 @@
+From 4afa9dde74ea48f55032c98d1439f9ff633cae9a Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+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 <awilliam@redhat.com>
+---
+ 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
+

gnome-initial-setup.spec

@@ -17,6 +17,10 @@ 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