From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sun, 23 Jan 2022 10:49:07 +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:19:0: ERROR: Function does not take positional arguments.
data/meson.build:39: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 33f73ca..8974a63 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -17,7 +17,6 @@ install_data(
 
 # Desktop file
 desktop_file = i18n.merge_file(
-  'desktop-file',
   input: 'org.gnome.TwentyFortyEight.desktop.in',
   output: 'org.gnome.TwentyFortyEight.desktop',
   install: true,
@@ -37,7 +36,6 @@ endif
 
 # AppData file
 appdata_file = i18n.merge_file(
-  'appdata-file',
   input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
   output: 'org.gnome.TwentyFortyEight.appdata.xml',
   install: true,
-- 
GitLab

db3f66fd807b096b48283debdcddccfea34bad'>refs</a><a class='active' href='/guix/log/tests/inferior.scm'>log</a><a href='/guix/tree/tests/inferior.scm?id=9edb3f66fd807b096b48283debdcddccfea34bad'>tree</a><a href='/guix/commit/tests/inferior.scm?id=9edb3f66fd807b096b48283debdcddccfea34bad'>commit</a><a href='/guix/diff/tests/inferior.scm?id=9edb3f66fd807b096b48283debdcddccfea34bad'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/inferior.scm'>
<input type='hidden' name='id' value='9edb3f66fd807b096b48283debdcddccfea34bad'/><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=9edb3f66fd807b096b48283debdcddccfea34bad'>root</a>/<a href='/guix/log/tests?id=9edb3f66fd807b096b48283debdcddccfea34bad'>tests</a>/<a href='/guix/log/tests/inferior.scm?id=9edb3f66fd807b096b48283debdcddccfea34bad'>inferior.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/tests/inferior.scm?id=9edb3f66fd807b096b48283debdcddccfea34bad&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-03-21 22:16:02 +0100'>2020-03-21</span></td><td><a href='/guix/commit/tests/inferior.scm?id=d19b14c8349ce8cacb62619ab68953265daeeca7'>Merge branch 'master' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-03-19 15:14:08 +0100'>2020-03-19</span></td><td><a href='/guix/commit/tests/inferior.scm?id=1dca6aaafa9f842565deab1fe7e6929f25544551'>inferior: '&amp;inferior-exception' includes a stack trace.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/inferior.scm (port-&gt;inferior): Bump protocol to (0 1 1).
(&amp;inferior-exception)[stack]: New field.
(read-repl-response): Recognize 'exception' form for protocol (0 1 1).
* tests/inferior.scm ("&amp;inferior-exception"): Check the value returned
by 'inferior-exception-stack'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-03-17 15:46:15 +0100'>2020-03-17</span></td><td><a href='/guix/commit/tests/inferior.scm?id=9d0c2c6e5226bbd11e710bd4efa8f25e9ffb5a86'>tests: Fix up reference to 'guile-2.2'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to b6bee63bed4f013064c0d902e7c8b83ed7514ade.

* tests/inferior.scm ("inferior-package-search-paths"): Refer to
'guile-3.0' instead of 'guile-2.2'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-03-12 11:52:38 +0100'>2020-03-12</span></td><td><a href='/guix/commit/tests/inferior.scm?id=f7537e30b892cef09d91902547c00e5fa9b66f3b'>inferior: Distinguish inferior exceptions.</a><span class='msg-avail'>...<span class='msg-tooltip'>This avoids ambiguities when looking at a backtrace where the exception
was actually thrown by an inferior in a very different context.

* guix/inferior.scm (&amp;inferior-exception): New condition type.
(read-repl-response): Add optional 'inferior' parameter.  Raise
'&amp;inferior-exception' instead of rethrowing to KEY when receiving an
'exception' message.
(read-inferior-response): Pass INFERIOR to 'read-repl-response'.
* tests/inferior.scm ("&amp;inferior-exception"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-21 16:48:36 +0200'>2019-09-21</span></td><td><a href='/guix/commit/tests/inferior.scm?id=71507435225f10d8d944ba183cbcc77ef953e0e5'>inferior: Propagate '&amp;store-protocol-error' error conditions.</a><span class='msg-avail'>...<span class='msg-tooltip'>Until now '&amp;store-protocol-error' conditions raised in the inferior
would not be correctly propagated because SRFI-35 records lack a read
syntax.

Reported at &lt;https://bugs.gnu.org/37449&gt;
by Carl Dong &lt;contact@carldong.me&gt;.

* guix/inferior.scm (port-&gt;inferior): Import (srfi srfi-34) in the inferior.
(inferior-eval-with-store): Define 'error?' and 'error-message'.  Wrap
call to PROC in 'guard'.  Check the response of INFERIOR for a
'store-protocol-error' or a 'result' tag.
* tests/inferior.scm ("inferior-eval-with-store, &amp;store-protocol-error"):
New test.
</span></span></td><td>Ludovic Courtès</td></tr>