diff --git a/accountsservice-22.08.8-kylin-add-background-file-support.patch b/accountsservice-22.08.8-kylin-add-background-file-support.patch index 54db853..1e51ee8 100644 --- a/accountsservice-22.08.8-kylin-add-background-file-support.patch +++ b/accountsservice-22.08.8-kylin-add-background-file-support.patch @@ -4,17 +4,17 @@ Date: Mon, 18 Sep 2023 10:29:43 +0800 Subject: [PATCH] add-background-file-support --- - data/org.freedesktop.Accounts.User.xml | 45 +++++++++++++++ - src/libaccountsservice/act-user.c | 57 ++++++++++++++++++ + data/org.freedesktop.Accounts.User.xml | 46 +++++++++++++++ + src/libaccountsservice/act-user.c | 57 +++++++++++++++++++ src/libaccountsservice/act-user.h | 3 + - src/user.c | 80 ++++++++++++++++++++++++++ + src/user.c | 79 ++++++++++++++++++++++++++ 4 files changed, 185 insertions(+) diff --git a/data/org.freedesktop.Accounts.User.xml b/data/org.freedesktop.Accounts.User.xml -index ac5f4bb..f0bfa73 100644 +index d54ba44..7a8a915 100644 --- a/data/org.freedesktop.Accounts.User.xml +++ b/data/org.freedesktop.Accounts.User.xml -@@ -379,6 +379,41 @@ +@@ -420,6 +420,42 @@ @@ -52,11 +52,12 @@ index ac5f4bb..f0bfa73 100644 + + + ++ + -@@ -842,6 +877,16 @@ +@@ -893,6 +929,16 @@ @@ -74,21 +75,21 @@ index ac5f4bb..f0bfa73 100644 diff --git a/src/libaccountsservice/act-user.c b/src/libaccountsservice/act-user.c -index 01dd210..3163361 100644 +index 77b7b2f..9125d43 100644 --- a/src/libaccountsservice/act-user.c +++ b/src/libaccountsservice/act-user.c -@@ -89,6 +89,7 @@ enum { +@@ -90,6 +90,7 @@ enum PROP_LOGIN_FREQUENCY, PROP_LOGIN_TIME, PROP_LOGIN_HISTORY, -+ PROP_BACKGROUND_FILE, ++ PROP_BACKGROUND_FILE, PROP_ICON_FILE, PROP_LANGUAGE, PROP_X_SESSION, -@@ -366,6 +367,13 @@ act_user_class_init (ActUserClass *class) - G_VARIANT_TYPE ("a(xxa{sv})"), - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); +@@ -272,6 +273,13 @@ act_user_class_init (ActUserClass *class) + "The real name to display for this user.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, + PROP_BACKGROUND_FILE, + g_param_spec_string ("background-file", @@ -96,10 +97,10 @@ index 01dd210..3163361 100644 + "The path to a background for this user.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, - PROP_ICON_FILE, - g_param_spec_string ("icon-file", -@@ -998,6 +1006,25 @@ act_user_is_nonexistent (ActUser *user) + PROP_ACCOUNT_TYPE, +@@ -998,6 +1006,25 @@ act_user_is_nonexistent (ActUser *user) return user->nonexistent; } @@ -125,7 +126,15 @@ index 01dd210..3163361 100644 /** * act_user_get_icon_file: * @user: a #ActUser -@@ -1452,6 +1479,36 @@ act_user_set_language (ActUser *user, +@@ -1474,6 +1501,7 @@ act_user_set_language (ActUser *user, + } + } + ++ + /** + * act_user_set_languages: + * @user: the user object to alter. +@@ -1509,6 +1537,35 @@ act_user_set_languages (ActUser *user, } } @@ -158,59 +167,57 @@ index 01dd210..3163361 100644 + return; + } +} -+ /** * act_user_set_x_session: * @user: the user object to alter. diff --git a/src/libaccountsservice/act-user.h b/src/libaccountsservice/act-user.h -index b1fdd0d..dfcc5f9 100644 +index fe9a8a4..82019f5 100644 --- a/src/libaccountsservice/act-user.h +++ b/src/libaccountsservice/act-user.h -@@ -70,6 +70,7 @@ gboolean act_user_get_automatic_login (ActUser *user); - gboolean act_user_is_system_account (ActUser *user); - gboolean act_user_is_local_account (ActUser *user); - gboolean act_user_is_nonexistent (ActUser *user); +@@ -69,6 +69,7 @@ gboolean act_user_get_automatic_login (ActUser *user); + gboolean act_user_is_system_account (ActUser *user); + gboolean act_user_is_local_account (ActUser *user); + gboolean act_user_is_nonexistent (ActUser *user); +const char *act_user_get_background_file (ActUser *user); - const char *act_user_get_icon_file (ActUser *user); - const char *act_user_get_language (ActUser *user); - const char *act_user_get_x_session (ActUser *user); -@@ -102,6 +103,8 @@ void act_user_set_email (ActUser *user, - const char *email); - void act_user_set_language (ActUser *user, - const char *language); + const char *act_user_get_icon_file (ActUser *user); + const char *act_user_get_language (ActUser *user); + const char * const *act_user_get_languages (ActUser *user); +@@ -100,6 +101,8 @@ void act_user_set_user_expiration_policy (ActUser *user, + + void act_user_set_language (ActUser *user, + const char *language); +void act_user_set_background_file (ActUser *user, + const char *background_file); - void act_user_set_x_session (ActUser *user, - const char *x_session); - void act_user_set_session (ActUser *user, + void act_user_set_languages (ActUser *user, + const char * const *languages); + diff --git a/src/user.c b/src/user.c -index 199e54d..f9e3eea 100644 +index 917d427..16a1cbd 100644 --- a/src/user.c +++ b/src/user.c -@@ -563,6 +563,12 @@ user_update_from_keyfile (User *user, - g_clear_pointer (&s, g_free); - } - +@@ -521,6 +521,11 @@ user_update_from_keyfile (User *user, + GKeyFile *keyfile) + { + gchar *s, **sl; + s = g_key_file_get_string (keyfile, "User", "Background", NULL); + if (s != NULL) { + accounts_user_set_background_file (ACCOUNTS_USER (user), s); + g_clear_pointer (&s, g_free); + } -+ - s = g_key_file_get_string (keyfile, "User", "Icon", NULL); - if (s != NULL) { - accounts_user_set_icon_file (ACCOUNTS_USER (user), s); -@@ -641,6 +647,9 @@ user_save_to_keyfile (User *user, + + s = g_key_file_get_string (keyfile, "User", "Language", NULL); + sl = g_key_file_get_string_list (keyfile, "User", "Languages", NULL, NULL); +@@ -676,6 +681,9 @@ user_save_to_keyfile (User *user, if (accounts_user_get_password_hint (ACCOUNTS_USER (user))) g_key_file_set_string (keyfile, "User", "PasswordHint", accounts_user_get_password_hint (ACCOUNTS_USER (user))); + if (accounts_user_get_background_file (ACCOUNTS_USER (user))) -+ g_key_file_set_string (keyfile, "User", "Background", accounts_user_get_background_file (ACCOUNTS_USER (user))); ++ g_key_file_set_string (keyfile, "User", "Background", accounts_user_get_background_file (ACCOUNTS_USER (user))); + if (accounts_user_get_icon_file (ACCOUNTS_USER (user))) g_key_file_set_string (keyfile, "User", "Icon", accounts_user_get_icon_file (ACCOUNTS_USER (user))); -@@ -1900,6 +1909,76 @@ become_user (gpointer data) +@@ -2026,6 +2034,76 @@ become_user (gpointer data) } } @@ -287,14 +294,14 @@ index 199e54d..f9e3eea 100644 static void user_change_icon_file_authorized_cb (Daemon *daemon, User *user, -@@ -2576,6 +2655,7 @@ user_accounts_user_iface_init (AccountsUserIface *iface) +@@ -2722,6 +2800,7 @@ user_accounts_user_iface_init (AccountsUserIface *iface) { iface->handle_set_account_type = user_set_account_type; iface->handle_set_automatic_login = user_set_automatic_login; -+ iface->handle_set_background_file = user_set_background_file; ++ iface->handle_set_background_file = user_set_background_file; iface->handle_set_email = user_set_email; iface->handle_set_home_directory = user_set_home_directory; iface->handle_set_icon_file = user_set_icon_file; -- -2.41.0 +2.27.0 diff --git a/accountsservice-22.08.8-kylin-add-formats-locale-support.patch b/accountsservice-22.08.8-kylin-add-formats-locale-support.patch index 428ffa2..74337f5 100644 --- a/accountsservice-22.08.8-kylin-add-formats-locale-support.patch +++ b/accountsservice-22.08.8-kylin-add-formats-locale-support.patch @@ -4,17 +4,17 @@ Date: Mon, 18 Sep 2023 10:55:57 +0800 Subject: [PATCH] Addition of FormatsLocale property and SetFormatsLocale --- - data/org.freedesktop.Accounts.User.xml | 45 ++++++++++++++++++++ - src/libaccountsservice/act-user.c | 57 +++++++++++++++++++++++++ + data/org.freedesktop.Accounts.User.xml | 45 +++++++++++++++++++ + src/libaccountsservice/act-user.c | 60 ++++++++++++++++++++++++++ src/libaccountsservice/act-user.h | 3 ++ - src/user.c | 58 ++++++++++++++++++++++++++ - 4 files changed, 163 insertions(+) + src/user.c | 57 ++++++++++++++++++++++++ + 4 files changed, 165 insertions(+) diff --git a/data/org.freedesktop.Accounts.User.xml b/data/org.freedesktop.Accounts.User.xml -index f0bfa73..5f654fb 100644 +index 7a8a915..c750878 100644 --- a/data/org.freedesktop.Accounts.User.xml +++ b/data/org.freedesktop.Accounts.User.xml -@@ -150,6 +150,41 @@ +@@ -191,6 +191,41 @@ @@ -56,11 +56,11 @@ index f0bfa73..5f654fb 100644 -@@ -819,6 +854,16 @@ +@@ -871,6 +906,16 @@ -+ ++ + + + @@ -68,27 +68,36 @@ index f0bfa73..5f654fb 100644 + + + -+ ++ + diff --git a/src/libaccountsservice/act-user.c b/src/libaccountsservice/act-user.c -index 3163361..a4f031d 100644 +index 9125d43..daf634c 100644 --- a/src/libaccountsservice/act-user.c +++ b/src/libaccountsservice/act-user.c -@@ -92,6 +92,7 @@ enum { - PROP_BACKGROUND_FILE, +@@ -93,6 +93,7 @@ enum + PROP_BACKGROUND_FILE, PROP_ICON_FILE, PROP_LANGUAGE, -+ PROP_FORMATS_LOCALE, ++ PROP_FORMATS_LOCALE, PROP_X_SESSION, PROP_IS_LOADED }; -@@ -404,6 +405,13 @@ act_user_class_init (ActUserClass *class) +@@ -273,6 +274,7 @@ act_user_class_init (ActUserClass *class) + "The real name to display for this user.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); ++ + g_object_class_install_property (gobject_class, + PROP_BACKGROUND_FILE, + g_param_spec_string ("background-file", +@@ -406,6 +408,15 @@ act_user_class_init (ActUserClass *class) "User's locale.", NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); ++ + g_object_class_install_property (gobject_class, + PROP_FORMATS_LOCALE, + g_param_spec_string ("formats-locale", @@ -96,10 +105,11 @@ index 3163361..a4f031d 100644 + "User's regional formats.", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); ++ g_object_class_install_property (gobject_class, PROP_X_SESSION, g_param_spec_string ("x-session", -@@ -1065,6 +1073,25 @@ act_user_get_language (ActUser *user) +@@ -1086,6 +1097,25 @@ act_user_get_language (ActUser *user) return accounts_user_get_language (user->accounts_proxy); } @@ -125,7 +135,7 @@ index 3163361..a4f031d 100644 /** * act_user_get_x_session: * @user: a #ActUser -@@ -1418,6 +1445,36 @@ act_user_set_password_expiration_policy (ActUser *user, +@@ -1440,6 +1470,36 @@ act_user_set_password_expiration_policy (ActUser *user, } } @@ -163,44 +173,43 @@ index 3163361..a4f031d 100644 * act_user_set_email: * @user: the user object to alter. diff --git a/src/libaccountsservice/act-user.h b/src/libaccountsservice/act-user.h -index dfcc5f9..b1f06bf 100644 +index 82019f5..4281553 100644 --- a/src/libaccountsservice/act-user.h +++ b/src/libaccountsservice/act-user.h -@@ -73,6 +73,7 @@ gboolean act_user_is_nonexistent (ActUser *user); +@@ -72,6 +72,7 @@ gboolean act_user_is_nonexistent (ActUser *user); const char *act_user_get_background_file (ActUser *user); - const char *act_user_get_icon_file (ActUser *user); - const char *act_user_get_language (ActUser *user); + const char *act_user_get_icon_file (ActUser *user); + const char *act_user_get_language (ActUser *user); +const char *act_user_get_formats_locale (ActUser *user); - const char *act_user_get_x_session (ActUser *user); - const char *act_user_get_session (ActUser *user); - const char *act_user_get_session_type (ActUser *user); -@@ -103,6 +104,8 @@ void act_user_set_email (ActUser *user, - const char *email); - void act_user_set_language (ActUser *user, - const char *language); + const char * const *act_user_get_languages (ActUser *user); + const char *act_user_get_x_session (ActUser *user); + const char *act_user_get_session (ActUser *user); +@@ -101,6 +102,8 @@ void act_user_set_user_expiration_policy (ActUser *user, + + void act_user_set_language (ActUser *user, + const char *language); +void act_user_set_formats_locale (ActUser *user, + const char *formats_locale); void act_user_set_background_file (ActUser *user, const char *background_file); - void act_user_set_x_session (ActUser *user, + void act_user_set_languages (ActUser *user, diff --git a/src/user.c b/src/user.c -index f9e3eea..413208c 100644 +index 16a1cbd..9b5cf7d 100644 --- a/src/user.c +++ b/src/user.c -@@ -524,6 +524,12 @@ user_update_from_keyfile (User *user, +@@ -545,6 +545,11 @@ user_update_from_keyfile (User *user, + accounts_user_set_language (ACCOUNTS_USER (user), s); g_clear_pointer (&s, g_free); } - + s = g_key_file_get_string (keyfile, "User", "FormatsLocale", NULL); + if (s != NULL) { + accounts_user_set_formats_locale (ACCOUNTS_USER (user), s); + g_clear_pointer (&s, g_free); + } -+ + s = g_key_file_get_string (keyfile, "User", "XSession", NULL); if (s != NULL) { - accounts_user_set_xsession (ACCOUNTS_USER (user), s); -@@ -638,6 +644,9 @@ user_save_to_keyfile (User *user, +@@ -672,6 +677,9 @@ user_save_to_keyfile (User *user, if (accounts_user_get_session_type (ACCOUNTS_USER (user))) g_key_file_set_string (keyfile, "User", "SessionType", accounts_user_get_session_type (ACCOUNTS_USER (user))); @@ -210,7 +219,7 @@ index f9e3eea..413208c 100644 if (accounts_user_get_xsession (ACCOUNTS_USER (user))) g_key_file_set_string (keyfile, "User", "XSession", accounts_user_get_xsession (ACCOUNTS_USER (user))); -@@ -1461,6 +1470,54 @@ user_set_session_type (AccountsUser *auser, +@@ -1583,6 +1591,54 @@ user_set_session_type (AccountsUser *auser, return TRUE; } @@ -265,14 +274,14 @@ index f9e3eea..413208c 100644 static void user_change_x_session_authorized_cb (Daemon *daemon, User *user, -@@ -2657,6 +2714,7 @@ user_accounts_user_iface_init (AccountsUserIface *iface) +@@ -2802,6 +2858,7 @@ user_accounts_user_iface_init (AccountsUserIface *iface) iface->handle_set_automatic_login = user_set_automatic_login; - iface->handle_set_background_file = user_set_background_file; + iface->handle_set_background_file = user_set_background_file; iface->handle_set_email = user_set_email; -+ iface->handle_set_formats_locale = user_set_formats_locale; ++ iface->handle_set_formats_locale = user_set_formats_locale; iface->handle_set_home_directory = user_set_home_directory; iface->handle_set_icon_file = user_set_icon_file; iface->handle_set_language = user_set_language; -- -2.41.0 +2.27.0 diff --git a/accountsservice-22.08.8.tar.xz b/accountsservice-22.08.8.tar.xz deleted file mode 100644 index 3f265cd..0000000 Binary files a/accountsservice-22.08.8.tar.xz and /dev/null differ diff --git a/accountsservice-23.13.9.tar.xz b/accountsservice-23.13.9.tar.xz new file mode 100644 index 0000000..a3cfee6 Binary files /dev/null and b/accountsservice-23.13.9.tar.xz differ diff --git a/accountsservice.spec b/accountsservice.spec index c05ba48..8fb0792 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -1,6 +1,6 @@ Name: accountsservice -Version: 22.08.8 -Release: 2 +Version: 23.13.9 +Release: 1 Summary: D-Bus service for accessing the list of user accounts and information attached to those accounts. License: GPLv3+ @@ -92,6 +92,9 @@ are contained in %{name}-devel package. %{_datadir}/gtk-doc/html/libaccountsservice/* %changelog +* Wed Nov 08 2023 wangqia - 23.13.9-1 +- Upgrade to version 23.13.9 + * Mon Sep 18 2023 peijiankang - 22.08.8-2 - add background-file and formats-locale support