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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
https://gitlab.gnome.org/GNOME/evince/-/commit/1060b24d051607f14220f148d2f7723b29897a54
https://bugs.gentoo.org/831853
From: r-value <i@rvalue.moe>
Date: Wed, 17 Nov 2021 18:22:45 +0800
Subject: [PATCH] Remove incorrect args for i18n.merge_file
`i18n.merge_file` has been ignoring positional arguments for
a time and explicitly rejects with error since meson 0.60.0
---
backend/meson.build | 1 -
data/meson.build | 1 -
meson.build | 1 -
3 files changed, 3 deletions(-)
diff --git a/backend/meson.build b/backend/meson.build
index e44c1d6d7..ab3df9acf 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
)
i18n.merge_file(
- appstream,
input: appstream_in,
output: appstream,
po_dir: po_dir,
diff --git a/data/meson.build b/data/meson.build
index 8a308b853..afc302098 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -15,7 +15,6 @@ foreach desktop: desktops
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/meson.build b/meson.build
index 34c86661f..f74efb3c4 100644
--- a/meson.build
+++ b/meson.build
@@ -492,7 +492,6 @@ install_headers(
appdata = ev_namespace + '.appdata.xml'
i18n.merge_file(
- appdata,
input: appdata + '.in',
output: appdata,
po_dir: po_dir,
--
GitLab
|
