Codebase list gnome-sound-recorder / 259d39c
Cherry-pick patch from upstream to fix FTBFS "Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0." Closes: #1004615 Andreas Henriksson 2 years ago
2 changed file(s) with 38 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
0 From: Jan Beich <jbeich@FreeBSD.org>
1 Date: Mon, 24 Jan 2022 11:37:06 +0000
2 Subject: meson: drop unused argument for i18n.merge_file()
3
4 Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
5
6 data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
7 data/meson.build:16:0: ERROR: Function does not take positional arguments.
8 ---
9 data/appdata/meson.build | 1 -
10 data/meson.build | 1 -
11 2 files changed, 2 deletions(-)
12
13 diff --git a/data/appdata/meson.build b/data/appdata/meson.build
14 index 1f5744e..d2c2c3a 100644
15 --- a/data/appdata/meson.build
16 +++ b/data/appdata/meson.build
17 @@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
18 metainfo_conf.set('gettext-package', gettext_package)
19
20 metainfo_file = i18n.merge_file(
21 - 'metainfo-file',
22 input: configure_file(
23 input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
24 output: '@BASENAME@',
25 diff --git a/data/meson.build b/data/meson.build
26 index 44117ad..0ff8fa5 100644
27 --- a/data/meson.build
28 +++ b/data/meson.build
29 @@ -14,7 +14,6 @@ install_data(
30 desktop_conf = configuration_data()
31 desktop_conf.set('app-id', application_id)
32 desktop_file = i18n.merge_file(
33 - 'desktop',
34 input: configure_file(
35 input: 'org.gnome.SoundRecorder.desktop.in.in',
36 output: '@BASENAME@',
0 meson-drop-unused-argument-for-i18n.merge_file.patch