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

80df703fbe1c068e'>refs</a><a class='active' href='/guix/log/HACKING'>log</a><a href='/guix/tree/HACKING?id=59ae22458b4e83ace8f7ad5680df703fbe1c068e'>tree</a><a href='/guix/commit/HACKING?id=59ae22458b4e83ace8f7ad5680df703fbe1c068e'>commit</a><a href='/guix/diff/HACKING?id=59ae22458b4e83ace8f7ad5680df703fbe1c068e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/HACKING'>
<input type='hidden' name='id' value='59ae22458b4e83ace8f7ad5680df703fbe1c068e'/><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=59ae22458b4e83ace8f7ad5680df703fbe1c068e'>root</a>/<a href='/guix/log/HACKING?id=59ae22458b4e83ace8f7ad5680df703fbe1c068e'>HACKING</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/HACKING?id=59ae22458b4e83ace8f7ad5680df703fbe1c068e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-01-09 23:33:04 +0100'>2020-01-09</span></td><td><a href='/guix/commit/HACKING?id=2d315cd428484537e763d7f7c676dc5fff7995f6'>doc: Move "Commit Access" section from 'HACKING' to the manual.</a><span class='msg-avail'>...<span class='msg-tooltip'>* HACKING (Commit Access): Remove.
(Contributing): Update URL of the manual.
* doc/contributing.texi (Commit Access): New section.
(Submitting Patches): Add cross reference.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-01-09 23:33:04 +0100'>2020-01-09</span></td><td><a href='/guix/commit/HACKING?id=a7bde77d247ed0765f5378779d67b4668c5d7648'>doc: Add "Tracking Bugs and Patches" section.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/contributing.texi (Tracking Bugs and Patches): New section.
(Submitting Patches): Refer to it.
* doc/guix.texi: Update copyright line.
* HACKING (Using emacs-debbugs): Remove.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-07-13 14:25:19 -0400'>2019-07-13</span></td><td><a href='/guix/commit/HACKING?id=06e1ecbf17fee7fe513ad2808d8175fb3565ae3e'>doc: Update keyserver URL.</a><span class='msg-avail'>...<span class='msg-tooltip'>* HACKING (Commit Access): Change keyserver URL to 'keys.openpgp.org'.
</span></span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2019-02-11 23:23:27 +0100'>2019-02-11</span></td><td><a href='/guix/commit/HACKING?id=6701edbfad62ba9572ffd35497df3db27b208ba5'>HACKING: Update key server.</a><span class='msg-avail'>...<span class='msg-tooltip'>* HACKING (Commit Access): Recommend pool.sks-keyservers.net.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-07-22 17:00:47 +0200'>2018-07-22</span></td><td><a href='/guix/commit/HACKING?id=5285192150c83db12136af6a123e03bb9b9dbe5f'>doc: Fix typo (missing period)</a><span class='msg-avail'>...<span class='msg-tooltip'>* HACKING (Commit Access): Fix typo.
</span></span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2017-08-19 13:42:52 +0530'>2017-08-19</span></td><td><a href='/guix/commit/HACKING?id=acabbd597678e1f0be995297bb009b6dd38ae795'>doc: Mention how to use emacs-debbugs.</a><span class='msg-avail'>...<span class='msg-tooltip'>* HACKING (Using emacs-debbugs): Add section on using emacs-debbugs.
</span></span></td><td>Arun Isaac</td></tr>