gnome-mahjongg: fix for meson 0.61

This commit is contained in:
Michal Vasilek 2022-03-09 18:14:37 +01:00
parent 9c3c534ec8
commit 4352a8fce7

View file

@ -0,0 +1,37 @@
From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 11:22:48 +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:24:0: ERROR: Function does not take positional arguments.
data/meson.build:45:0: ERROR: Function does not take positional arguments.
---
data/meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 8740503..edb8583 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
desktop_file = i18n.merge_file (
- 'desktop-file',
input: 'org.gnome.Mahjongg.desktop.in',
output: 'org.gnome.Mahjongg.desktop',
install: true,
@@ -41,7 +40,7 @@ if desktop_file_validate.found()
)
endif
-appdata_file = i18n.merge_file ('appdata-file',
+appdata_file = i18n.merge_file (
input: 'org.gnome.Mahjongg.appdata.xml.in',
output: 'org.gnome.Mahjongg.appdata.xml',
install: true,
--
GitLab