summaryrefslogtreecommitdiff
path: root/gnome-base/gvfs/files/meson-0.61.patch
blob: 20e03388d7c6023ccfd279b23b6d578454486de2 (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
https://bugs.gentoo.org/831840
https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/133

From 1522bf6a9741cf6f1fe16eaf50fd20af46882873 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
(cherry picked from commit 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0)
---
 daemon/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/daemon/meson.build b/daemon/meson.build
index dffeef3e..bdc506fe 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -366,7 +366,6 @@ if enable_admin
   )
 
   i18n.merge_file(
-    policy,
     input: policy_in,
     output: '@BASENAME@',
     po_dir: po_dir,
-- 
2.34.1