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

t'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9'>refs</a><a class='active' href='/guix/log/gnu/packages/presentation.scm'>log</a><a href='/guix/tree/gnu/packages/presentation.scm?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9'>tree</a><a href='/guix/commit/gnu/packages/presentation.scm?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9'>commit</a><a href='/guix/diff/gnu/packages/presentation.scm?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/presentation.scm'>
<input type='hidden' name='id' value='cea2e7633ddbce9ce467d752d1db61f7d6c63aa9'/><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=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9'>root</a>/<a href='/guix/log/gnu?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9'>gnu</a>/<a href='/guix/log/gnu/packages?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9'>packages</a>/<a href='/guix/log/gnu/packages/presentation.scm?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9'>presentation.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/packages/presentation.scm?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-09-08 02:00:00 +0200'>2024-09-08</span></td><td><a href='/guix/commit/gnu/packages/presentation.scm?id=26942d67b784b164485252810847407f16e1a831'>Add some missing header comment header comments.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/minetest.scm: Add the ‘GNU Guix’ header comment.
* gnu/packages/notcurses.scm: Likewise.
* gnu/packages/presentation.scm: Likewise.
* gnu/packages/solidity.scm: Likewise.
* guix/build/minetest-build-system.scm: Likewise.
* gnu/packages/vnc.scm: Add missing ‘;’.
* guix/scripts/import/crate.scm: Remove leading newline.

Change-Id: I5294e6067b9348f2929d823a07d4ec335eaa5ecd
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-08-31 10:42:45 +0200'>2024-08-31</span></td><td><a href='/guix/commit/gnu/packages/presentation.scm?id=c2dcce11d13b8849aba7ffa35f2d9398e6310437'>gnu: presentty: Add 'bash' input for 'wrap-program'.</a><span class='msg-avail'>...<span class='msg-tooltip'>It is required for cross-compilation.

* gnu/packages/presentation.scm
(presentty)[inputs]: Add 'bash-minimal'.

Signed-off-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
Change-Id: Ief6c983cdbced493c27c8584ac63afe5bc0bac98
</span></span></td><td>Maxime Devos</td></tr>