[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

[Sam James]

commit:     033c972e1840474b3e3aa3b734dbacda7e1e71c6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 22:51:38 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 22:51:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=033c972e

gnome-base/gnome-settings-daemon: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831431
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ome-settings-daemon-41.0-meson-0.61-build.patch | 32 ++++++++++++++++++++++
 .../gnome-settings-daemon-41.0.ebuild              |  1 +
 2 files changed, 33 insertions(+)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
new file mode 100644
index 000000000000..59aa0f433ae8
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
@@ -0,0 +1,32 @@
+https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281.patch
+https://bugs.gentoo.org/831431
+
+From d88484002b5a0c8d2adccb2a5886a7da0a247d27 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@×××××××.cz>
+Date: Fri, 14 Jan 2022 23:55:06 +0100
+Subject: [PATCH] build: remove positional i18n.merge_file arguments
+
+otherwise building with meson 0.61+ fails:
+
+    ERROR: Function does not take positional arguments.
+--- a/plugins/power/meson.build
++++ b/plugins/power/meson.build
+@@ -76,7 +76,6 @@ if host_is_linux
+   )
+ 
+   i18n.merge_file(
+-    policy,
+     input: policy_in,
+     output: policy,
+     po_dir: po_dir,
+--- a/plugins/wacom/meson.build
++++ b/plugins/wacom/meson.build
+@@ -7,7 +7,6 @@ policy_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy_in,
+   output: policy,
+   po_dir: po_dir,
+GitLab

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
index b0e196bea8d6..f5bbb821b4c3 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
@@ -93,6 +93,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
 	"${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
 	"${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch
+	"${FILESDIR}"/${P}-meson-0.61-build.patch
 )
 
 python_check_deps() {