testing/accountsservice: upgrade to 0.6.55

2 files changed, 39 insertions, 28 deletions

diff --git a/testing/accountsservice/APKBUILD b/testing/accountsservice/APKBUILD
index 4e1003c10c..8fcb50b11a 100644
--- a/testing/accountsservice/APKBUILD
+++ b/testing/accountsservice/APKBUILD
@@ -1,46 +1,44 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=accountsservice
-pkgver=0.6.50
-pkgrel=1
+pkgver=0.6.55
+pkgrel=0
 pkgdesc="D-Bus interface for user account query and manipulation"
+options="!check" # No testsuite
 url="https://www.freedesktop.org/software/accountsservice/"
 arch="all"
 license="GPL-3.0-or-later"
-depends=""
 depends_dev="glib-dev gobject-introspection-dev polkit-dev"
-makedepends="$depends_dev intltool gnome-doc-utils"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+makedepends="
+        $depends_dev
+        intltool
+        meson
+        elogind-dev
+        gobject-introspection-dev
+        "
+subpackages="$pkgname-dev $pkgname-lang lib$pkgname:libs"
 source="https://www.freedesktop.org/software/accountsservice/accountsservice-$pkgver.tar.xz
         musl-fgetspent_r.patch
+        musl-wtmp.patch
         "
-builddir="$srcdir"/$pkgname-$pkgver
+
 build() {
-        cd "$builddir"
-        # Hack to check for /var/log/wtmp instead of /var/log/utx.log
-        sed -i configure -e "s;utx\.log;wtmp;g"
-        ac_cv_file__var_log_utx_log=yes ./configure \
-                --build=$CBUILD \
-                --host=$CHOST \
+        meson \
                 --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info \
-                --localstatedir=/var \
-                --disable-systemd \
-                --enable-introspection=yes
-        make
-}
-
-check() {
-        cd "$builddir"
-        make check
+                -Dsystemdsystemunitdir=no \
+                -Dsystemd=false \
+                -Delogind=true \
+                -Dintrospection=true \
+                -Ddocbook=false \
+                -Dgtk_doc=false \
+                output
+        ninja -C output
 }
 
 package() {
-        cd "$builddir"
-        make DESTDIR="$pkgdir" install
+        DESTDIR="$pkgdir" ninja -C output install
 }
 
-sha512sums="6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64  accountsservice-0.6.50.tar.xz
-469392beca8f5941eafaa193c4fcb0472770ee4183ce520416a1b5d6abafe0e201990eb74d06bfbd9e20af08e55aff5f0031f267083f6c6879f0fe4e5028103c  musl-fgetspent_r.patch"
+sha512sums="c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d  accountsservice-0.6.55.tar.xz
+469392beca8f5941eafaa193c4fcb0472770ee4183ce520416a1b5d6abafe0e201990eb74d06bfbd9e20af08e55aff5f0031f267083f6c6879f0fe4e5028103c  musl-fgetspent_r.patch
+7b41a5fd4c2ab178762902d137ebf6eb6edbf97bae9255d17c4380c8c738b159aa25a2e51c31f740789560f17850c71b0bb60ee792a2a87be6b60cb5c89d7efc  musl-wtmp.patch"
diff --git a/testing/accountsservice/musl-wtmp.patch b/testing/accountsservice/musl-wtmp.patch
new file mode 100644
index 0000000000..4393c0209a
--- /dev/null
+++ b/testing/accountsservice/musl-wtmp.patch
@@ -0,0 +1,13 @@
+--- 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')
+   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')
++  config_h.set_quoted('PATH_WTMP', '/var/log/wtmp')
+ endif
+ 
+ # compiler flags
+