summaryrefslogtreecommitdiff
path: root/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch')
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch32
1 files changed, 32 insertions, 0 deletions
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@vasilek.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