From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 12:11:57 +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:15:0: ERROR: Function does not take positional arguments.
data/meson.build:27: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 026bd80..3b03b94 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,7 +13,6 @@ desktop_in = configure_file(
 )
 
 i18n.merge_file(
-  desktop,
   type: 'desktop',
   input: desktop_in,
   output: '@BASENAME@',
@@ -25,7 +24,6 @@ i18n.merge_file(
 appdata = df_namespace + '.appdata.xml'
 
 i18n.merge_file(
-  appdata,
   input: appdata + '.in',
   output: '@BASENAME@',
   po_dir: po_dir,
-- 
GitLab

'sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>refs</a><a class='active' href='/guix/log/gnu/packages/patches/emacs-json-reformat-fix-tests.patch'>log</a><a href='/guix/tree/gnu/packages/patches/emacs-json-reformat-fix-tests.patch?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>tree</a><a href='/guix/commit/gnu/packages/patches/emacs-json-reformat-fix-tests.patch?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>commit</a><a href='/guix/diff/gnu/packages/patches/emacs-json-reformat-fix-tests.patch?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/emacs-json-reformat-fix-tests.patch'>
<input type='hidden' name='id' value='8eefb81b773a400f49d79410656f72ff2bbc1602'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>root</a>/<a href='/guix/log/gnu?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>gnu</a>/<a href='/guix/log/gnu/packages?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>patches</a>/<a href='/guix/log/gnu/packages/patches/emacs-json-reformat-fix-tests.patch?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>emacs-json-reformat-fix-tests.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/emacs-json-reformat-fix-tests.patch?id=8eefb81b773a400f49d79410656f72ff2bbc1602&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>