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

303183ef865a243f7746a7c19c1a98ad0fa242'>refs</a><a class='active' href='/guix/log/tests/guix-lint.sh'>log</a><a href='/guix/tree/tests/guix-lint.sh?id=b5303183ef865a243f7746a7c19c1a98ad0fa242'>tree</a><a href='/guix/commit/tests/guix-lint.sh?id=b5303183ef865a243f7746a7c19c1a98ad0fa242'>commit</a><a href='/guix/diff/tests/guix-lint.sh?id=b5303183ef865a243f7746a7c19c1a98ad0fa242'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-lint.sh'>
<input type='hidden' name='id' value='b5303183ef865a243f7746a7c19c1a98ad0fa242'/><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=b5303183ef865a243f7746a7c19c1a98ad0fa242'>root</a>/<a href='/guix/log/tests?id=b5303183ef865a243f7746a7c19c1a98ad0fa242'>tests</a>/<a href='/guix/log/tests/guix-lint.sh?id=b5303183ef865a243f7746a7c19c1a98ad0fa242'>guix-lint.sh</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/guix-lint.sh?id=b5303183ef865a243f7746a7c19c1a98ad0fa242&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-02-22 12:07:45 +0100'>2021-02-22</span></td><td><a href='/guix/commit/tests/guix-lint.sh?id=9a38bed2cf32e9462badfa43e74cdd4580e804fc'>packages: 'package-field-location' handles 'search-path' returning #f.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/46390&gt;.
Reported by zimoun &lt;zimon.toutoune@gmail.com&gt;.

This is similar to the fix in d10474c38d58bdc676e64336769dc2e00cdfa8ed.

* guix/packages.scm (package-field-location): Handle FILE not in %LOAD-PATH.
* tests/guix-lint.sh: Add test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-28 21:06:36 -0500'>2020-09-28</span></td><td><a href='/guix/commit/tests/guix-lint.sh?id=d8934360d2453a403b5433e71d09188e4ed23b57'>tests: Simplify shell exit status negation;</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-lint.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh: Use the shell '!' keyword to negate command exit status
in place of 'if ...; then false; else true; fi'
</span></span></td><td>Eric Bavier</td></tr>
<tr><td><span title='2020-08-23 23:05:16 +0200'>2020-08-23</span></td><td><a href='/guix/commit/tests/guix-lint.sh?id=d10474c38d58bdc676e64336769dc2e00cdfa8ed'>lint: formatting: Gracefully handle relative file names.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/42543&gt;.
Reported by Jack Hill &lt;jackhill@jackhill.us&gt;.

* guix/lint.scm (check-formatting): Always return a list (previously we
would return #f when 'search-path' returns #f).  Check whether
LOCATION's file is a relative file name.  Return a warning if not.
* tests/guix-lint.sh: Add test.
</span></span></td><td>Ludovic Courtès</td></tr>