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

/refs/?id=9744cc7b4636fafb772c94adb8f05961b5b39f16'>refs</a><a class='active' href='/guix/log/gnu/packages/connman.scm'>log</a><a href='/guix/tree/gnu/packages/connman.scm?id=9744cc7b4636fafb772c94adb8f05961b5b39f16'>tree</a><a href='/guix/commit/gnu/packages/connman.scm?id=9744cc7b4636fafb772c94adb8f05961b5b39f16'>commit</a><a href='/guix/diff/gnu/packages/connman.scm?id=9744cc7b4636fafb772c94adb8f05961b5b39f16'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/connman.scm'>
<input type='hidden' name='id' value='9744cc7b4636fafb772c94adb8f05961b5b39f16'/><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=9744cc7b4636fafb772c94adb8f05961b5b39f16'>root</a>/<a href='/guix/log/gnu?id=9744cc7b4636fafb772c94adb8f05961b5b39f16'>gnu</a>/<a href='/guix/log/gnu/packages?id=9744cc7b4636fafb772c94adb8f05961b5b39f16'>packages</a>/<a href='/guix/log/gnu/packages/connman.scm?id=9744cc7b4636fafb772c94adb8f05961b5b39f16'>connman.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/connman.scm?id=9744cc7b4636fafb772c94adb8f05961b5b39f16&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-02-18 01:26:06 +0100'>2020-02-18</span></td><td><a href='/guix/commit/gnu/packages/connman.scm?id=1943a258bb8f12a7f9cd8313ef4ea6da8af60299'>gnu: connman: Update to 1.38.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/connman.scm (connman): Update to 1.38.
[inputs]: Add libmnl.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-12-18 10:29:28 +0200'>2019-12-18</span></td><td><a href='/guix/commit/gnu/packages/connman.scm?id=8fd60494030c3e8e948bd2452253ce936fb445ba'>gnu: cmst: Update to 2019.01.13.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/connman.scm (cmst): Update to 2019.01.13.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-10-15 23:48:11 +0300'>2019-10-15</span></td><td><a href='/guix/commit/gnu/packages/connman.scm?id=11af54466c2b001cf3aeb729197e1c3ebefab363'>gnu: econnman: Build with python.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/connman.scm (econnman)[inputs]: Remove python-2,
python2-dbus, python2-efl. Add python-wrapper, python-dbus, python-efl.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-10-15 23:48:11 +0300'>2019-10-15</span></td><td><a href='/guix/commit/gnu/packages/connman.scm?id=4eb639ccf991858926c778769bff9f3b75c7a547'>gnu: connman: Update build inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/connman.scm (connman)[arguments]: Don't enable pptp, it
isn't available.
[native-inputs]: Remove python-2, add python-wrapper.
[inputs]: Remove polkit, add xl2tpd.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-06-17 10:02:47 +0300'>2019-06-17</span></td><td><a href='/guix/commit/gnu/packages/connman.scm?id=55350f8316f693401506e85684b3faf0627c4a80'>gnu: cmst: Don't install files to usr.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/connman.scm (cmst)[arguments]: Move custom 'fix-Makefiles
phase before 'build. Add more substitutions.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-04-15 06:26:17 +0200'>2019-04-15</span></td><td><a href='/guix/commit/gnu/packages/connman.scm?id=58065ddd42872e615710fb16456b7cb6e1f9c80d'>gnu: connman: Update to 1.37.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/connman.scm (connman): Update to 1.37.
[arguments]: Remove unconventional comment (it's implicit in the name).
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-04-15 06:20:45 +0200'>2019-04-15</span></td><td><a href='/guix/commit/gnu/packages/connman.scm?id=dd93e8a2b7fa616086d585c124321752c9cbd33f'>gnu: connman: Don't use NAME in source URI.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/connman.scm (connman)[source]: Hard-code NAME.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>