From 51d11b34aa15d69db2c3c98ed5d461860bdb2a38 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:28:32 +0100 Subject: [PATCH] gnome-settings-daemon: fix for meson 0.61 --- .../patches/meson-0.61.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch new file mode 100644 index 00000000000..b7c03ca2da6 --- /dev/null +++ b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch @@ -0,0 +1,38 @@ +From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001 +From: Marvin Schmidt +Date: Wed, 26 Jan 2022 23:08:58 +0100 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. +--- + plugins/power/meson.build | 1 - + plugins/wacom/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/plugins/power/meson.build b/plugins/power/meson.build +index 69e619f2..014bb6da 100644 +--- 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, +diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build +index d8dd0ec7..c00323d4 100644 +--- 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 +