From d586927ef44a55af15284b6d68bf5d43479b0413c6c161bf64ae8a696c03aaed Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 28 Feb 2024 17:31:04 +0000 Subject: [PATCH] Accepting request 1152985 from GNOME:Next - Rebase accountsservice-sysconfig.patch: to fix build with GCC 14 (bsc#1219909). OBS-URL: https://build.opensuse.org/request/show/1152985 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=171 --- accountsservice-sysconfig.patch | 10 +++++----- accountsservice.changes | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/accountsservice-sysconfig.patch b/accountsservice-sysconfig.patch index 8c0b3c2..1a65ab3 100644 --- a/accountsservice-sysconfig.patch +++ b/accountsservice-sysconfig.patch @@ -74,7 +74,7 @@ Index: accountsservice-23.13.9/src/daemon.c gboolean result; g_autoptr (GError) local_error = NULL; -+ return load_autologin_suse (daemon, name, enabled, error); ++ return save_autologin_suse (daemon, name, enabled, error); + keyfile = g_key_file_new (); if (!g_key_file_load_from_file (keyfile, @@ -372,7 +372,7 @@ Index: accountsservice-23.13.9/src/gdm-sysconfig.c +} + +static gchar * -+get_value (const gchar **lines, const gchar *key) ++get_value (gchar **lines, const gchar *key) +{ + gchar *value = NULL; + gchar *key_normal; @@ -483,7 +483,7 @@ Index: accountsservice-23.13.9/src/gdm-sysconfig.c + g_return_val_if_fail (file_name != NULL, FALSE); + g_return_val_if_fail (sysconfig != NULL, FALSE); + -+ return save_settings_file (file_name, sysconfig); ++ return save_settings_file (file_name, (gchar **)sysconfig); +} + +gchar * @@ -492,7 +492,7 @@ Index: accountsservice-23.13.9/src/gdm-sysconfig.c + g_return_val_if_fail (sysconfig != NULL, NULL); + g_return_val_if_fail (key != NULL, NULL); + -+ return get_value (sysconfig, key); ++ return get_value ((gchar **)sysconfig, key); +} + +gboolean @@ -514,7 +514,7 @@ Index: accountsservice-23.13.9/src/gdm-sysconfig.c + g_return_val_if_fail (sysconfig != NULL, FALSE); + g_return_val_if_fail (key != NULL, FALSE); + -+ val = get_value (sysconfig, key); ++ val = get_value ((gchar **)sysconfig, key); + if (val == NULL) { + return FALSE; + } diff --git a/accountsservice.changes b/accountsservice.changes index 26c268c..7499f02 100644 --- a/accountsservice.changes +++ b/accountsservice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 27 06:23:31 UTC 2024 - xiaoguang wang + +- Rebase accountsservice-sysconfig.patch: to fix build with GCC 14 + (bsc#1219909). + ------------------------------------------------------------------- Wed Feb 14 10:39:36 UTC 2024 - Dominique Leuenberger