[PR PATCH] accountservice: update to 23.13.9.

[PR PATCH] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 6715 bytes --]

From 33d0538566556e6c01a734103e91e63291896392 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch | 39 +++++++++++++++++++
 .../accountsservice/patches/meson-0.61.patch  | 29 --------------
 .../accountsservice/patches/musl-wtmp.patch   | 14 +++----
 srcpkgs/accountsservice/template              | 23 ++++++-----
 4 files changed, 59 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
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..202d18086a85ce 100644
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ b/srcpkgs/accountsservice/patches/musl-wtmp.patch
@@ -2,14 +2,12 @@ Reason: fix build on musl
 Tidy up and send upstream soon...
 --- 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,7 +103,7 @@ elif cc.has_header_symbol('paths.h', '_P
+ 
    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')
+-  path_wtmp = '/var/log/utx.log'
++  path_wtmp = '/var/log/wtmp'
+   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)
  endif
- 
- # compiler flags
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..b9be585657341e 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,19 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)"
+makedepends="polkit-devel elogind-devel python3-dbus python3-gobject python3-dbusmock"
 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"
@@ -23,8 +23,13 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 8244 bytes --]

From 33d0538566556e6c01a734103e91e63291896392 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH 1/2] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch | 39 +++++++++++++++++++
 .../accountsservice/patches/meson-0.61.patch  | 29 --------------
 .../accountsservice/patches/musl-wtmp.patch   | 14 +++----
 srcpkgs/accountsservice/template              | 23 ++++++-----
 4 files changed, 59 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
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..202d18086a85ce 100644
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ b/srcpkgs/accountsservice/patches/musl-wtmp.patch
@@ -2,14 +2,12 @@ Reason: fix build on musl
 Tidy up and send upstream soon...
 --- 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,7 +103,7 @@ elif cc.has_header_symbol('paths.h', '_P
+ 
    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')
+-  path_wtmp = '/var/log/utx.log'
++  path_wtmp = '/var/log/wtmp'
+   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)
  endif
- 
- # compiler flags
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..b9be585657341e 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,19 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)"
+makedepends="polkit-devel elogind-devel python3-dbus python3-gobject python3-dbusmock"
 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"
@@ -23,8 +23,13 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From cb750e0ce634e719a0ba2118d3fc2f67a05d2212 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:55:13 -0800
Subject: [PATCH 2/2] python3-dbusmock: update to 0.34.2.

---
 srcpkgs/python3-dbusmock/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-dbusmock/template b/srcpkgs/python3-dbusmock/template
index 98ed46059cd2c9..fab283ad09448d 100644
--- a/srcpkgs/python3-dbusmock/template
+++ b/srcpkgs/python3-dbusmock/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-dbusmock'
 pkgname=python3-dbusmock
-version=0.30.0
-revision=2
-build_style=python3-module
+version=0.34.2
+revision=1
+build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-setuptools_scm"
 depends="python3-dbus python3-gobject"
 checkdepends="${depends} python3-pytest upower bluez NetworkManager
@@ -11,5 +11,6 @@ short_desc="Python3 library to mock D-Bus objects for testing"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/martinpitt/python-dbusmock"
-distfiles="https://github.com/martinpitt/python-dbusmock/releases/download/${version}/dist.python-dbusmock-${version}.tar.gz"
-checksum=dbb59e715b4d88089caed950edf93c46cb5f022ceae5d8ae37064b73baf956c1
+distfiles="https://github.com/martinpitt/python-dbusmock/releases/download/${version}/dist.python_dbusmock-${version}.tar.gz"
+checksum=69c3137f15d3397846fd4aeb2e7f41289aa4c7dc2a894502225186d1fcb396ec
+provides="py3:dbus-python"

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 9059 bytes --]

From 33d0538566556e6c01a734103e91e63291896392 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH 1/3] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch | 39 +++++++++++++++++++
 .../accountsservice/patches/meson-0.61.patch  | 29 --------------
 .../accountsservice/patches/musl-wtmp.patch   | 14 +++----
 srcpkgs/accountsservice/template              | 23 ++++++-----
 4 files changed, 59 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
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..202d18086a85ce 100644
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ b/srcpkgs/accountsservice/patches/musl-wtmp.patch
@@ -2,14 +2,12 @@ Reason: fix build on musl
 Tidy up and send upstream soon...
 --- 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,7 +103,7 @@ elif cc.has_header_symbol('paths.h', '_P
+ 
    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')
+-  path_wtmp = '/var/log/utx.log'
++  path_wtmp = '/var/log/wtmp'
+   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)
  endif
- 
- # compiler flags
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..b9be585657341e 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,19 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)"
+makedepends="polkit-devel elogind-devel python3-dbus python3-gobject python3-dbusmock"
 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"
@@ -23,8 +23,13 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a9135704e60019b82576be70454146074679aed6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 22:12:31 -0800
Subject: [PATCH 2/3] python3-dbus: rebuild for py3 provides

---
 srcpkgs/python3-dbus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-dbus/template b/srcpkgs/python3-dbus/template
index faa4b1dafc0dd6..4671340f041c6c 100644
--- a/srcpkgs/python3-dbus/template
+++ b/srcpkgs/python3-dbus/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-dbus'
 pkgname=python3-dbus
 version=1.3.2
-revision=3
+revision=4
 build_style=gnu-configure
-hostmakedepends="pkg-config python3"
+hostmakedepends="pkg-config python3 python3-packaging-bootstrap"
 makedepends="libglib-devel python3-devel"
 depends="python3 dbus"
 checkdepends="${depends} python3-gobject"

From abcfbc6a685387211fcb1bfe20100247cfd454fc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:55:13 -0800
Subject: [PATCH 3/3] python3-dbusmock: update to 0.34.2.

---
 srcpkgs/python3-dbusmock/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-dbusmock/template b/srcpkgs/python3-dbusmock/template
index 98ed46059cd2c9..10d82dcddbeda7 100644
--- a/srcpkgs/python3-dbusmock/template
+++ b/srcpkgs/python3-dbusmock/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-dbusmock'
 pkgname=python3-dbusmock
-version=0.30.0
-revision=2
-build_style=python3-module
+version=0.34.2
+revision=1
+build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-setuptools_scm"
 depends="python3-dbus python3-gobject"
 checkdepends="${depends} python3-pytest upower bluez NetworkManager
@@ -11,5 +11,5 @@ short_desc="Python3 library to mock D-Bus objects for testing"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/martinpitt/python-dbusmock"
-distfiles="https://github.com/martinpitt/python-dbusmock/releases/download/${version}/dist.python-dbusmock-${version}.tar.gz"
-checksum=dbb59e715b4d88089caed950edf93c46cb5f022ceae5d8ae37064b73baf956c1
+distfiles="https://github.com/martinpitt/python-dbusmock/releases/download/${version}/dist.python_dbusmock-${version}.tar.gz"
+checksum=69c3137f15d3397846fd4aeb2e7f41289aa4c7dc2a894502225186d1fcb396ec

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 10545 bytes --]

From b43e582e3660dd74929f00f4e0888dfdc44087c4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH 1/3] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch | 39 ++++++++++
 .../accountsservice/patches/meson-0.61.patch  | 29 --------
 .../accountsservice/patches/musl-wtmp.patch   | 14 ++--
 srcpkgs/accountsservice/template              | 71 ++++++++++++++++---
 4 files changed, 107 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
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..202d18086a85ce 100644
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ b/srcpkgs/accountsservice/patches/musl-wtmp.patch
@@ -2,14 +2,12 @@ Reason: fix build on musl
 Tidy up and send upstream soon...
 --- 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,7 +103,7 @@ elif cc.has_header_symbol('paths.h', '_P
+ 
    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')
+-  path_wtmp = '/var/log/utx.log'
++  path_wtmp = '/var/log/wtmp'
+   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)
  endif
- 
- # compiler flags
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..fab7f9c7d15e42 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,20 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)
+ python3-dbus python3-gobject python3-dbusmock"
+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"
@@ -23,8 +24,60 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
+
+_print_and_err() {
+	cat /builddir/accountsservice-23.13.9/build/meson-logs/meson-log.txt
+	return 2
+}
+
+# TEMP: Just for debugging purposes
+do_configure() {
+	: ${meson_cmd:=meson}
+	: ${meson_builddir:=build}
+	: ${meson_crossfile:="${XBPS_WRAPPERDIR}/meson/xbps_meson.cross"}
+
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --cross-file=${meson_crossfile}"
+	fi
+
+	# binutils ar needs a plugin when LTO is used on static libraries, so we
+	# have to use the gcc-ar wrapper that calls the correct plugin.
+	# As seen in https://github.com/mesonbuild/meson/issues/1646 (and its
+	# solution, https://github.com/mesonbuild/meson/pull/1649), meson fixed
+	# issues with static libraries + LTO by defaulting to gcc-ar themselves.
+	# We also force gcc-ar usage in the crossfile above.
+	export AR="gcc-ar"
+
+	# unbuffered output for continuous logging
+	${meson_cmd} setup \
+		--prefix=/usr \
+		--libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
+		--libexecdir=/usr/libexec \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--includedir=/usr/include \
+		--datadir=/usr/share \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localedir=/usr/share/locale \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sharedstatedir=/var/lib \
+		--buildtype=plain \
+		--auto-features=auto \
+		--wrap-mode=nodownload \
+		-Db_lto=true -Db_ndebug=true \
+		-Db_staticpic=true \
+		-Dpkgconfig.relocatable=false \
+		${configure_args} . ${meson_builddir} || _print_and_err
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c2589387246fb71870ba992b4e386c678342fbe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 22:12:31 -0800
Subject: [PATCH 2/3] python3-dbus: rebuild for py3 provides

---
 srcpkgs/python3-dbus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-dbus/template b/srcpkgs/python3-dbus/template
index faa4b1dafc0dd6..4671340f041c6c 100644
--- a/srcpkgs/python3-dbus/template
+++ b/srcpkgs/python3-dbus/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-dbus'
 pkgname=python3-dbus
 version=1.3.2
-revision=3
+revision=4
 build_style=gnu-configure
-hostmakedepends="pkg-config python3"
+hostmakedepends="pkg-config python3 python3-packaging-bootstrap"
 makedepends="libglib-devel python3-devel"
 depends="python3 dbus"
 checkdepends="${depends} python3-gobject"

From 2962446d7d206c9390791bb4f7f25abe9cbbac3e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:55:13 -0800
Subject: [PATCH 3/3] python3-dbusmock: update to 0.34.2.

---
 srcpkgs/python3-dbusmock/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-dbusmock/template b/srcpkgs/python3-dbusmock/template
index 98ed46059cd2c9..10d82dcddbeda7 100644
--- a/srcpkgs/python3-dbusmock/template
+++ b/srcpkgs/python3-dbusmock/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-dbusmock'
 pkgname=python3-dbusmock
-version=0.30.0
-revision=2
-build_style=python3-module
+version=0.34.2
+revision=1
+build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-setuptools_scm"
 depends="python3-dbus python3-gobject"
 checkdepends="${depends} python3-pytest upower bluez NetworkManager
@@ -11,5 +11,5 @@ short_desc="Python3 library to mock D-Bus objects for testing"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/martinpitt/python-dbusmock"
-distfiles="https://github.com/martinpitt/python-dbusmock/releases/download/${version}/dist.python-dbusmock-${version}.tar.gz"
-checksum=dbb59e715b4d88089caed950edf93c46cb5f022ceae5d8ae37064b73baf956c1
+distfiles="https://github.com/martinpitt/python-dbusmock/releases/download/${version}/dist.python_dbusmock-${version}.tar.gz"
+checksum=69c3137f15d3397846fd4aeb2e7f41289aa4c7dc2a894502225186d1fcb396ec

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 8287 bytes --]

From 90b6ffe0cd605c171ef23cdc1fb6df3298830026 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch | 39 ++++++++++
 .../accountsservice/patches/meson-0.61.patch  | 29 --------
 .../accountsservice/patches/musl-wtmp.patch   | 14 ++--
 srcpkgs/accountsservice/template              | 72 ++++++++++++++++---
 4 files changed, 108 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
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..202d18086a85ce 100644
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ b/srcpkgs/accountsservice/patches/musl-wtmp.patch
@@ -2,14 +2,12 @@ Reason: fix build on musl
 Tidy up and send upstream soon...
 --- 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,7 +103,7 @@ elif cc.has_header_symbol('paths.h', '_P
+ 
    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')
+-  path_wtmp = '/var/log/utx.log'
++  path_wtmp = '/var/log/wtmp'
+   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)
  endif
- 
- # compiler flags
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..302bb1768dd353 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,20 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)
+ python3-dbus python3-gobject python3-dbusmock"
+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"
@@ -23,8 +24,61 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+	vsed -e 's/test_file, check: true)/test_file, check: false)/g' -i tests/meson.build
+}
+
+_print_and_err() {
+	cat /builddir/accountsservice-23.13.9/build/meson-logs/meson-log.txt
+	return 2
+}
+
+# TEMP: Just for debugging purposes
+do_configure() {
+	: ${meson_cmd:=meson}
+	: ${meson_builddir:=build}
+	: ${meson_crossfile:="${XBPS_WRAPPERDIR}/meson/xbps_meson.cross"}
+
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --cross-file=${meson_crossfile}"
+	fi
+
+	# binutils ar needs a plugin when LTO is used on static libraries, so we
+	# have to use the gcc-ar wrapper that calls the correct plugin.
+	# As seen in https://github.com/mesonbuild/meson/issues/1646 (and its
+	# solution, https://github.com/mesonbuild/meson/pull/1649), meson fixed
+	# issues with static libraries + LTO by defaulting to gcc-ar themselves.
+	# We also force gcc-ar usage in the crossfile above.
+	export AR="gcc-ar"
+
+	# unbuffered output for continuous logging
+	${meson_cmd} setup \
+		--prefix=/usr \
+		--libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
+		--libexecdir=/usr/libexec \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--includedir=/usr/include \
+		--datadir=/usr/share \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localedir=/usr/share/locale \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sharedstatedir=/var/lib \
+		--buildtype=plain \
+		--auto-features=auto \
+		--wrap-mode=nodownload \
+		-Db_lto=true -Db_ndebug=true \
+		-Db_staticpic=true \
+		-Dpkgconfig.relocatable=false \
+		${configure_args} . ${meson_builddir} || _print_and_err
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 10120 bytes --]

From 58607996d4f57721fa17f0baae7593939aca0c04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch | 39 ++++++++++
 .../accountsservice/patches/fix-build.patch   | 39 ++++++++++
 .../accountsservice/patches/meson-0.61.patch  | 29 --------
 .../accountsservice/patches/musl-wtmp.patch   | 14 ++--
 srcpkgs/accountsservice/template              | 71 ++++++++++++++++---
 5 files changed, 146 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 create mode 100644 srcpkgs/accountsservice/patches/fix-build.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
diff --git a/srcpkgs/accountsservice/patches/fix-build.patch b/srcpkgs/accountsservice/patches/fix-build.patch
new file mode 100644
index 00000000000000..3e54073e20a856
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/fix-build.patch
@@ -0,0 +1,39 @@
+diff --git a/meson.build b/meson.build
+index 34a9d3d..19231a3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -250,7 +250,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
++if get_option('tests') and meson.can_run_host_binaries()
++  subdir('tests')
++endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index 592e961..47297a6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -14,5 +14,6 @@ option('vapi', type: 'boolean', value: true, description : 'Enable Vala bindings
+ 
+ option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
++option('tests',   type: 'boolean', value: true, description: 'run accountservice tests if possible')
+ 
+ option('create_homed', type: 'boolean', value: false, description: 'Use systemd-homed to create new user accounts')
+diff --git a/tests/meson.build b/tests/meson.build
+index 854fea6..8928fff 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -46,7 +46,7 @@ if python3_test_modules_found
+         base_args = test_file
+         suite = ['accounts-service']
+ 
+-        r = run_command(unittest_inspector, test_file, check: true)
++        r = run_command(unittest_inspector, test_file, check: false)
+         unit_tests = r.stdout().strip().split('\n')
+ 
+         if r.returncode() == 0 and unit_tests.length() > 0
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..202d18086a85ce 100644
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ b/srcpkgs/accountsservice/patches/musl-wtmp.patch
@@ -2,14 +2,12 @@ Reason: fix build on musl
 Tidy up and send upstream soon...
 --- 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,7 +103,7 @@ elif cc.has_header_symbol('paths.h', '_P
+ 
    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')
+-  path_wtmp = '/var/log/utx.log'
++  path_wtmp = '/var/log/wtmp'
+   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)
  endif
- 
- # compiler flags
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..fab7f9c7d15e42 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,20 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)
+ python3-dbus python3-gobject python3-dbusmock"
+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"
@@ -23,8 +24,60 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
+
+_print_and_err() {
+	cat /builddir/accountsservice-23.13.9/build/meson-logs/meson-log.txt
+	return 2
+}
+
+# TEMP: Just for debugging purposes
+do_configure() {
+	: ${meson_cmd:=meson}
+	: ${meson_builddir:=build}
+	: ${meson_crossfile:="${XBPS_WRAPPERDIR}/meson/xbps_meson.cross"}
+
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --cross-file=${meson_crossfile}"
+	fi
+
+	# binutils ar needs a plugin when LTO is used on static libraries, so we
+	# have to use the gcc-ar wrapper that calls the correct plugin.
+	# As seen in https://github.com/mesonbuild/meson/issues/1646 (and its
+	# solution, https://github.com/mesonbuild/meson/pull/1649), meson fixed
+	# issues with static libraries + LTO by defaulting to gcc-ar themselves.
+	# We also force gcc-ar usage in the crossfile above.
+	export AR="gcc-ar"
+
+	# unbuffered output for continuous logging
+	${meson_cmd} setup \
+		--prefix=/usr \
+		--libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
+		--libexecdir=/usr/libexec \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--includedir=/usr/include \
+		--datadir=/usr/share \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localedir=/usr/share/locale \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sharedstatedir=/var/lib \
+		--buildtype=plain \
+		--auto-features=auto \
+		--wrap-mode=nodownload \
+		-Db_lto=true -Db_ndebug=true \
+		-Db_staticpic=true \
+		-Dpkgconfig.relocatable=false \
+		${configure_args} . ${meson_builddir} || _print_and_err
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 9959 bytes --]

From d0a617dcc4bf254c7c0a725e875dcc026db23578 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch | 39 ++++++++++
 .../accountsservice/patches/fix-build.patch   | 37 ++++++++++
 .../accountsservice/patches/meson-0.61.patch  | 29 --------
 .../accountsservice/patches/musl-wtmp.patch   | 14 ++--
 srcpkgs/accountsservice/template              | 71 ++++++++++++++++---
 5 files changed, 144 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 create mode 100644 srcpkgs/accountsservice/patches/fix-build.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
diff --git a/srcpkgs/accountsservice/patches/fix-build.patch b/srcpkgs/accountsservice/patches/fix-build.patch
new file mode 100644
index 00000000000000..31b3ed8632277f
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/fix-build.patch
@@ -0,0 +1,37 @@
+diff --git a/meson.build b/meson.build
+index 34a9d3d..19231a3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -250,7 +250,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
++if get_option('tests') and meson.can_run_host_binaries()
++  subdir('tests')
++endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index 592e961..47297a6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: t
+ 
+ option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
++option('tests',   type: 'boolean', value: true, description: 'run accountservice tests if possible')
+diff --git a/tests/meson.build b/tests/meson.build
+index 854fea6..8928fff 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -46,7 +46,7 @@ if python3_test_modules_found
+         base_args = test_file
+         suite = ['accounts-service']
+ 
+-        r = run_command(unittest_inspector, test_file, check: true)
++        r = run_command(unittest_inspector, test_file, check: false)
+         unit_tests = r.stdout().strip().split('\n')
+ 
+         if r.returncode() == 0 and unit_tests.length() > 0
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..202d18086a85ce 100644
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ b/srcpkgs/accountsservice/patches/musl-wtmp.patch
@@ -2,14 +2,12 @@ Reason: fix build on musl
 Tidy up and send upstream soon...
 --- 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,7 +103,7 @@ elif cc.has_header_symbol('paths.h', '_P
+ 
    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')
+-  path_wtmp = '/var/log/utx.log'
++  path_wtmp = '/var/log/wtmp'
+   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)
  endif
- 
- # compiler flags
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..fab7f9c7d15e42 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,20 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)
+ python3-dbus python3-gobject python3-dbusmock"
+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"
@@ -23,8 +24,60 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
+
+_print_and_err() {
+	cat /builddir/accountsservice-23.13.9/build/meson-logs/meson-log.txt
+	return 2
+}
+
+# TEMP: Just for debugging purposes
+do_configure() {
+	: ${meson_cmd:=meson}
+	: ${meson_builddir:=build}
+	: ${meson_crossfile:="${XBPS_WRAPPERDIR}/meson/xbps_meson.cross"}
+
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --cross-file=${meson_crossfile}"
+	fi
+
+	# binutils ar needs a plugin when LTO is used on static libraries, so we
+	# have to use the gcc-ar wrapper that calls the correct plugin.
+	# As seen in https://github.com/mesonbuild/meson/issues/1646 (and its
+	# solution, https://github.com/mesonbuild/meson/pull/1649), meson fixed
+	# issues with static libraries + LTO by defaulting to gcc-ar themselves.
+	# We also force gcc-ar usage in the crossfile above.
+	export AR="gcc-ar"
+
+	# unbuffered output for continuous logging
+	${meson_cmd} setup \
+		--prefix=/usr \
+		--libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
+		--libexecdir=/usr/libexec \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--includedir=/usr/include \
+		--datadir=/usr/share \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localedir=/usr/share/locale \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sharedstatedir=/var/lib \
+		--buildtype=plain \
+		--auto-features=auto \
+		--wrap-mode=nodownload \
+		-Db_lto=true -Db_ndebug=true \
+		-Db_staticpic=true \
+		-Dpkgconfig.relocatable=false \
+		${configure_args} . ${meson_builddir} || _print_and_err
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 11435 bytes --]

From daa118ab26628dbb87c0cb53eee6ba41ce5b2360 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch |  39 ++++++
 .../accountsservice/patches/fix-build.patch   | 113 ++++++++++++++++++
 .../accountsservice/patches/meson-0.61.patch  |  29 -----
 .../accountsservice/patches/musl-wtmp.patch   |  15 ---
 srcpkgs/accountsservice/template              |  24 ++--
 5 files changed, 167 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 create mode 100644 srcpkgs/accountsservice/patches/fix-build.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/accountsservice/patches/musl-wtmp.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
diff --git a/srcpkgs/accountsservice/patches/fix-build.patch b/srcpkgs/accountsservice/patches/fix-build.patch
new file mode 100644
index 00000000000000..6b6ea4b32ba68a
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/fix-build.patch
@@ -0,0 +1,113 @@
+diff --git a/meson.build b/meson.build
+index 34a9d3d..7eba0ad 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,34 +82,40 @@ if cc.has_member('struct passwd', 'pw_expire', prefix : '#include <pwd.h>')
+   config_h.set('HAVE_STRUCT_PASSWD_PW_EXPIRE', 1)
+ endif
+ 
+-if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE')
+-  code = '''#define _GNU_SOURCE
+-  #include <stdio.h>
+-  #include <utmpx.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", WTMPX_FILENAME);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of WTMPX_FILENAME')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
+-elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+-  code = '''#include <paths.h>
+-  #include <stdio.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", _PATH_WTMPX);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of _PATH_WTMPX')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', '_PATH_WTMPX')
++path_wtmp = get_option('wtmp_file')
++if path_wtmp == ''
++  if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE') and meson.can_run_host_binaries()
++    code = '''#define _GNU_SOURCE
++    #include <stdio.h>
++    #include <utmpx.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", WTMPX_FILENAME);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of WTMPX_FILENAME')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
++  elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') and meson.can_run_host_binaries()
++    code = '''#include <paths.h>
++    #include <stdio.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", _PATH_WTMPX);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of _PATH_WTMPX')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', '_PATH_WTMPX')
++  else
++    assert(not meson.is_cross_build(), 'Cannot determine wtmp for this cross compile, please specify -Dwtmp_file=')
++    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)
++  endif
+ else
+-  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)
+ endif
+ 
+@@ -250,7 +256,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
++if get_option('tests') and meson.can_run_host_binaries()
++  subdir('tests')
++endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index 592e961..47297a6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,6 +1,7 @@
+ option('systemdsystemunitdir', type: 'string', value: '', description: 'custom directory for systemd system units')
+ option('gdmconffile', type: 'string', value: '/etc/gdm/custom.conf', description: 'GDM configuration file')
+ option('lightdmconffile', type: 'string', value: '/etc/lightdm/lightdm.conf', description: 'LightDM configuration file')
++option('wtmp_file', type: 'string', value: '', description: 'override filepath of wtmp file')
+ 
+ option('admin_group', type: 'string', value: '', description: 'Set group for administrative accounts')
+ option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of')
+@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: t
+ 
+ option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
++option('tests',   type: 'boolean', value: true, description: 'run accountservice tests if possible')
+diff --git a/tests/meson.build b/tests/meson.build
+index 854fea6..8928fff 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -46,7 +46,7 @@ if python3_test_modules_found
+         base_args = test_file
+         suite = ['accounts-service']
+ 
+-        r = run_command(unittest_inspector, test_file, check: true)
++        r = run_command(unittest_inspector, test_file, check: false)
+         unit_tests = r.stdout().strip().split('\n')
+ 
+         if r.returncode() == 0 and unit_tests.length() > 0
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
deleted file mode 100644
index 1d01e317331193..00000000000000
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Reason: fix build on musl
-Tidy up and send upstream soon...
---- 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
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..bc968fd5bdb15b 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,20 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ -Dwtmp_file=/var/log/wtmp $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)
+ python3-dbus python3-gobject python3-dbusmock"
+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"
@@ -23,8 +24,13 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 11433 bytes --]

From b3efbb64e06dd29f7f5f039c8250a2936900c894 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch |  39 ++++++
 .../accountsservice/patches/fix-build.patch   | 113 ++++++++++++++++++
 .../accountsservice/patches/meson-0.61.patch  |  29 -----
 .../accountsservice/patches/musl-wtmp.patch   |  15 ---
 srcpkgs/accountsservice/template              |  24 ++--
 5 files changed, 167 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 create mode 100644 srcpkgs/accountsservice/patches/fix-build.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/accountsservice/patches/musl-wtmp.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
diff --git a/srcpkgs/accountsservice/patches/fix-build.patch b/srcpkgs/accountsservice/patches/fix-build.patch
new file mode 100644
index 00000000000000..0211a806132543
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/fix-build.patch
@@ -0,0 +1,113 @@
+diff --git a/meson.build b/meson.build
+index 34a9d3d..7eba0ad 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,34 +82,40 @@ if cc.has_member('struct passwd', 'pw_expire', prefix : '#include <pwd.h>')
+   config_h.set('HAVE_STRUCT_PASSWD_PW_EXPIRE', 1)
+ endif
+ 
+-if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE')
+-  code = '''#define _GNU_SOURCE
+-  #include <stdio.h>
+-  #include <utmpx.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", WTMPX_FILENAME);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of WTMPX_FILENAME')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
+-elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+-  code = '''#include <paths.h>
+-  #include <stdio.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", _PATH_WTMPX);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of _PATH_WTMPX')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', '_PATH_WTMPX')
++path_wtmp = get_option('wtmp_file')
++if path_wtmp == ''
++  if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE') and meson.can_run_host_binaries()
++    code = '''#define _GNU_SOURCE
++    #include <stdio.h>
++    #include <utmpx.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", WTMPX_FILENAME);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of WTMPX_FILENAME')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
++  elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') and meson.can_run_host_binaries()
++    code = '''#include <paths.h>
++    #include <stdio.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", _PATH_WTMPX);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of _PATH_WTMPX')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', '_PATH_WTMPX')
++  else
++    assert(not meson.is_cross_build(), 'Cannot determine wtmp for this cross compile, please specify -Dwtmp_file=')
++    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)
++  endif
+ else
+-  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)
+ endif
+ 
+@@ -250,7 +256,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
++if get_option('tests') and meson.can_run_host_binaries()
++  subdir('tests')
++endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index 592e961..47297a6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,6 +1,7 @@
+ option('systemdsystemunitdir', type: 'string', value: '', description: 'custom directory for systemd system units')
+ option('gdmconffile', type: 'string', value: '/etc/gdm/custom.conf', description: 'GDM configuration file')
+ option('lightdmconffile', type: 'string', value: '/etc/lightdm/lightdm.conf', description: 'LightDM configuration file')
++option('wtmpfile', type: 'string', value: '', description: 'override filepath of wtmp file')
+ 
+ option('admin_group', type: 'string', value: '', description: 'Set group for administrative accounts')
+ option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of')
+@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: t
+ 
+ option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
++option('tests',   type: 'boolean', value: true, description: 'run accountservice tests if possible')
+diff --git a/tests/meson.build b/tests/meson.build
+index 854fea6..8928fff 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -46,7 +46,7 @@ if python3_test_modules_found
+         base_args = test_file
+         suite = ['accounts-service']
+ 
+-        r = run_command(unittest_inspector, test_file, check: true)
++        r = run_command(unittest_inspector, test_file, check: false)
+         unit_tests = r.stdout().strip().split('\n')
+ 
+         if r.returncode() == 0 and unit_tests.length() > 0
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
deleted file mode 100644
index 1d01e317331193..00000000000000
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Reason: fix build on musl
-Tidy up and send upstream soon...
---- 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
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..bd4045d671cd3b 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,20 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ -Dwtmpfile=/var/log/wtmp $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)
+ python3-dbus python3-gobject python3-dbusmock"
+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"
@@ -23,8 +24,13 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 11431 bytes --]

From 7e230c3bca1cc5458865ef6ca1fcf2d85ec9278f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch |  39 ++++++
 .../accountsservice/patches/fix-build.patch   | 113 ++++++++++++++++++
 .../accountsservice/patches/meson-0.61.patch  |  29 -----
 .../accountsservice/patches/musl-wtmp.patch   |  15 ---
 srcpkgs/accountsservice/template              |  24 ++--
 5 files changed, 167 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 create mode 100644 srcpkgs/accountsservice/patches/fix-build.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/accountsservice/patches/musl-wtmp.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
diff --git a/srcpkgs/accountsservice/patches/fix-build.patch b/srcpkgs/accountsservice/patches/fix-build.patch
new file mode 100644
index 00000000000000..189bb22565ee47
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/fix-build.patch
@@ -0,0 +1,113 @@
+diff --git a/meson.build b/meson.build
+index 34a9d3d..7eba0ad 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,34 +82,40 @@ if cc.has_member('struct passwd', 'pw_expire', prefix : '#include <pwd.h>')
+   config_h.set('HAVE_STRUCT_PASSWD_PW_EXPIRE', 1)
+ endif
+ 
+-if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE')
+-  code = '''#define _GNU_SOURCE
+-  #include <stdio.h>
+-  #include <utmpx.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", WTMPX_FILENAME);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of WTMPX_FILENAME')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
+-elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+-  code = '''#include <paths.h>
+-  #include <stdio.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", _PATH_WTMPX);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of _PATH_WTMPX')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', '_PATH_WTMPX')
++path_wtmp = get_option('wtmpfile')
++if path_wtmp == ''
++  if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE') and meson.can_run_host_binaries()
++    code = '''#define _GNU_SOURCE
++    #include <stdio.h>
++    #include <utmpx.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", WTMPX_FILENAME);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of WTMPX_FILENAME')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
++  elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') and meson.can_run_host_binaries()
++    code = '''#include <paths.h>
++    #include <stdio.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", _PATH_WTMPX);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of _PATH_WTMPX')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', '_PATH_WTMPX')
++  else
++    assert(not meson.is_cross_build(), 'Cannot determine wtmp for this cross compile, please specify -Dwtmpfile=')
++    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)
++  endif
+ else
+-  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)
+ endif
+ 
+@@ -250,7 +256,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
++if get_option('tests') and meson.can_run_host_binaries()
++  subdir('tests')
++endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index 592e961..47297a6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,6 +1,7 @@
+ option('systemdsystemunitdir', type: 'string', value: '', description: 'custom directory for systemd system units')
+ option('gdmconffile', type: 'string', value: '/etc/gdm/custom.conf', description: 'GDM configuration file')
+ option('lightdmconffile', type: 'string', value: '/etc/lightdm/lightdm.conf', description: 'LightDM configuration file')
++option('wtmpfile', type: 'string', value: '', description: 'override filepath of wtmp file')
+ 
+ option('admin_group', type: 'string', value: '', description: 'Set group for administrative accounts')
+ option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of')
+@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: t
+ 
+ option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
++option('tests',   type: 'boolean', value: true, description: 'run accountservice tests if possible')
+diff --git a/tests/meson.build b/tests/meson.build
+index 854fea6..8928fff 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -46,7 +46,7 @@ if python3_test_modules_found
+         base_args = test_file
+         suite = ['accounts-service']
+ 
+-        r = run_command(unittest_inspector, test_file, check: true)
++        r = run_command(unittest_inspector, test_file, check: false)
+         unit_tests = r.stdout().strip().split('\n')
+ 
+         if r.returncode() == 0 and unit_tests.length() > 0
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
deleted file mode 100644
index 1d01e317331193..00000000000000
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Reason: fix build on musl
-Tidy up and send upstream soon...
---- 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
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..bd4045d671cd3b 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,20 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ -Dwtmpfile=/var/log/wtmp $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)
+ python3-dbus python3-gobject python3-dbusmock"
+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"
@@ -23,8 +24,13 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 12175 bytes --]

From 8d551a4cb762b1870eb74f1b4844b199487947a2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch |  39 +++++
 .../accountsservice/patches/fix-build.patch   | 140 ++++++++++++++++++
 .../accountsservice/patches/meson-0.61.patch  |  29 ----
 .../accountsservice/patches/musl-wtmp.patch   |  15 --
 srcpkgs/accountsservice/template              |  24 +--
 5 files changed, 194 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 create mode 100644 srcpkgs/accountsservice/patches/fix-build.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/accountsservice/patches/musl-wtmp.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
diff --git a/srcpkgs/accountsservice/patches/fix-build.patch b/srcpkgs/accountsservice/patches/fix-build.patch
new file mode 100644
index 00000000000000..2e193aee560df5
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/fix-build.patch
@@ -0,0 +1,140 @@
+From 00b6e12ad4044d33cc54c71c75773c5a653dad09 Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Sun, 9 Feb 2025 23:24:08 -0800
+Subject: [PATCH 1/2] build: Disable tests when cross compiling and allow
+ specifying path_wtmp
+
+---
+ meson.build       | 64 ++++++++++++++++++++++++++---------------------
+ meson_options.txt |  2 ++
+ 2 files changed, 38 insertions(+), 28 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 34a9d3d..7bfaf8c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,34 +82,40 @@ if cc.has_member('struct passwd', 'pw_expire', prefix : '#include <pwd.h>')
+   config_h.set('HAVE_STRUCT_PASSWD_PW_EXPIRE', 1)
+ endif
+ 
+-if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE')
+-  code = '''#define _GNU_SOURCE
+-  #include <stdio.h>
+-  #include <utmpx.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", WTMPX_FILENAME);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of WTMPX_FILENAME')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
+-elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+-  code = '''#include <paths.h>
+-  #include <stdio.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", _PATH_WTMPX);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of _PATH_WTMPX')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', '_PATH_WTMPX')
++path_wtmp = get_option('wtmpfile')
++if path_wtmp == ''
++  if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE') and meson.can_run_host_binaries()
++    code = '''#define _GNU_SOURCE
++    #include <stdio.h>
++    #include <utmpx.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", WTMPX_FILENAME);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of WTMPX_FILENAME')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
++  elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') and meson.can_run_host_binaries()
++    code = '''#include <paths.h>
++    #include <stdio.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", _PATH_WTMPX);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of _PATH_WTMPX')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', '_PATH_WTMPX')
++  else
++    assert(not meson.is_cross_build(), 'Cannot determine wtmp for this cross compile, please specify -Dwtmpfile=')
++    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)
++  endif
+ else
+-  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)
+ endif
+ 
+@@ -250,7 +256,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
++if get_option('tests') and meson.can_run_host_binaries()
++  subdir('tests')
++endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index 592e961..5524ea0 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,6 +1,7 @@
+ option('systemdsystemunitdir', type: 'string', value: '', description: 'custom directory for systemd system units')
+ option('gdmconffile', type: 'string', value: '/etc/gdm/custom.conf', description: 'GDM configuration file')
+ option('lightdmconffile', type: 'string', value: '/etc/lightdm/lightdm.conf', description: 'LightDM configuration file')
++option('wtmpfile', type: 'string', value: '', description: 'override filepath of wtmp file')
+ 
+ option('admin_group', type: 'string', value: '', description: 'Set group for administrative accounts')
+ option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of')
+@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: t
+ 
+ option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
++option('tests',   type: 'boolean', value: true, description: 'run accountservice tests if possible')
+-- 
+GitLab
+
+
+From 0095351cbf8cd2b26db19bf95e615070df8b4eeb Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Mon, 10 Feb 2025 00:11:34 -0800
+Subject: [PATCH 2/2] build: Fix skipping tests when they are unable to be run
+
+---
+ tests/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 854fea6..8928fff 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -46,7 +46,7 @@ if python3_test_modules_found
+         base_args = test_file
+         suite = ['accounts-service']
+ 
+-        r = run_command(unittest_inspector, test_file, check: true)
++        r = run_command(unittest_inspector, test_file, check: false)
+         unit_tests = r.stdout().strip().split('\n')
+ 
+         if r.returncode() == 0 and unit_tests.length() > 0
+-- 
+GitLab
+
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
deleted file mode 100644
index 1d01e317331193..00000000000000
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Reason: fix build on musl
-Tidy up and send upstream soon...
---- 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
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..bd4045d671cd3b 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,20 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ -Dwtmpfile=/var/log/wtmp $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)
+ python3-dbus python3-gobject python3-dbusmock"
+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"
@@ -23,8 +24,13 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

Re: [PR PATCH] [Updated] accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1373 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages accountservice
https://github.com/void-linux/void-packages/pull/54270

accountservice: update to 23.13.9.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Changes submitted upstream: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/163

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/54270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-accountservice-54270.patch --]
[-- Type: text/x-diff, Size: 12282 bytes --]

From 7c6d959d8aa09cfcc5de230b528f449917ab2d6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 9 Feb 2025 21:54:18 -0800
Subject: [PATCH] accountservice: update to 23.13.9.

---
 ...65b77b583da06bcd1e8da4c1bed74129895a.patch |  39 +++++
 .../accountsservice/patches/fix-build.patch   | 142 ++++++++++++++++++
 .../accountsservice/patches/meson-0.61.patch  |  29 ----
 .../accountsservice/patches/musl-wtmp.patch   |  15 --
 srcpkgs/accountsservice/template              |  24 +--
 5 files changed, 196 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
 create mode 100644 srcpkgs/accountsservice/patches/fix-build.patch
 delete mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/accountsservice/patches/musl-wtmp.patch

diff --git a/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
new file mode 100644
index 00000000000000..beb551b5bb5722
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/ad0365b77b583da06bcd1e8da4c1bed74129895a.patch
@@ -0,0 +1,39 @@
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
diff --git a/srcpkgs/accountsservice/patches/fix-build.patch b/srcpkgs/accountsservice/patches/fix-build.patch
new file mode 100644
index 00000000000000..662ce0eb005744
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/fix-build.patch
@@ -0,0 +1,142 @@
+Submitted upstream: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/163
+
+From 00b6e12ad4044d33cc54c71c75773c5a653dad09 Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Sun, 9 Feb 2025 23:24:08 -0800
+Subject: [PATCH 1/2] build: Disable tests when cross compiling and allow
+ specifying path_wtmp
+
+---
+ meson.build       | 64 ++++++++++++++++++++++++++---------------------
+ meson_options.txt |  2 ++
+ 2 files changed, 38 insertions(+), 28 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 34a9d3d..7bfaf8c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,34 +82,40 @@ if cc.has_member('struct passwd', 'pw_expire', prefix : '#include <pwd.h>')
+   config_h.set('HAVE_STRUCT_PASSWD_PW_EXPIRE', 1)
+ endif
+ 
+-if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE')
+-  code = '''#define _GNU_SOURCE
+-  #include <stdio.h>
+-  #include <utmpx.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", WTMPX_FILENAME);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of WTMPX_FILENAME')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
+-elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+-  code = '''#include <paths.h>
+-  #include <stdio.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", _PATH_WTMPX);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of _PATH_WTMPX')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', '_PATH_WTMPX')
++path_wtmp = get_option('wtmpfile')
++if path_wtmp == ''
++  if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE') and meson.can_run_host_binaries()
++    code = '''#define _GNU_SOURCE
++    #include <stdio.h>
++    #include <utmpx.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", WTMPX_FILENAME);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of WTMPX_FILENAME')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
++  elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') and meson.can_run_host_binaries()
++    code = '''#include <paths.h>
++    #include <stdio.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", _PATH_WTMPX);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of _PATH_WTMPX')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', '_PATH_WTMPX')
++  else
++    assert(not meson.is_cross_build(), 'Cannot determine wtmp for this cross compile, please specify -Dwtmpfile=')
++    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)
++  endif
+ else
+-  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)
+ endif
+ 
+@@ -250,7 +256,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
++if get_option('tests') and meson.can_run_host_binaries()
++  subdir('tests')
++endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index 592e961..5524ea0 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,6 +1,7 @@
+ option('systemdsystemunitdir', type: 'string', value: '', description: 'custom directory for systemd system units')
+ option('gdmconffile', type: 'string', value: '/etc/gdm/custom.conf', description: 'GDM configuration file')
+ option('lightdmconffile', type: 'string', value: '/etc/lightdm/lightdm.conf', description: 'LightDM configuration file')
++option('wtmpfile', type: 'string', value: '', description: 'override filepath of wtmp file')
+ 
+ option('admin_group', type: 'string', value: '', description: 'Set group for administrative accounts')
+ option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of')
+@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: t
+ 
+ option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
++option('tests',   type: 'boolean', value: true, description: 'run accountservice tests if possible')
+-- 
+GitLab
+
+
+From 0095351cbf8cd2b26db19bf95e615070df8b4eeb Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Mon, 10 Feb 2025 00:11:34 -0800
+Subject: [PATCH 2/2] build: Fix skipping tests when they are unable to be run
+
+---
+ tests/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 854fea6..8928fff 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -46,7 +46,7 @@ if python3_test_modules_found
+         base_args = test_file
+         suite = ['accounts-service']
+ 
+-        r = run_command(unittest_inspector, test_file, check: true)
++        r = run_command(unittest_inspector, test_file, check: false)
+         unit_tests = r.stdout().strip().split('\n')
+ 
+         if r.returncode() == 0 and unit_tests.length() > 0
+-- 
+GitLab
+
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
deleted file mode 100644
index 1d01e317331193..00000000000000
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Reason: fix build on musl
-Tidy up and send upstream soon...
---- 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
-
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index bd349b359d260b..bd4045d671cd3b 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,19 +1,20 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.55
-revision=3
+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=/usr/lib/systemd/system
+ -Dwtmpfile=/var/log/wtmp $(vopt_bool gir introspection)"
+hostmakedepends="glib-devel pkg-config polkit gettext $(vopt_if gir vala)
+ python3-dbus python3-gobject python3-dbusmock"
+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"
@@ -23,8 +24,13 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 fi
 
 # Package build options
-build_options="elogind gir"
-build_options_default="elogind gir"
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	# Assumes system locale is en_IE
+	vsed -e 's/test_languages/disabled_test_languages/g' -i tests/test-daemon.py
+}
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

Re: [PR PATCH] [Merged]: accountservice: update to 23.13.9.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1210 bytes --]

There's a merged pull request on the void-packages repository

accountservice: update to 23.13.9.
https://github.com/void-linux/void-packages/pull/54270

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Changes submitted upstream: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/163

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->