| rev |
line source |
|
shann@25785
|
1 From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001
|
|
shann@25785
|
2 From: r-value <i@rvalue.moe>
|
|
shann@25785
|
3 Date: Tue, 16 Nov 2021 02:43:11 +0800
|
|
shann@25785
|
4 Subject: [PATCH] Remove incorrect i18n.merge_file argument
|
|
shann@25785
|
5
|
|
shann@25785
|
6 The positional argument was being silently ignored until meson 0.60.0 where
|
|
shann@25785
|
7 it fails with "ERROR: Function does not take positional arguments".
|
|
shann@25785
|
8 ---
|
|
shann@25785
|
9 data/meson.build | 6 ++----
|
|
shann@25785
|
10 1 file changed, 2 insertions(+), 4 deletions(-)
|
|
shann@25785
|
11
|
|
shann@25785
|
12 diff --git a/data/meson.build b/data/meson.build
|
|
shann@25785
|
13 index 2b5a0ee3..cf6e4ae1 100644
|
|
shann@25785
|
14 --- a/data/meson.build
|
|
shann@25785
|
15 +++ b/data/meson.build
|
|
shann@25785
|
16 @@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
|
|
shann@25785
|
17 install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
|
|
shann@25785
|
18 meson.add_install_script ('meson_compile_gschema.py')
|
|
shann@25785
|
19
|
|
shann@25785
|
20 -i18n.merge_file ('desktop-file',
|
|
shann@25785
|
21 - input: 'simple-scan.desktop.in',
|
|
shann@25785
|
22 +i18n.merge_file (input: 'simple-scan.desktop.in',
|
|
shann@25785
|
23 output: 'simple-scan.desktop',
|
|
shann@25785
|
24 install: true,
|
|
shann@25785
|
25 install_dir: join_paths (datadir, 'applications'),
|
|
shann@25785
|
26 po_dir: '../po',
|
|
shann@25785
|
27 type: 'desktop')
|
|
shann@25785
|
28
|
|
shann@25785
|
29 -i18n.merge_file ('appdata-file',
|
|
shann@25785
|
30 - input: 'simple-scan.appdata.xml.in',
|
|
shann@25785
|
31 +i18n.merge_file (input: 'simple-scan.appdata.xml.in',
|
|
shann@25785
|
32 output: 'simple-scan.appdata.xml',
|
|
shann@25785
|
33 install: true,
|
|
shann@25785
|
34 install_dir: join_paths (datadir, 'metainfo'),
|
|
shann@25785
|
35 --
|
|
shann@25785
|
36 GitLab
|
|
shann@25785
|
37
|