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

le class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=43d84e8e74db4f3afc69dc48b4d39401f2a9a04e'>refs</a><a class='active' href='/guix/log/doc/htmlxref.cnf'>log</a><a href='/guix/tree/doc/htmlxref.cnf?id=43d84e8e74db4f3afc69dc48b4d39401f2a9a04e'>tree</a><a href='/guix/commit/doc/htmlxref.cnf?id=43d84e8e74db4f3afc69dc48b4d39401f2a9a04e'>commit</a><a href='/guix/diff/doc/htmlxref.cnf?id=43d84e8e74db4f3afc69dc48b4d39401f2a9a04e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/htmlxref.cnf'>
<input type='hidden' name='id' value='43d84e8e74db4f3afc69dc48b4d39401f2a9a04e'/><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=43d84e8e74db4f3afc69dc48b4d39401f2a9a04e'>root</a>/<a href='/guix/log/doc?id=43d84e8e74db4f3afc69dc48b4d39401f2a9a04e'>doc</a>/<a href='/guix/log/doc/htmlxref.cnf?id=43d84e8e74db4f3afc69dc48b4d39401f2a9a04e'>htmlxref.cnf</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/doc/htmlxref.cnf?id=43d84e8e74db4f3afc69dc48b4d39401f2a9a04e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-18 16:01:32 +0100'>2022-12-18</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=8e2f32cee982d42a79e53fc1e9aa7b8ff0514714'>doc: Update URLs for the manual and cookbook translations.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-12-18 15:53:43 +0100'>2022-12-18</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=b77b4c7c3a5ac180f5aed0983be50ffbe6832f87'>doc: Add guile-netlink to 'htmlxref.cnf'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-08-05 00:14:29 +0200'>2022-08-05</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=f9a267c6d266355b48bd12288f4414eaf4db8b33'>doc: Fix Guix manual URLs in 'htmlxref.cnf'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-16 21:52:49 -0400'>2022-06-16</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=ec7a75034421654d2ece2ba20033b44d345547f0'>doc: Remove obsolete comment from htmlxref.cnf.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-04-08 19:59:25 +0200'>2022-04-08</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=868da34d54365023223a4ff7520043ba55ad64e8'>doc: Fix cookbook URLs in htmlxref.cnf.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-10-04 16:36:58 +0200'>2021-10-04</span></td><td><a href='/guix/commit/doc/htmlxref.cnf?id=1267c2e9efdb6e324ce1c7b1fcef242f8208a61f'>doc: Update htmlxref.cnf.</a><span class='msg-avail'>...</span></td><td>Sarah Morgensen</td></tr>