[arch-commits] Commit in accountsservice/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Saturday, April 2, 2022 @ 16:54:10
  Author: heftig
Revision: 441275

archrelease: copy trunk to extra-x86_64

Added:
  accountsservice/repos/extra-x86_64/PKGBUILD
    (from rev 441274, accountsservice/trunk/PKGBUILD)
  accountsservice/repos/extra-x86_64/fix-tests.diff
    (from rev 441274, accountsservice/trunk/fix-tests.diff)
Deleted:
  accountsservice/repos/extra-x86_64/PKGBUILD

----------------+
 PKGBUILD       |  106 +++++++++++++++++++++++++++++--------------------------
 fix-tests.diff |   16 ++++++++
 2 files changed, 72 insertions(+), 50 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 16:54:01 UTC (rev 441274)
+++ PKGBUILD	2022-04-02 16:54:10 UTC (rev 441275)
@@ -1,50 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=accountsservice
-pkgver=22.08.8
-pkgrel=1
-pkgdesc="D-Bus interface for user account query and manipulation"
-url="https://gitlab.freedesktop.org/accountsservice/accountsservice"
-arch=(x86_64)
-license=(GPL3)
-depends=(glib2 polkit systemd shadow libxcrypt)
-makedepends=(gtk-doc gobject-introspection git meson docbook-xsl xmlto vala)
-checkdepends=(python-gobject python-dbusmock)
-_commit=1ef3add46983af875adfed5d29954cbfb184f688  # tags/22.08.8^0
-source=("git+https://gitlab.freedesktop.org/accountsservice/accountsservice.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-
-prepare() {
-  cd $pkgname
-}
-
-build() {
-  local meson_options=(
-    -D admin_group=wheel
-    -D docbook=true
-    -D gtk_doc=true
-  )
-
-  arch-meson $pkgname build "${meson_options[@]}"
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  depends+=(libg{lib,object,io}-2.0.so libsystemd.so libcrypt.so)
-  provides+=(libaccountsservice.so)
-
-  meson install -C build --destdir "$pkgdir"
-}
-
-# vim:set sw=2 et:

Copied: accountsservice/repos/extra-x86_64/PKGBUILD (from rev 441274, accountsservice/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-02 16:54:10 UTC (rev 441275)
@@ -0,0 +1,56 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=accountsservice
+pkgver=22.08.8
+pkgrel=2
+pkgdesc="D-Bus interface for user account query and manipulation"
+url="https://gitlab.freedesktop.org/accountsservice/accountsservice"
+arch=(x86_64)
+license=(GPL3)
+depends=(glib2 polkit systemd shadow libxcrypt)
+makedepends=(gtk-doc gobject-introspection git meson docbook-xsl xmlto vala)
+checkdepends=(python-gobject python-dbusmock)
+options=(debug)
+_commit=1ef3add46983af875adfed5d29954cbfb184f688  # tags/22.08.8^0
+source=("git+https://gitlab.freedesktop.org/accountsservice/accountsservice.git#commit=$_commit"
+        fix-tests.diff)
+sha256sums=('SKIP'
+            '2da027faae5e477ed9ff57e3fc3cb8cd607073835118a05dd7b86bb7ff7c47fd')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+
+prepare() {
+  cd $pkgname
+
+  # Tests are broken: https://github.com/martinpitt/python-dbusmock/issues/118
+  git apply -3 ../fix-tests.diff
+}
+
+build() {
+  local meson_options=(
+    -D admin_group=wheel
+    -D docbook=true
+    -D gtk_doc=true
+  )
+
+  arch-meson $pkgname build "${meson_options[@]}"
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  depends+=(libg{lib,object,io}-2.0.so libsystemd.so libcrypt.so)
+  provides+=(libaccountsservice.so)
+
+  meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 et:

Copied: accountsservice/repos/extra-x86_64/fix-tests.diff (from rev 441274, accountsservice/trunk/fix-tests.diff)
===================================================================
--- fix-tests.diff	                        (rev 0)
+++ fix-tests.diff	2022-04-02 16:54:10 UTC (rev 441275)
@@ -0,0 +1,16 @@
+diff --git i/tests/dbusmock/accounts_service.py w/tests/dbusmock/accounts_service.py
+index 81692b2..eabe12c 100644
+--- i/tests/dbusmock/accounts_service.py
++++ w/tests/dbusmock/accounts_service.py
+@@ -170,8 +170,9 @@ def CreateUser(self, name, fullname, account_type):
+ 
+     self.users_auto_uids += 1
+ 
+-    return self.AddUser(self.users_auto_uids, name, DEFAULT_USER_PASSWORD, {
+-        'RealName': fullname, 'AccountType': account_type})
++    return self.AddUser(self.users_auto_uids, name, DEFAULT_USER_PASSWORD,
++        dbus.Dictionary({'RealName': fullname, 'AccountType': account_type},
++            signature='sv'))
+ 
+ 
+ @dbus.service.method(MAIN_IFACE, in_signature='xb')