wok-current view simple-scan/stuff/fix_meson.patch @ rev 25785
Mass rebuild after bump to glibc 2.31, add epson printer and scanner package
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Tue Jul 15 20:40:17 2025 +0000 (3 months ago) |
| parents | |
| children |
line source
1 From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001
2 From: r-value <i@rvalue.moe>
3 Date: Tue, 16 Nov 2021 02:43:11 +0800
4 Subject: [PATCH] Remove incorrect i18n.merge_file argument
6 The positional argument was being silently ignored until meson 0.60.0 where
7 it fails with "ERROR: Function does not take positional arguments".
8 ---
9 data/meson.build | 6 ++----
10 1 file changed, 2 insertions(+), 4 deletions(-)
12 diff --git a/data/meson.build b/data/meson.build
13 index 2b5a0ee3..cf6e4ae1 100644
14 --- a/data/meson.build
15 +++ b/data/meson.build
16 @@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
17 install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
18 meson.add_install_script ('meson_compile_gschema.py')
20 -i18n.merge_file ('desktop-file',
21 - input: 'simple-scan.desktop.in',
22 +i18n.merge_file (input: 'simple-scan.desktop.in',
23 output: 'simple-scan.desktop',
24 install: true,
25 install_dir: join_paths (datadir, 'applications'),
26 po_dir: '../po',
27 type: 'desktop')
29 -i18n.merge_file ('appdata-file',
30 - input: 'simple-scan.appdata.xml.in',
31 +i18n.merge_file (input: 'simple-scan.appdata.xml.in',
32 output: 'simple-scan.appdata.xml',
33 install: true,
34 install_dir: join_paths (datadir, 'metainfo'),
35 --
36 GitLab