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