new file mode 100644
@@ -0,0 +1,29 @@
+From bedec82615ca6858c3e9494650a5bbf33c710ebb Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+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
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 4987937..ed0e2c4 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -29,7 +29,6 @@ configure_file(
+ policy = act_namespace.to_lower() + '.policy'
+
+ i18n.merge_file(
+- policy,
+ input: policy + '.in',
+ output: policy,
+ po_dir: po_dir,
@@ -1,10 +1,7 @@
-From 2a1c7103839c20df5ca9ce2fa863535d802f8f3a Mon Sep 17 00:00:00 2001
+From ff0718174faf1167fb4765ebe4bd280bbe8d2ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 8 Dec 2019 23:42:00 +0100
Subject: [PATCH] musl: Hack to fix configure
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
---
meson.build | 10 ++++++++--
@@ -31,6 +28,3 @@ index 4465a26..726c9fe 100644
endif
# compiler flags
-2.21.0
-
@@ -1,4 +1,4 @@
-From 820249ea8e38c568e6a36fbd9c852718c7665b56 Mon Sep 17 00:00:00 2001
+From 7401e682400df87f3258f795bb1d143f64a35a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 9 Dec 2019 00:12:08 +0100
Subject: [PATCH] musl: add missing fgetspent_r
@@ -6,6 +6,7 @@ Subject: [PATCH] musl: add missing fgetspent_r
Stolen from void-linux
Upstream-Status: Inappropriate [musl-specific]
+
---
src/daemon.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
@@ -41,6 +42,3 @@ index c52bda3..a7676fe 100644
static struct passwd *
entry_generator_fgetpwent (Daemon *daemon,
GHashTable *users,
-2.21.0
-
@@ -12,7 +12,9 @@ inherit meson gobject-introspection gtk-doc features_check systemd
REQUIRED_DISTRO_FEATURES = "polkit"
-SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
+ file://0001-Fix-build-with-meson-0.60.patch \
+ "
SRC_URI:append:libc-musl = " \
file://0001-musl-Hack-to-fix-build.patch \
file://0002-musl-add-missing-fgetspent_r.patch \
Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- .../0001-Fix-build-with-meson-0.60.patch | 29 +++++++++++++++++++ .../0001-musl-Hack-to-fix-build.patch | 8 +---- .../0002-musl-add-missing-fgetspent_r.patch | 6 ++-- .../accountsservice/accountsservice_0.6.55.bb | 4 ++- 4 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch