tilix: fix for meson 0.61

This commit is contained in:
Michal Vasilek 2022-03-26 14:28:48 +01:00
parent 3aa45ee737
commit 373449a57b

View file

@ -0,0 +1,33 @@
From 7cb2c59a31891f6463d1b181f1ec461c9352d782 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Tue, 22 Feb 2022 12:06:23 +0000
Subject: [PATCH] meson: drop unused argument for i18n.merge_file() (#2081)
Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
data/meson.build:13:0: ERROR: Function does not take positional arguments.
data/meson.build:46:0: ERROR: Function does not take positional arguments.
---
data/meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 81e9b410..c8b23e1b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -11,7 +11,6 @@ install_data(
# Install the desktop file
desktop_file = i18n.merge_file(
- '@0@.desktop'.format(project_id),
output: '@BASENAME@',
input: 'pkg/desktop/@0@.desktop.in'.format(project_id),
po_dir: meson.source_root() / 'po',
@@ -44,7 +43,6 @@ metainfo_with_releases = custom_target('metainfo-news-merge',
# Install the MetaInfo file
metainfo_file = i18n.merge_file(
- tilix_metainfo_name,
output: tilix_metainfo_name,
input: metainfo_with_releases,
po_dir: meson.source_root() / 'po',