diff options
| -rw-r--r-- | sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild index 9c0dcab956dd..04cf8d0705b8 100644 --- a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild +++ b/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2021 Gentoo Authors +# Copyright 2011-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -43,6 +43,7 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-0.6.35-gentoo-system-users.patch + "${FILESDIR}"/${P}-meson-0.61-build.patch ) src_configure() { diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch b/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch new file mode 100644 index 000000000000..d56f4b7e63b8 --- /dev/null +++ b/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch @@ -0,0 +1,23 @@ +https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch +https://bugs.gentoo.org/831465 + +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 +--- 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 |