From 3633647835a82336b9513fed198259275b6ed7ac Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Wed, 26 Sep 2018 18:39:10 +0200
Subject: [PATCH] accountsservice: update to 0.6.53.

---
 .../patches/fix-wtmpx_default.patch           |  0
 .../accountsservice/patches/musl-wtmp.patch   | 14 ++++++++
 srcpkgs/accountsservice/template              | 34 ++++++-------------
 3 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/accountsservice/patches/fix-wtmpx_default.patch
 create mode 100644 srcpkgs/accountsservice/patches/musl-wtmp.patch

diff --git a/srcpkgs/accountsservice/patches/fix-wtmpx_default.patch b/srcpkgs/accountsservice/patches/fix-wtmpx_default.patch
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/srcpkgs/accountsservice/patches/musl-wtmp.patch b/srcpkgs/accountsservice/patches/musl-wtmp.patch
new file mode 100644
index 00000000000..a8629780564
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/musl-wtmp.patch
@@ -0,0 +1,14 @@
+Reason: fix build on musl
+Tidy up and send upstream soon...
+--- meson.build
++++ 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')
+   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('PATH_WTMP', '/var/log/utx.log')
++  config_h.set_quoted('PATH_WTMP', '/var/log/wtmp')
+ endif
+ 
+ # compiler flags
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd1f4f14b81..ee771eee900 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,20 +1,17 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.50
+version=0.6.53
 revision=1
-build_style=gnu-configure
-configure_args="--disable-static --disable-systemd
- $(vopt_enable gir introspection) ac_cv_file__etc_redhat_release=no
- ac_cv_file__etc_debian_version=no"
-hostmakedepends="glib-devel intltool pkg-config
- $(vopt_if gir 'gobject-introspection')"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=no $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
 makedepends="polkit-devel"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
+maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://cgit.freedesktop.org/accountsservice/"
+homepage="https://www.freedesktop.org/wiki/Software/AccountsService/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=035928f5dea46f2220657e0bd669bc7fac45165b700c0a81b2b66ff2c3dbc74a
+checksum=0919d8311ccd1b94c969921742d4b58ff6d9a92881bce1ce1cffcfb2293ee89b
 make_dirs="
  /var/lib/AccountsService/users 755 root root
  /var/lib/AccountsService/icons 755 root root"
@@ -24,21 +21,11 @@ build_options="gir"
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
+else
+	# for ITS rules
+	hostmakedepends+=" polkit"
 fi
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			# Patch to check for /var/log/wtmp instead of /var/log/utx.log
-			sed -i configure -e "s;utx\.log;wtmp;g"
-			configure_args+=" ac_cv_file__var_log_utx_log=yes"
-			# FIXME: if ac_cv_header_utmpx_h=no is set, the function
-			# wtmp_helper_update_login_frequencies() is not defined.
-			# configure_args+=" ac_cv_header_utmpx_h=no"
-			;;
-	esac
-}
-
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -49,6 +36,5 @@ accountsservice-devel_package() {
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove usr/share/gtk-doc
 	}
 }