From 919030707d4cb8dd70a2a3ace6b68c135837457f Mon Sep 17 00:00:00 2001
From: iznogood <>
Date: Feb 09 2022 19:43:36 +0000
Subject: Update accountsservice to version 0.6.55 / rev 75 via SR 952657
https://build.opensuse.org/request/show/952657
by user iznogood + dimstar_suse
---
diff --git a/.files b/.files
index d21f5f9..e4654d1 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 3e64a5a..ccace07 100644
--- a/.rev
+++ b/.rev
@@ -1068,4 +1068,12 @@ By now, it's required for sle-15, so synchronized the updated specfile and chang
(forwarded request 929156 from iznogood)
929601
+
+ 68805ee302ea79c8d1cbdc76fa2fc95f
+ 0.6.55
+
+ dimstar_suse
+
+ 952657
+
diff --git a/ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch b/ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch
new file mode 100644
index 0000000..ce74862
--- /dev/null
+++ b/ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch
@@ -0,0 +1,29 @@
+From ac9b14f1c1bbca413987d0bbfeaad05804107e9a Mon Sep 17 00:00:00 2001
+From: Luca Boccassi
+Date: Sun, 31 Oct 2021 12:29:14 +0000
+Subject: [PATCH] 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,
+--
+GitLab
+
diff --git a/accountsservice.changes b/accountsservice.changes
index b820a33..791934e 100644
--- a/accountsservice.changes
+++ b/accountsservice.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Feb 1 09:20:24 UTC 2022 - Bjørn Lie
+
+- Add ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch: Fix build
+ with meson 0.61.0.
+
+-------------------------------------------------------------------
Thu Nov 4 10:39:37 UTC 2021 - Bjørn Lie
- Stop passing the no longer used nor recognized option
diff --git a/accountsservice.spec b/accountsservice.spec
index 6c3426f..864dd18 100644
--- a/accountsservice.spec
+++ b/accountsservice.spec
@@ -1,7 +1,7 @@
#
# spec file for package accountsservice
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -38,6 +38,8 @@ Patch3: accountsservice-wtmp-io-improvements.patch
Patch4: accountsservice-fix-gdm-crash.patch
# PATCH-FIX-OPENSUSE harden_accounts-daemon.service.patch jsegitz@suse.com -- For details please see https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
Patch5: harden_accounts-daemon.service.patch
+# PATCH-FIX-UPSTREAM ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch -- Fix build with meson 0.61.0
+Patch6: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch
## SLE and Leap only patches start at 1000
# PATCH-FEATURE-SLE as-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
@@ -106,6 +108,7 @@ querying and manipulating user account information.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# SLE and Leap patches start at 1000
%if 0%{?sle_version}