| 1 |
commit: c9523ed2280ff58ffa50c8742e26f1185105509b |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 03:06:55 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 03:06:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9523ed2 |
| 7 |
|
| 8 |
sys-apps/accountsservice: fix build with meson 0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831465 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../accountsservice-0.6.55-r1.ebuild | 3 ++- |
| 14 |
.../accountsservice-0.6.55-meson-0.61-build.patch | 23 ++++++++++++++++++++++ |
| 15 |
2 files changed, 25 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild |
| 18 |
index 9c0dcab956dd..04cf8d0705b8 100644 |
| 19 |
--- a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild |
| 20 |
+++ b/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 2011-2021 Gentoo Authors |
| 23 |
+# Copyright 2011-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
@@ -43,6 +43,7 @@ RDEPEND="${CDEPEND} |
| 28 |
|
| 29 |
PATCHES=( |
| 30 |
"${FILESDIR}"/${PN}-0.6.35-gentoo-system-users.patch |
| 31 |
+ "${FILESDIR}"/${P}-meson-0.61-build.patch |
| 32 |
) |
| 33 |
|
| 34 |
src_configure() { |
| 35 |
|
| 36 |
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 |
| 37 |
new file mode 100644 |
| 38 |
index 000000000000..d56f4b7e63b8 |
| 39 |
--- /dev/null |
| 40 |
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch |
| 41 |
@@ -0,0 +1,23 @@ |
| 42 |
+https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch |
| 43 |
+https://bugs.gentoo.org/831465 |
| 44 |
+ |
| 45 |
+From: Luca Boccassi <bluca@××××××.org> |
| 46 |
+Date: Sun, 31 Oct 2021 12:29:14 +0000 |
| 47 |
+Subject: [PATCH] Fix build with meson 0.60 |
| 48 |
+ |
| 49 |
+Positional parameters to merge_file() were never allowed and always |
| 50 |
+ignored, so just drop it. |
| 51 |
+See: https://github.com/mesonbuild/meson/issues/9441 |
| 52 |
+ |
| 53 |
+Fixes #97 |
| 54 |
+--- a/data/meson.build |
| 55 |
++++ b/data/meson.build |
| 56 |
+@@ -33,7 +33,6 @@ configure_file( |
| 57 |
+ policy = act_namespace.to_lower() + '.policy' |
| 58 |
+ |
| 59 |
+ i18n.merge_file( |
| 60 |
+- policy, |
| 61 |
+ input: policy + '.in', |
| 62 |
+ output: policy, |
| 63 |
+ po_dir: po_dir, |
| 64 |
+GitLab |
Archives