From 43c8d17bd04ae9a503230917176060d000373b39 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 24 Sep 2023 19:07:59 +0300
Subject: [PATCH] accountsservice: update to 23.13.9.

Also:
- removed elogind option as (no longer optional)
- adjusted musl-wmpt patch
- removed -Duser_heuristics (removed upstream)
- added vala in hostmakedepends (vapigen is needed during build)
- removed meson patch (not needed).
---
 .../accountsservice/patches/meson-0.61.patch  | 29 -------------------
 .../accountsservice/patches/musl-wtmp.patch   | 15 +++++-----
 srcpkgs/accountsservice/template              | 18 ++++++------
 3 files changed, 17 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/meson-0.61.patch b/srcpkgs/accountsservice/patches/meson-0.61.patch
deleted file mode 100644
index 9245afdd47d261..00000000000000
--- a/srcpkgs/accountsservice/patches/meson-0.61.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ac9b14f1c1bbca413987d0bbfeaad05804107e9a Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Sun, 31 Oct 2021 12:29:14 +0000
-Subject: Fix build with meson 0.60
-
-Positional parameters to merge_file() were never allowed and always
-ignored, so just drop it.
-See: https://github.com/mesonbuild/meson/issues/9441
-
-Fixes #97
----
- data/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 70edf89..9e80299 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -33,7 +33,6 @@ configure_file(
- policy = act_namespace.to_lower() + '.policy'
- 
- i18n.merge_file(
--  policy,
-   input: policy + '.in',
-   output: policy,
-   po_dir: po_dir,
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/accountsservice/patches/musl-wtmp.patch b/srcpkgs/accountsservice/patches/musl-wtmp.patch
index 1d01e317331193..27ebc561e448ce 100644
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ b/srcpkgs/accountsservice/patches/musl-wtmp.patch
@@ -1,15 +1,16 @@
-Reason: fix build on musl
-Tidy up and send upstream soon...
+diff --git a/meson.build b/meson.build
+index 4a509e7..8fe5c3b 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -82,8 +82,7 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURC
- elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+@@ -103,9 +103,8 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+ 
    config_h.set('PATH_WTMP', '_PATH_WTMPX')
  else
--  assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes')
--  config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
+-  path_wtmp = '/var/log/utx.log'
+-  assert(run_command('test', '-e', path_wtmp, check: false).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
+-  config_h.set_quoted('PATH_WTMP', path_wtmp)
++  path_wtmp = 'var/log/wtmp'
 +  config_h.set_quoted('PATH_WTMP', '/var/log/wtmp')
  endif
  
  # compiler flags
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index f298248158312a..2042542e9ad8a8 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,26 +1,26 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=2
+version=23.13.9
+revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dsystemdsystemunitdir=no -Duser_heuristics=false
- $(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
-hostmakedepends="glib-devel pkg-config polkit gettext"
-makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
+configure_args="-Dsystemdsystemunitdir=no
+ $(vopt_bool gir introspection) -Delogind=true"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)"
+makedepends="polkit-devel elogind-devel"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/AccountsService/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b
+checksum=adda4cdeae24fa0992e7df3ffff9effa7090be3ac233a3edfdf69d5a9c9b924f
 make_dirs="
  /var/lib/AccountsService/users 755 root root
  /var/lib/AccountsService/icons 755 root root"
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"