From 71933f6586475b36c70ef325373fe6d50c7a034f Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 11:13:54 +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/appdata/meson.build:3:5: ERROR: Function does not take positional arguments.
data/meson.build:6:5: ERROR: Function does not take positional arguments.
data/meson.build:49:5: ERROR: Function does not take positional arguments.
---
 data/appdata/meson.build | 2 +-
 data/meson.build         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index 1dc4ed7..e44a58e 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -1,6 +1,6 @@
 appdata_conf = configuration_data()
 appdata_conf.set('application_id', application_id)
-i18n.merge_file('appdata',
+appdata_file = i18n.merge_file(
   input: configure_file(
     input: 'org.gnome.Dictionary.appdata.xml.in.in',
     output: 'org.gnome.Dictionary.appdata.xml.in',
diff --git a/data/meson.build b/data/meson.build
index 660e6b8..7ec7251 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -3,7 +3,7 @@ subdir('appdata')
 desktop_conf = configuration_data()
 desktop_conf.set('icon', application_id)
 desktop_conf.set('application_id', application_id)
-i18n.merge_file('desktop',
+desktop_file = i18n.merge_file(
   input: configure_file(
     input: 'org.gnome.Dictionary.desktop.in.in',
     output: 'org.gnome.Dictionary.desktop.in',
@@ -45,7 +45,7 @@ sources = [
 ]
 
 foreach s: sources
-  i18n.merge_file('sources',
+  i18n.merge_file(
     input: '@0@.in'.format(s),
     output: s,
     install: true,
-- 
2.41.0

uthor</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=f5346094f0365a2c04ca00111ff06e17dac832e2'>root</a>/<a href='/guix/log/gnu?id=f5346094f0365a2c04ca00111ff06e17dac832e2'>gnu</a>/<a href='/guix/log/gnu/packages?id=f5346094f0365a2c04ca00111ff06e17dac832e2'>packages</a>/<a href='/guix/log/gnu/packages/adns.scm?id=f5346094f0365a2c04ca00111ff06e17dac832e2'>adns.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/adns.scm?id=f5346094f0365a2c04ca00111ff06e17dac832e2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-07-20 10:11:33 +0200'>2023-07-20</span></td><td><a href='/guix/commit/gnu/packages/adns.scm?id=bfcfe53c72f04e825f33269258c5ebbc33b70131'>gnu: c-ares: Skip failing tests on the Hurd.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/adns.scm (c-ares)[arguments: When building natively on the
Hurd, add phases 'skip-tests' and 'filter-hurd-tests'.
</span></span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2022-06-26 12:06:30 +0200'>2022-06-26</span></td><td><a href='/guix/commit/gnu/packages/adns.scm?id=7a0e57a81239b5e71e278c69db04e84185567210'>gnu: c-ares: Update to 1.18.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/adns.scm (c-ares): Update to 1.18.1.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2021-12-23 15:41:15 +0100'>2021-12-23</span></td><td><a href='/guix/commit/gnu/packages/adns.scm?id=94f8ba37cc3eff71809bd197378d075e33a9945c'>gnu: c-ares: Enable tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/adns.scm (c-ares)[arguments]: Enable tests.
</span></span></td><td>Jelle Licht</td></tr>
<tr><td><span title='2021-12-13 17:48:25 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/adns.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-11-17 23:43:14 +0100'>2021-11-17</span></td><td><a href='/guix/commit/gnu/packages/adns.scm?id=3a317f7476f8c6012e166ff9f340f861938721c9'>Merge branch 'master' into core-updates-frozen</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-11-15 22:43:23 +0100'>2021-11-15</span></td><td><a href='/guix/commit/gnu/packages/adns.scm?id=ecbf59abad4e146a80ea2849d12569886bce732e'>gnu: Add c-ares-for-node.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/adns.scm (c-ares-for-node): New variable.

Co-authored-by: Marius Bakke &lt;marius@gnu.org&gt;
</span></span></td><td>Jelle Licht</td></tr>
<tr><td><span title='2021-10-18 14:37:26 +0000'>2021-10-18</span></td><td><a href='/guix/commit/gnu/packages/adns.scm?id=e486b2b674badc80627b11077b7df2ac1cab92d8'>Merge remote-tracking branch 'signed/master' into core-updates</a></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-10-17 02:27:16 +0200'>2021-10-17</span></td><td><a href='/guix/commit/gnu/packages/adns.scm?id=a1030d215197148aa0b86b75edccb70884c3769f'>gnu: c-ares: Update to 1.17.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/adns.scm (c-ares/fixed): Update to 1.17.2.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>