| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 1 | Upstream-Status: Backport |
| 2 | |
| 3 | Fixes "../gvfs-1.49.1/daemon/meson.build:362:7: ERROR: Function does not take positional arguments. |
| 4 | |
| 5 | Signed-off-by: Markus Volk f_l_k@t-online.de |
| 6 | |
| 7 | From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001 |
| 8 | From: Ondrej Holy <oholy@redhat.com> |
| 9 | Date: Fri, 21 Jan 2022 08:32:31 +0100 |
| 10 | Subject: [PATCH] build: Remove incorrect i18n.merge_file argument |
| 11 | |
| 12 | The positional argument was being silently ignored until meson 0.60.0 where |
| 13 | it fails with "ERROR: Function does not take positional arguments". |
| 14 | |
| 15 | Related: https://github.com/mesonbuild/meson/issues/9441 |
| 16 | Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 |
| 17 | --- |
| 18 | daemon/meson.build | 1 - |
| 19 | 1 file changed, 1 deletion(-) |
| 20 | |
| 21 | diff --git a/daemon/meson.build b/daemon/meson.build |
| 22 | index 5f9559aa..e20ada29 100644 |
| 23 | --- a/daemon/meson.build |
| 24 | +++ b/daemon/meson.build |
| 25 | @@ -360,7 +360,6 @@ if enable_admin |
| 26 | policy = gvfs_namespace + '.file-operations.policy' |
| 27 | |
| 28 | i18n.merge_file( |
| 29 | - policy, |
| 30 | input: configure_file( |
| 31 | input: policy + '.in.in', |
| 32 | output: '@BASENAME@', |
| 33 | -- |
| 34 | |