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

bout/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=a44569899a54d18a70b62498bec3774f0be3f66b'>refs</a><a class='active' href='/guix/log/gnu/packages/patches/quodlibet-fix-invalid-glob.patch'>log</a><a href='/guix/tree/gnu/packages/patches/quodlibet-fix-invalid-glob.patch?id=a44569899a54d18a70b62498bec3774f0be3f66b'>tree</a><a href='/guix/commit/gnu/packages/patches/quodlibet-fix-invalid-glob.patch?id=a44569899a54d18a70b62498bec3774f0be3f66b'>commit</a><a href='/guix/diff/gnu/packages/patches/quodlibet-fix-invalid-glob.patch?id=a44569899a54d18a70b62498bec3774f0be3f66b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/quodlibet-fix-invalid-glob.patch'>
<input type='hidden' name='id' value='a44569899a54d18a70b62498bec3774f0be3f66b'/><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=a44569899a54d18a70b62498bec3774f0be3f66b'>root</a>/<a href='/guix/log/gnu?id=a44569899a54d18a70b62498bec3774f0be3f66b'>gnu</a>/<a href='/guix/log/gnu/packages?id=a44569899a54d18a70b62498bec3774f0be3f66b'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=a44569899a54d18a70b62498bec3774f0be3f66b'>patches</a>/<a href='/guix/log/gnu/packages/patches/quodlibet-fix-invalid-glob.patch?id=a44569899a54d18a70b62498bec3774f0be3f66b'>quodlibet-fix-invalid-glob.patch</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/patches/quodlibet-fix-invalid-glob.patch?id=a44569899a54d18a70b62498bec3774f0be3f66b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-06-13 09:43:37 +0300'>2023-06-13</span></td><td><a href='/guix/commit/gnu/packages/patches/quodlibet-fix-invalid-glob.patch?id=b188c41d930dbe8142c1f377d3c8f2580ff1277c'>gnu: quodlibet: Fix compatibility with python-3.10.</a><span class='msg-avail'>...<span class='msg-tooltip'>Reported in #63205.

* gnu/packages/music.scm (quodlibet)[source]: Add two backported patches.
[arguments]: Adjust 'check phase to change skipped tests.
* gnu/packages/patches/quodlibet-fix-invalid-glob.patch,
gnu/packages/patches/quodlibet-fix-mtime-tests.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register them.

Signed-off-by: Efraim Flashner &lt;efraim@flashner.co.il&gt;
</span></span></td><td>Alice BRENON</td></tr>