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

bs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=05cbfea0b294722da0b95736cc91cf771a3a9f2d'>refs</a><a class='active' href='/guix/log/gnu/ci.scm'>log</a><a href='/guix/tree/gnu/ci.scm?id=05cbfea0b294722da0b95736cc91cf771a3a9f2d'>tree</a><a href='/guix/commit/gnu/ci.scm?id=05cbfea0b294722da0b95736cc91cf771a3a9f2d'>commit</a><a href='/guix/diff/gnu/ci.scm?id=05cbfea0b294722da0b95736cc91cf771a3a9f2d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/ci.scm'>
<input type='hidden' name='id' value='05cbfea0b294722da0b95736cc91cf771a3a9f2d'/><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=05cbfea0b294722da0b95736cc91cf771a3a9f2d'>root</a>/<a href='/guix/log/gnu?id=05cbfea0b294722da0b95736cc91cf771a3a9f2d'>gnu</a>/<a href='/guix/log/gnu/ci.scm?id=05cbfea0b294722da0b95736cc91cf771a3a9f2d'>ci.scm</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/ci.scm?id=05cbfea0b294722da0b95736cc91cf771a3a9f2d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-01-01 15:23:24 +0100'>2022-01-01</span></td><td><a href='/guix/commit/gnu/ci.scm?id=6756c64a8f1a22f74ea3bcb8bfb00f229ad6f6c5'>ci: Add extra jobs for tunable packages.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-10 21:49:25 +0100'>2021-12-10</span></td><td><a href='/guix/commit/gnu/ci.scm?id=32750e8c3ed38df4cafb39cffa878c6851abc899'>Merge remote-tracking branch 'signed/master' into core-updates</a></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-12-06 10:56:01 +0100'>2021-12-06</span></td><td><a href='/guix/commit/gnu/ci.scm?id=93e9f0bc7fc97db7b9e31477858ef7cb2ce01c90'>ci: Cross-build the 'guix' package.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-10-12 17:46:23 +0000'>2021-10-12</span></td><td><a href='/guix/commit/gnu/ci.scm?id=a1eca979fb8da842e73c42f4f53be29b169810f2'>Merge remote-tracking branch 'origin/master' into core-updates-frozen.</a></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-10-04 16:36:59 +0200'>2021-10-04</span></td><td><a href='/guix/commit/gnu/ci.scm?id=688a4db071736a772e6b5515d7c03fe501c3c15a'>ci: Allow manifests to contain any lowerable object.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-09-27 17:55:53 +0200'>2021-09-27</span></td><td><a href='/guix/commit/gnu/ci.scm?id=7c5f01d55634254bea8bad4c9dcc31496efd4fce'>ci: Adjust 'channel-build-system' to monadic style.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-10 19:59:31 +0200'>2021-07-10</span></td><td><a href='/guix/commit/gnu/ci.scm?id=ac815ecd6321d8f167abb4f0dde1293fd9798ba1'>ci: Build commencement packages supported on the target system.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-09 14:12:40 +0200'>2021-07-09</span></td><td><a href='/guix/commit/gnu/ci.scm?id=df49fe2a13d933c640e3189413c5adfced1103c5'>ci: Add bootstrap packages to the core subset.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-07-09 14:12:15 +0200'>2021-07-09</span></td><td><a href='/guix/commit/gnu/ci.scm?id=37861f6c293d7ed1033050b2b0597885ba65186f'>ci: Add bootstrap packages to the core subset.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-07-05 16:09:03 +0200'>2021-07-05</span></td><td><a href='/guix/commit/gnu/ci.scm?id=9ac9df25a17767a3a8f4335df1770cf4c02ab5bc'>ci: Change "core" subset to include the latest GCC and Guile.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-03 20:01:05 +0200'>2021-07-03</span></td><td><a href='/guix/commit/gnu/ci.scm?id=39f1486efd70712416ca784f9014132644b04155'>ci: Remove duplicate ".SYSTEM" extension for cross-compilation jobs.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>