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
|
https://gitlab.gnome.org/GNOME/frogr/-/merge_requests/5
https://bugs.gentoo.org/831497
From 1eeb32b94b9e14e7ea2b9267e3378bae9e3e852d Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 12:22:25 +0000
Subject: [PATCH] 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:32:0: ERROR: Function does not take positional arguments.
data/meson.build:42:0: ERROR: Function does not take positional arguments.
--- a/data/meson.build
+++ b/data/meson.build
@@ -29,7 +29,7 @@ data_conf.set('BINDIR', join_paths(prefix, bindir))
generated_desktop = configure_file(input: 'org.gnome.frogr.desktop.in.in',
output: 'org.gnome.frogr.desktop.in',
configuration: data_conf)
-i18n.merge_file('desktop',
+i18n.merge_file(
input: generated_desktop,
output: 'org.gnome.frogr.desktop',
install: true,
@@ -39,7 +39,7 @@ i18n.merge_file('desktop',
# Appdata XML file
appdatadir = join_paths(datadir, 'metainfo')
-i18n.merge_file('appdata',
+i18n.merge_file(
input: 'org.gnome.frogr.appdata.xml.in',
output: 'org.gnome.frogr.appdata.xml',
install: true,
GitLab
|
