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=03592a6f882f5b4309f77c3dc3e65559d7b7cb75'>refs</a><a class='active' href='/guix/log/gnu/packages/pretty-print.scm'>log</a><a href='/guix/tree/gnu/packages/pretty-print.scm?id=03592a6f882f5b4309f77c3dc3e65559d7b7cb75'>tree</a><a href='/guix/commit/gnu/packages/pretty-print.scm?id=03592a6f882f5b4309f77c3dc3e65559d7b7cb75'>commit</a><a href='/guix/diff/gnu/packages/pretty-print.scm?id=03592a6f882f5b4309f77c3dc3e65559d7b7cb75'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/pretty-print.scm'>
<input type='hidden' name='id' value='03592a6f882f5b4309f77c3dc3e65559d7b7cb75'/><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=03592a6f882f5b4309f77c3dc3e65559d7b7cb75'>root</a>/<a href='/guix/log/gnu?id=03592a6f882f5b4309f77c3dc3e65559d7b7cb75'>gnu</a>/<a href='/guix/log/gnu/packages?id=03592a6f882f5b4309f77c3dc3e65559d7b7cb75'>packages</a>/<a href='/guix/log/gnu/packages/pretty-print.scm?id=03592a6f882f5b4309f77c3dc3e65559d7b7cb75'>pretty-print.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/pretty-print.scm?id=03592a6f882f5b4309f77c3dc3e65559d7b7cb75&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-11-01 04:34:25 +0100'>2018-11-01</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=38fda1cc36f55bd2c99fdd534b269c8807fc5799'>gnu: highlight: Update to 3.47.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-05-24 02:34:08 -0400'>2018-05-24</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=9d10a63402e3c3dcda288b9370d04568dfa20ea6'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2018-05-23 12:14:12 +0200'>2018-05-23</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=c1e5109b6843d5670bf81678f2697babc9b770c9'>gnu: Move 'astyle' to code.scm.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-05-23 12:09:37 +0200'>2018-05-23</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=9c4dcfaf66d37faeb165e9284f6a57871e96e1ac'>gnu: Add uncrustify.</a><span class='msg-avail'>...</span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2018-03-16 09:08:31 -0400'>2018-03-16</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=6cbee49d6668eb7fd738080666f66febfce8c7e8'>gnu: All snippets report errors using exceptions, else return #t.</a><span class='msg-avail'>...</span></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2018-03-02 15:52:56 +0100'>2018-03-02</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=6e48fbb19a420ea0be1d922ebdce36d7beb0240f'>gnu: highlight: Don't hard-code Lua version.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-03-02 15:52:55 +0100'>2018-03-02</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=3a5c02777d6a51620d8cb8afa01602bc669bbfea'>gnu: highlight: Update to 3.42.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-12-23 23:57:58 +0100'>2017-12-23</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=d30ac8f84ba170157ff711157365ca2aca1c6e89'>gnu: fmt: Update to 4.1.0.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-09-20 20:58:04 -0400'>2017-09-20</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=dc1d3cdef70f0e3c047c229c2a0e561d1f47bde8'>gnu: Use 'modify-phases' syntax.</a><span class='msg-avail'>...</span></td><td>Kei Kebreau</td></tr>
<tr><td><span title='2017-06-21 16:33:51 +0200'>2017-06-21</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=cba988ed859616f3a36f88f2984d42417447dfa1'>gnu: a2ps: Build reproducibly.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-06-20 18:10:35 +0530'>2017-06-20</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=148585c240f848ad08f6541ede7db3fca3411007'>gnu: Move contents of zip module into compression module.</a><span class='msg-avail'>...</span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2017-03-30 01:30:16 +0200'>2017-03-30</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=6fd52309b8f52c9bb59fccffac53e029ce94b698'>gnu: Use HTTPS for almost all gnu.org HOME-PAGEs.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-03-20 23:35:39 +0100'>2017-03-20</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=0a15ee7b63bd4327345f68e1a3ed202b441660b8'>gnu: Add fmt.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>