| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 56535d2f1ec64e847e5fbd0613e78bd0dc046519 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michal Vasilek <michal@vasilek.cz> |
| 3 | Date: Fri, 14 Jan 2022 23:55:06 +0100 |
| 4 | Subject: [PATCH] build: remove positional i18n.merge_file arguments |
| 5 | |
| 6 | otherwise building with meson 0.61+ fails: |
| 7 | |
| 8 | ERROR: Function does not take positional arguments. |
| 9 | |
| 10 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281] |
| 11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 12 | --- |
| 13 | plugins/power/meson.build | 1 - |
| 14 | plugins/wacom/meson.build | 1 - |
| 15 | 2 files changed, 2 deletions(-) |
| 16 | |
| 17 | diff --git a/plugins/power/meson.build b/plugins/power/meson.build |
| 18 | index 69e619f..014bb6d 100644 |
| 19 | --- a/plugins/power/meson.build |
| 20 | +++ b/plugins/power/meson.build |
| 21 | @@ -76,7 +76,6 @@ if host_is_linux |
| 22 | ) |
| 23 | |
| 24 | i18n.merge_file( |
| 25 | - policy, |
| 26 | input: policy_in, |
| 27 | output: policy, |
| 28 | po_dir: po_dir, |
| 29 | diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build |
| 30 | index d8dd0ec..c00323d 100644 |
| 31 | --- a/plugins/wacom/meson.build |
| 32 | +++ b/plugins/wacom/meson.build |
| 33 | @@ -7,7 +7,6 @@ policy_in = configure_file( |
| 34 | ) |
| 35 | |
| 36 | i18n.merge_file( |
| 37 | - policy, |
| 38 | input: policy_in, |
| 39 | output: policy, |
| 40 | po_dir: po_dir, |