Skip to content

Commit

Permalink
main/accountsservice: use tmpfiles, fix build
Browse files Browse the repository at this point in the history
Fixes #3014
  • Loading branch information
q66 committed Sep 29, 2024
1 parent 7214684 commit 23dca66
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 3 deletions.
4 changes: 4 additions & 0 deletions main/accountsservice/files/tmpfiles.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Create accountsservice state dirs

d /var/lib/AccountsService/users 0755 root root -
d /var/lib/AccountsService/icons 0755 root root -
25 changes: 25 additions & 0 deletions main/accountsservice/patches/gir-uid-t.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Introspection is unaware of uid_t and fails
since g-i 1.82, use the underlying type instead.

--- a/src/libaccountsservice/act-user-manager.h
+++ b/src/libaccountsservice/act-user-manager.h
@@ -78,7 +78,7 @@ GSList * act_user_manager_list_users (ActUserManager *manager);
ActUser * act_user_manager_get_user (ActUserManager *manager,
const char *username);
ActUser * act_user_manager_get_user_by_id (ActUserManager *manager,
- uid_t id);
+ unsigned int id);

gboolean act_user_manager_activate_user_session (ActUserManager *manager,
ActUser *user);
--- a/src/libaccountsservice/act-user.h
+++ b/src/libaccountsservice/act-user.h
@@ -46,7 +46,7 @@ typedef enum

const char *act_user_get_object_path (ActUser *user);

-uid_t act_user_get_uid (ActUser *user);
+unsigned int act_user_get_uid (ActUser *user);
const char *act_user_get_user_name (ActUser *user);
const char *act_user_get_real_name (ActUser *user);
ActUserAccountType act_user_get_account_type (ActUser *user);
5 changes: 2 additions & 3 deletions main/accountsservice/template.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgname = "accountsservice"
pkgver = "23.13.9"
pkgrel = 1
pkgrel = 2
build_style = "meson"
configure_args = [
"-Dsystemdsystemunitdir=no",
Expand Down Expand Up @@ -29,8 +29,7 @@


def post_install(self):
self.install_dir("var/lib/AccountsService/users", empty=True)
self.install_dir("var/lib/AccountsService/icons", empty=True)
self.install_tmpfiles(self.files_path / "tmpfiles.conf")


@subpackage("accountsservice-devel")
Expand Down

0 comments on commit 23dca66

Please sign in to comment.