39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
|
|
From: Jan Beich <jbeich@FreeBSD.org>
|
|
Date: Mon, 24 Jan 2022 11:48:22 +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:37:0: ERROR: Function does not take positional arguments.
|
|
data/meson.build:59:0: ERROR: Function does not take positional arguments.
|
|
---
|
|
data/meson.build | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/data/meson.build b/data/meson.build
|
|
index bb77248..b881e8a 100644
|
|
--- a/data/meson.build
|
|
+++ b/data/meson.build
|
|
@@ -34,7 +34,7 @@ endif
|
|
|
|
# Desktop file
|
|
if get_option('build_gui')
|
|
- desktop_file = i18n.merge_file ('desktop-file',
|
|
+ desktop_file = i18n.merge_file (
|
|
input: project_id + '.desktop.in',
|
|
output: project_id + '.desktop',
|
|
install: true,
|
|
@@ -56,7 +56,7 @@ endif
|
|
|
|
# AppData file
|
|
if get_option('build_gui')
|
|
- appdata_file = i18n.merge_file ('appdata-file',
|
|
+ appdata_file = i18n.merge_file (
|
|
input: project_id + '.appdata.xml.in',
|
|
output: project_id + '.appdata.xml',
|
|
install: true,
|
|
--
|
|
GitLab
|
|
|