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
|
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 11:22:48 +0000
Subject: meson: drop unused argument for i18n.merge_file()
Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
data/meson.build:24:0: ERROR: Function does not take positional arguments.
data/meson.build:45:0: ERROR: Function does not take positional arguments.
(cherry picked from commit a2037b0747163601a5d5b57856d037eecf3a4db7)
---
data/meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 8142127..a1e5c96 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -22,7 +22,6 @@ install_data ('smooth.png', install_dir: join_paths (pkgdatadir, 'themes'))
install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
desktop_file = i18n.merge_file (
- 'desktop-file',
input: 'org.gnome.Mahjongg.desktop.in',
output: 'org.gnome.Mahjongg.desktop',
install: true,
@@ -42,7 +41,7 @@ if desktop_file_validate.found()
)
endif
-appdata_file = i18n.merge_file ('appdata-file',
+appdata_file = i18n.merge_file (
input: 'org.gnome.Mahjongg.appdata.xml.in',
output: 'org.gnome.Mahjongg.appdata.xml',
install: true,
|
