rpms/gnome-initial-setup
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust downstream patch

Browse Source 
Related: RHEL-71384
This commit is contained in:
Florian Müllner 2024-02-15 18:17:26 +01:00 committed by Michael Catanzaro
parent 7716c742d1
commit 0733ff3e76
1 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
live-user-mode.patch
View File

@ -1,4 +1,4 @@
From 575edeab57c891a7053279c676e82bebe53222d3 Mon Sep 17 00:00:00 2001 From 077f37d18154f9bf08f5c42bd86dbe8645bc5d14 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Tue, 15 Aug 2023 10:53:41 -0400 Date: Tue, 15 Aug 2023 10:53:41 -0400
Subject: [PATCH 01/16] gnome-initial-setup: Bump GLib required version to 2.76 Subject: [PATCH 01/16] gnome-initial-setup: Bump GLib required version to 2.76
@ -10,10 +10,10 @@ This gives us GStrvBuilder, g_ptr_array_sort_values, etc
2 files changed, 3 insertions(+), 3 deletions(-) 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index beb96ecd..32b3fe46 100644 index 2ae2671c..84b3188e 100644
--- a/gnome-initial-setup/meson.build --- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build +++ b/gnome-initial-setup/meson.build
@@ -51,7 +51,7 @@ dependencies = [ @@ -42,7 +42,7 @@ dependencies = [
dependency ('gsettings-desktop-schemas', version: '>= 3.37.1'), dependency ('gsettings-desktop-schemas', version: '>= 3.37.1'),
dependency ('fontconfig'), dependency ('fontconfig'),
dependency ('gtk4', version: '>= 4.6'), dependency ('gtk4', version: '>= 4.6'),
@ -23,7 +23,7 @@ index beb96ecd..32b3fe46 100644
dependency ('gdm', version: '>= 3.8.3'), dependency ('gdm', version: '>= 3.8.3'),
gweather_dep, gweather_dep,
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 5d30fcd1..00e24d7b 100644 index 51709d9b..621caa37 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -30,8 +30,8 @@ conf.set_quoted('LIBEXECDIR', libexec_dir) @@ -30,8 +30,8 @@ conf.set_quoted('LIBEXECDIR', libexec_dir)
@ -38,10 +38,10 @@ index 5d30fcd1..00e24d7b 100644
enable_systemd = get_option('systemd') enable_systemd = get_option('systemd')
if enable_systemd if enable_systemd
-- --
2.43.0 2.43.1
From 60a2db34bd50d561e716a63dd526ee7ff4810a29 Mon Sep 17 00:00:00 2001 From 6fd00ad841793c79478c444ec5617d828f0efcc8 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sat, 9 Sep 2023 17:07:46 -0400 Date: Sat, 9 Sep 2023 17:07:46 -0400
Subject: [PATCH 02/16] keyboard: Don't require localed for existing user mode Subject: [PATCH 02/16] keyboard: Don't require localed for existing user mode
@ -76,10 +76,10 @@ index fa41230f..da384495 100644
} }
-- --
2.43.0 2.43.1
From 1478cce3663bfa276066c073be3bbb65bc4b1785 Mon Sep 17 00:00:00 2001 From 453955347a537edfbe8424bffb05d3d6d9595b9c Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Fri, 8 Sep 2023 11:02:39 -0400 Date: Fri, 8 Sep 2023 11:02:39 -0400
Subject: [PATCH 03/16] language: Don't proceed until localed has set locale Subject: [PATCH 03/16] language: Don't proceed until localed has set locale
@ -165,10 +165,10 @@ index 87b9f2d8..26a01257 100644
} }
-- --
2.43.0 2.43.1
From e8d5b6a4c1ee9bfb3f8ed7dbe5f25053fae7a1ae Mon Sep 17 00:00:00 2001 From 95f243137ec9f7a6835e7f1fd8d30d3ec42aae7b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Thu, 24 Aug 2023 21:19:40 -0400 Date: Thu, 24 Aug 2023 21:19:40 -0400
Subject: [PATCH 04/16] keyboard: Get default input sources from gnome-desktop Subject: [PATCH 04/16] keyboard: Get default input sources from gnome-desktop
@ -190,7 +190,7 @@ counterpart.
1 file changed, 239 insertions(+), 236 deletions(-) 1 file changed, 239 insertions(+), 236 deletions(-)
diff --git a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c diff --git a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
index da384495..f2bfe164 100644 index da384495..ea9b9f35 100644
--- a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c --- a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+++ b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c +++ b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
@@ -44,6 +44,8 @@ @@ -44,6 +44,8 @@
@ -745,7 +745,7 @@ index da384495..f2bfe164 100644
+ g_auto (GStrv) types = NULL; + g_auto (GStrv) types = NULL;
+ g_auto (GStrv) options = NULL; + g_auto (GStrv) options = NULL;
+ +
+ success = gnome_get_default_input_sources_finish (res, &ids, &types, &options, &error); + success = gnome_get_default_input_sources_finish (res, &ids, &types, &options, NULL, &error);
+ +
+ if (!success) { + if (!success) {
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
@ -779,10 +779,10 @@ index da384495..f2bfe164 100644
if (gis_driver_get_mode (GIS_PAGE (self)->driver) == GIS_DRIVER_MODE_NEW_USER) if (gis_driver_get_mode (GIS_PAGE (self)->driver) == GIS_DRIVER_MODE_NEW_USER)
priv->permission = polkit_permission_new_sync ("org.freedesktop.locale1.set-keyboard", NULL, NULL, NULL); priv->permission = polkit_permission_new_sync ("org.freedesktop.locale1.set-keyboard", NULL, NULL, NULL);
-- --
2.43.0 2.43.1
From 7b83c89d8b2fe2f9de5f7f364a7af5f2f4fcc605 Mon Sep 17 00:00:00 2001 From ba2a1447a6d688492d19ade119de911e0fd3eb92 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sun, 13 Aug 2023 09:09:56 -0400 Date: Sun, 13 Aug 2023 09:09:56 -0400
Subject: [PATCH 05/16] driver: Specify mode via flags instead of boolean Subject: [PATCH 05/16] driver: Specify mode via flags instead of boolean
@ -801,7 +801,7 @@ two modes, so this commit changes it use bit flags instead.
3 files changed, 92 insertions(+), 59 deletions(-) 3 files changed, 92 insertions(+), 59 deletions(-)
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index 0b3f542f..4325b631 100644 index 91c7a8b3..39b933d0 100644
--- a/gnome-initial-setup/gis-driver.c --- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c +++ b/gnome-initial-setup/gis-driver.c
@@ -30,8 +30,6 @@ @@ -30,8 +30,6 @@
@ -829,7 +829,7 @@ index 0b3f542f..4325b631 100644
} }
return enum_type_id; return enum_type_id;
} }
@@ -645,7 +644,7 @@ gis_driver_set_property (GObject *object, @@ -686,7 +685,7 @@ gis_driver_set_property (GObject *object,
switch ((GisDriverProperty) prop_id) switch ((GisDriverProperty) prop_id)
{ {
case PROP_MODE: case PROP_MODE:
@ -838,7 +838,7 @@ index 0b3f542f..4325b631 100644
break; break;
case PROP_USERNAME: case PROP_USERNAME:
g_free (driver->username); g_free (driver->username);
@@ -853,10 +852,10 @@ gis_driver_class_init (GisDriverClass *klass) @@ -901,10 +900,10 @@ gis_driver_class_init (GisDriverClass *klass)
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
obj_props[PROP_MODE] = obj_props[PROP_MODE] =
@ -854,7 +854,7 @@ index 0b3f542f..4325b631 100644
obj_props[PROP_USERNAME] = obj_props[PROP_USERNAME] =
g_param_spec_string ("username", "", "", g_param_spec_string ("username", "", "",
diff --git a/gnome-initial-setup/gis-driver.h b/gnome-initial-setup/gis-driver.h diff --git a/gnome-initial-setup/gis-driver.h b/gnome-initial-setup/gis-driver.h
index 9b935e24..b57db2e2 100644 index ca06391f..36bfa2dd 100644
--- a/gnome-initial-setup/gis-driver.h --- a/gnome-initial-setup/gis-driver.h
+++ b/gnome-initial-setup/gis-driver.h +++ b/gnome-initial-setup/gis-driver.h
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
@ -1069,10 +1069,10 @@ index adb04075..a079c705 100644
skipped = TRUE; skipped = TRUE;
-- --
2.43.0 2.43.1
From 68391446ee06083a06899cdadb09ca90b4b40af3 Mon Sep 17 00:00:00 2001 From 2b9f796fe3af5bdb1464d0a79b88641d0e3c817f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Wed, 30 Aug 2023 15:08:23 -0400 Date: Wed, 30 Aug 2023 15:08:23 -0400
Subject: [PATCH 06/16] assistant: Show Back button on summary page Subject: [PATCH 06/16] assistant: Show Back button on summary page
@ -1154,7 +1154,7 @@ index a3122b71..8a7fc52b 100644
{ {
if (!gis_page_save_data (l->data, error)) if (!gis_page_save_data (l->data, error))
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 0aee2dad..8a526b64 100644 index d3bb7999..9eaf90dd 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c --- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c +++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -180,6 +180,15 @@ log_user_in (GisSummaryPage *page) @@ -180,6 +180,15 @@ log_user_in (GisSummaryPage *page)
@ -1188,10 +1188,10 @@ index 0aee2dad..8a526b64 100644
&priv->user_account, &priv->user_account,
&priv->user_password); &priv->user_password);
-- --
2.43.0 2.43.1
From f1e4b58ced27b028e13dd9bb29794419dc08fb72 Mon Sep 17 00:00:00 2001 From f1c9c84a05c22ac7c48bc2ec4ab274a6f218a17a Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sun, 13 Aug 2023 09:39:07 -0400 Date: Sun, 13 Aug 2023 09:39:07 -0400
Subject: [PATCH 07/16] gnome-initial-setup: Add live user mode Subject: [PATCH 07/16] gnome-initial-setup: Add live user mode
@ -1243,7 +1243,7 @@ index 02fd21d0..881efde9 100644
if (actionMatches) { if (actionMatches) {
if (subject.local) if (subject.local)
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index 4325b631..6a4727cc 100644 index 39b933d0..344b1497 100644
--- a/gnome-initial-setup/gis-driver.c --- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c +++ b/gnome-initial-setup/gis-driver.c
@@ -40,6 +40,8 @@ gis_driver_mode_get_type (void) { @@ -40,6 +40,8 @@ gis_driver_mode_get_type (void) {
@ -1255,7 +1255,7 @@ index 4325b631..6a4727cc 100644
{ GIS_DRIVER_MODE_ALL, "GIS_DRIVER_MODE_ALL", "all" }, { GIS_DRIVER_MODE_ALL, "GIS_DRIVER_MODE_ALL", "all" },
{ 0, NULL, NULL } { 0, NULL, NULL }
}; };
@@ -786,7 +788,7 @@ gis_driver_startup (GApplication *app) @@ -830,7 +832,7 @@ gis_driver_startup (GApplication *app)
G_APPLICATION_CLASS (gis_driver_parent_class)->startup (app); G_APPLICATION_CLASS (gis_driver_parent_class)->startup (app);
@ -1265,7 +1265,7 @@ index 4325b631..6a4727cc 100644
driver->main_window = g_object_new (GTK_TYPE_APPLICATION_WINDOW, driver->main_window = g_object_new (GTK_TYPE_APPLICATION_WINDOW,
diff --git a/gnome-initial-setup/gis-driver.h b/gnome-initial-setup/gis-driver.h diff --git a/gnome-initial-setup/gis-driver.h b/gnome-initial-setup/gis-driver.h
index b57db2e2..aedb9a73 100644 index 36bfa2dd..d4b42b10 100644
--- a/gnome-initial-setup/gis-driver.h --- a/gnome-initial-setup/gis-driver.h
+++ b/gnome-initial-setup/gis-driver.h +++ b/gnome-initial-setup/gis-driver.h
@@ -44,7 +44,9 @@ typedef enum { @@ -44,7 +44,9 @@ typedef enum {
@ -2095,7 +2095,7 @@ index 00000000..e5084e5e
+ 'gis-install-page.h' + 'gis-install-page.h'
+) +)
diff --git a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c diff --git a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
index f2bfe164..7801667c 100644 index ea9b9f35..debcd146 100644
--- a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c --- a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+++ b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c +++ b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
@@ -187,7 +187,7 @@ set_input_settings (GisKeyboardPage *self, @@ -187,7 +187,7 @@ set_input_settings (GisKeyboardPage *self,
@ -2178,10 +2178,10 @@ index 8d327f69..ff8406ba 100644
'keyboard', 'keyboard',
'network', 'network',
diff --git a/gnome-initial-setup/pages/password/gis-password-page.c b/gnome-initial-setup/pages/password/gis-password-page.c diff --git a/gnome-initial-setup/pages/password/gis-password-page.c b/gnome-initial-setup/pages/password/gis-password-page.c
index 6c12ca38..3d648c48 100644 index 9a41b50f..a466316d 100644
--- a/gnome-initial-setup/pages/password/gis-password-page.c --- a/gnome-initial-setup/pages/password/gis-password-page.c
+++ b/gnome-initial-setup/pages/password/gis-password-page.c +++ b/gnome-initial-setup/pages/password/gis-password-page.c
@@ -491,6 +491,12 @@ gis_password_page_init (GisPasswordPage *page) @@ -507,6 +507,12 @@ gis_password_page_init (GisPasswordPage *page)
GisPage * GisPage *
gis_prepare_password_page (GisDriver *driver) gis_prepare_password_page (GisDriver *driver)
{ {
@ -2195,10 +2195,10 @@ index 6c12ca38..3d648c48 100644
"driver", driver, "driver", driver,
NULL); NULL);
-- --
2.43.0 2.43.1
From 3f15601af333aeddb8e4458e69f81023a8184a8f Mon Sep 17 00:00:00 2001 From e7a35cc69fdc786c34749181babf1edb6ed363aa Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Wed, 16 Aug 2023 10:47:13 -0400 Date: Wed, 16 Aug 2023 10:47:13 -0400
Subject: [PATCH 08/16] initial-setup: Don't show duplicated pages between Subject: [PATCH 08/16] initial-setup: Don't show duplicated pages between
@ -2231,10 +2231,10 @@ index 6a4ef7df..0bfccf56 100644
+ strip_directory : true + strip_directory : true
+) +)
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index 6a4727cc..78265527 100644 index 344b1497..4022cf97 100644
--- a/gnome-initial-setup/gis-driver.c --- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c +++ b/gnome-initial-setup/gis-driver.c
@@ -101,6 +101,8 @@ struct _GisDriver { @@ -103,6 +103,8 @@ struct _GisDriver {
const gchar *vendor_conf_file_path; const gchar *vendor_conf_file_path;
GKeyFile *vendor_conf_file; GKeyFile *vendor_conf_file;
@ -2243,7 +2243,7 @@ index 6a4727cc..78265527 100644
}; };
G_DEFINE_TYPE (GisDriver, gis_driver, ADW_TYPE_APPLICATION) G_DEFINE_TYPE (GisDriver, gis_driver, ADW_TYPE_APPLICATION)
@@ -131,6 +133,7 @@ gis_driver_finalize (GObject *object) @@ -133,6 +135,7 @@ gis_driver_finalize (GObject *object)
g_clear_object (&driver->user_account); g_clear_object (&driver->user_account);
g_clear_pointer (&driver->vendor_conf_file, g_key_file_free); g_clear_pointer (&driver->vendor_conf_file, g_key_file_free);
@ -2356,7 +2356,7 @@ index 02ca2808..4e2aa5af 100644
/** /**
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 00e24d7b..95fe8e51 100644 index 621caa37..d3f897ac 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -14,19 +14,23 @@ po_dir = join_paths(meson.current_source_dir(), 'po') @@ -14,19 +14,23 @@ po_dir = join_paths(meson.current_source_dir(), 'po')
@ -2384,10 +2384,10 @@ index 00e24d7b..95fe8e51 100644
conf.set_quoted('G_LOG_DOMAIN', 'InitialSetup') conf.set_quoted('G_LOG_DOMAIN', 'InitialSetup')
conf.set('G_LOG_USE_STRUCTURED', true) conf.set('G_LOG_USE_STRUCTURED', true)
-- --
2.43.0 2.43.1
From 935b2cca6dd7e3ce31e2540d90e5864190885d81 Mon Sep 17 00:00:00 2001 From d3804a7d34918ccd30d77e1bf51240136dafaf95 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sun, 13 Aug 2023 16:33:49 -0400 Date: Sun, 13 Aug 2023 16:33:49 -0400
Subject: [PATCH 09/16] polkit: Add fedora specfic rules Subject: [PATCH 09/16] polkit: Add fedora specfic rules
@ -2413,10 +2413,10 @@ index 881efde9..f5b7d981 100644
if (actionMatches) { if (actionMatches) {
if (subject.local) if (subject.local)
-- --
2.43.0 2.43.1
From 03073bd42bf01f5d051f299860be40afd1844447 Mon Sep 17 00:00:00 2001 From 3b96f5f891aca2ddeb82ad69c9d2d8a19a52ea7f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Tue, 22 Aug 2023 13:51:40 -0400 Date: Tue, 22 Aug 2023 13:51:40 -0400
Subject: [PATCH 10/16] gnome-initial-setup: Read /etc/sysconfig/anaconda Subject: [PATCH 10/16] gnome-initial-setup: Read /etc/sysconfig/anaconda
@ -2472,10 +2472,10 @@ index 4e2aa5af..2de3ecab 100644
return g_strv_builder_end (builder); return g_strv_builder_end (builder);
-- --
2.43.0 2.43.1
From baaa29d56bbb91f3ad15f90e3db98eea446b9adb Mon Sep 17 00:00:00 2001 From 0e006f41db4bc7bd6d304176eec1eebf2b084dc2 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com> From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Wed, 17 Jan 2024 12:29:54 -0600 Date: Wed, 17 Jan 2024 12:29:54 -0600
Subject: [PATCH 11/16] Fix criticals in set_localed_input() Subject: [PATCH 11/16] Fix criticals in set_localed_input()
@ -2490,7 +2490,7 @@ Fixes: (gnome-initial-setup:41149): GLib-CRITICAL **: 10:09:25.599: g_strjoinv:
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c diff --git a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
index 7801667c..3b59a0bf 100644 index debcd146..fa4c0ea9 100644
--- a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c --- a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+++ b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c +++ b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
@@ -253,12 +253,12 @@ set_localed_input (GisKeyboardPage *self) @@ -253,12 +253,12 @@ set_localed_input (GisKeyboardPage *self)
@ -2509,10 +2509,10 @@ index 7801667c..3b59a0bf 100644
g_dbus_proxy_call (priv->localed, g_dbus_proxy_call (priv->localed,
"SetX11Keyboard", "SetX11Keyboard",
-- --
2.43.0 2.43.1
From b46a3d7e6df08030680c2e7aaa6408c28315e75f Mon Sep 17 00:00:00 2001 From 5999a7e62a4669532cddc8566ffdb356e0070540 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com> From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Fri, 19 Jan 2024 15:49:15 -0600 Date: Fri, 19 Jan 2024 15:49:15 -0600
Subject: [PATCH 12/16] assistant: assert next page exists when switching to Subject: [PATCH 12/16] assistant: assert next page exists when switching to
@ -2540,10 +2540,10 @@ index 8a7fc52b..c1af2943 100644
static void static void
-- --
2.43.0 2.43.1
From deecf58106544ac8603575cb80e79ddfa1b822ba Mon Sep 17 00:00:00 2001 From c1a3412dac66b2650eb89564a68cf56930232f2e Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com> From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Fri, 19 Jan 2024 15:50:33 -0600 Date: Fri, 19 Jan 2024 15:50:33 -0600
Subject: [PATCH 13/16] summary: don't crash if there is no user account to Subject: [PATCH 13/16] summary: don't crash if there is no user account to
@ -2554,7 +2554,7 @@ Subject: [PATCH 13/16] summary: don't crash if there is no user account to
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 8a526b64..8c005640 100644 index 9eaf90dd..f359673f 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c --- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c +++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -151,6 +151,11 @@ log_user_in (GisSummaryPage *page) @@ -151,6 +151,11 @@ log_user_in (GisSummaryPage *page)
@ -2570,10 +2570,10 @@ index 8a526b64..8c005640 100644
G_CALLBACK (on_info), page); G_CALLBACK (on_info), page);
g_signal_connect (user_verifier, "problem", g_signal_connect (user_verifier, "problem",
-- --
2.43.0 2.43.1
From b3e54dbaa09e944e537050c7393cd69e44488384 Mon Sep 17 00:00:00 2001 From 2db841a41b0e67faf9eaf5a2eee950135040adee Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com> From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Fri, 19 Jan 2024 15:52:03 -0600 Date: Fri, 19 Jan 2024 15:52:03 -0600
Subject: [PATCH 14/16] Don't show warnings when failing to connect to gdm Subject: [PATCH 14/16] Don't show warnings when failing to connect to gdm
@ -2587,10 +2587,10 @@ needed when debugging, but a warning is overkill.
3 files changed, 4 insertions(+), 3 deletions(-) 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index 78265527..653ba56b 100644 index 4022cf97..ef0e2860 100644
--- a/gnome-initial-setup/gis-driver.c --- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c +++ b/gnome-initial-setup/gis-driver.c
@@ -777,7 +777,8 @@ connect_to_gdm (GisDriver *driver) @@ -821,7 +821,8 @@ connect_to_gdm (GisDriver *driver)
driver->user_verifier = gdm_client_get_user_verifier_sync (driver->client, NULL, &error); driver->user_verifier = gdm_client_get_user_verifier_sync (driver->client, NULL, &error);
if (error != NULL) { if (error != NULL) {
@ -2614,7 +2614,7 @@ index 36ed7539..850c8241 100644
} }
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 8c005640..1352cb41 100644 index f359673f..367c5285 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c --- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c +++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -147,7 +147,7 @@ log_user_in (GisSummaryPage *page) @@ -147,7 +147,7 @@ log_user_in (GisSummaryPage *page)
@ -2627,10 +2627,10 @@ index 8c005640..1352cb41 100644
} }
-- --
2.43.0 2.43.1
From fa8caf710c38c41fc17f6dacc1c964a849e4c6e1 Mon Sep 17 00:00:00 2001 From 0545991114c8fdffac92356aaa39d82561e3a994 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com> From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Fri, 19 Jan 2024 15:58:09 -0600 Date: Fri, 19 Jan 2024 15:58:09 -0600
Subject: [PATCH 15/16] Never skip the summary page if available Subject: [PATCH 15/16] Never skip the summary page if available
@ -2663,10 +2663,10 @@ index 2de3ecab..54bca86f 100644
if (skip_pages) { if (skip_pages) {
while (skip_pages[i]) { while (skip_pages[i]) {
-- --
2.43.0 2.43.1
From b4e51c75dce43fb8095909278122c96a32b7a62d Mon Sep 17 00:00:00 2001 From c56d26dde6fcff40a5522d07dbf686b34e2d7864 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com> From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Mon, 22 Jan 2024 14:07:15 -0600 Date: Mon, 22 Jan 2024 14:07:15 -0600
Subject: [PATCH 16/16] Fix failure to log into user account Subject: [PATCH 16/16] Fix failure to log into user account
@ -2771,7 +2771,7 @@ index 850c8241..be4d6968 100644
static void static void
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 1352cb41..1fc14556 100644 index 367c5285..37881442 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c --- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c +++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -40,9 +40,7 @@ @@ -40,9 +40,7 @@
@ -2866,5 +2866,5 @@ index 1352cb41..1fc14556 100644
static void static void
-- --
2.43.0 2.43.1