commit: 10f690c4c2a057e53af930d2a2598d977c708d6e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Mar 7 06:11:58 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 7 06:12:10 2022 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=10f690c4
sys-apps/accountsservice: sync with ::gentoo Bug: https://bugs.gentoo.org/831465 Signed-off-by: Sam James <sam <AT> gentoo.org> .../accountsservice/accountsservice-0.6.55.ebuild | 2 ++ .../accountsservice-0.6.55-meson-0.61-build.patch | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild index 7ba6e426..e1ebb8c4 100644 --- a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild +++ b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild @@ -19,6 +19,7 @@ REQUIRED_USE="^^ ( elogind systemd )" CDEPEND=" >=dev-libs/glib-2.44:2 sys-auth/polkit + virtual/libcrypt:= elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) @@ -42,6 +43,7 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-0.6.35-gentoo-system-users.patch + "${FILESDIR}"/${PN}-0.6.55-meson-0.61-build.patch ) src_prepare() { 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 00000000..d56f4b7e --- /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 <[email protected]> +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
