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

tion 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=387b86ff003b051945ab08030169228556cc2a4a'>root</a>/<a href='/guix/log/gnu?id=387b86ff003b051945ab08030169228556cc2a4a'>gnu</a>/<a href='/guix/log/gnu/packages?id=387b86ff003b051945ab08030169228556cc2a4a'>packages</a>/<a href='/guix/log/gnu/packages/sequoia.scm?id=387b86ff003b051945ab08030169228556cc2a4a'>sequoia.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/sequoia.scm?id=387b86ff003b051945ab08030169228556cc2a4a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-05-07 19:29:25 +0300'>2023-05-07</span></td><td><a href='/guix/commit/gnu/packages/sequoia.scm?id=b8912c4760c6066583a945080eecc58a72f86bdf'>gnu: libsequoia: Use existing rust-tokio-1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/sequoia.scm (libsequoia)[cargo-inputs]: Replace
rust-tokio-1.8 with rust-tokio-1.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2022-10-27 19:43:06 +0200'>2022-10-27</span></td><td><a href='/guix/commit/gnu/packages/sequoia.scm?id=c485a9d8af210425a0435280fff8588563e49684'>gnu: python-setuptools: Move to python-build.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/python-xyz.scm (python-setuptools): Move…
* gnu/packages/python-build.scm: …here.
* gnu/packages/chemistry.scm,
gnu/packages/messaging.scm,
gnu/packages/sequoia.scm,
tests/lint.scm: Adjust module imports accordingly.

Co-authored-by: Marius Bakke &lt;marius@gnu.org&gt;
</span></span></td><td>Lars-Dominik Braun</td></tr>