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

693d77ca7b6fd61370c23e'>refs</a><a class='active' href='/guix/log/.gitignore'>log</a><a href='/guix/tree/.gitignore?id=defbf22797d1ce99b8693d77ca7b6fd61370c23e'>tree</a><a href='/guix/commit/.gitignore?id=defbf22797d1ce99b8693d77ca7b6fd61370c23e'>commit</a><a href='/guix/diff/.gitignore?id=defbf22797d1ce99b8693d77ca7b6fd61370c23e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/.gitignore'>
<input type='hidden' name='id' value='defbf22797d1ce99b8693d77ca7b6fd61370c23e'/><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=defbf22797d1ce99b8693d77ca7b6fd61370c23e'>root</a>/<a href='/guix/log/.gitignore?id=defbf22797d1ce99b8693d77ca7b6fd61370c23e'>.gitignore</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/.gitignore?id=defbf22797d1ce99b8693d77ca7b6fd61370c23e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-10-22 20:35:15 -0400'>2023-10-22</span></td><td><a href='/guix/commit/.gitignore?id=4cf4dcb8b31274a8dfba6bae3a6826a1b521da3f'>teams: Adjust shebang to use 'guix repl'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This ensures the correct Guix dependencies are always available for the
script.

* etc/teams.scm.in: Rename to...
* etc/teams.scm: ... this.  Adjust shebang.
* .gitignore: No longer ignore it.
* configure.ac: Do not process it with AC_CONFIG_FILES.

Reported-by: Clément Lassieur &lt;clement@lassieur.org&gt;
Fixes: https://issues.guix.gnu.org/66605
Change-Id: I7a01750c6c5f0696b6c36b1e6caa9389d9e6822c
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-04-24 15:32:54 +0100'>2023-04-24</span></td><td><a href='/guix/commit/.gitignore?id=23f11afacdfe755ffa514a8cbf93ba1121b9db0d'>Add mumi config.</a><span class='msg-avail'>...<span class='msg-tooltip'>* .mumi/config: New file.
* .gitignore: Add .mumi/current-issue.
</span></span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2022-07-03 14:12:32 +0200'>2022-07-03</span></td><td><a href='/guix/commit/.gitignore?id=4eaf90470f466b3fdab87f6961cb18bb348d433f'>etc: Add teams.scm.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/teams.scm.in: New file.
* configure.ac: Generate executable.
* .gitignore: Ignore generated file.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2022-06-05 21:27:53 +0200'>2022-06-05</span></td><td><a href='/guix/commit/.gitignore?id=4d47c2c723927ad4ad4142bd517c6ccc03c27528'>gitignore: Add .DS_Store.</a><span class='msg-avail'>...<span class='msg-tooltip'>Ignore MacOS specific file: https://en.wikipedia.org/wiki/.DS_Store

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Pavel Shlyak</td></tr>