From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 12:11:57 +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:15:0: ERROR: Function does not take positional arguments.
data/meson.build:27: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 026bd80..3b03b94 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,7 +13,6 @@ desktop_in = configure_file(
 )
 
 i18n.merge_file(
-  desktop,
   type: 'desktop',
   input: desktop_in,
   output: '@BASENAME@',
@@ -25,7 +24,6 @@ i18n.merge_file(
 appdata = df_namespace + '.appdata.xml'
 
 i18n.merge_file(
-  appdata,
   input: appdata + '.in',
   output: '@BASENAME@',
   po_dir: po_dir,
-- 
GitLab

d></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=dde8ec55b73f423eb6abb8f9a4c62045ca8dc792'>refs</a><a class='active' href='/guix/log/gnu/packages/julia-jll.scm'>log</a><a href='/guix/tree/gnu/packages/julia-jll.scm?id=dde8ec55b73f423eb6abb8f9a4c62045ca8dc792'>tree</a><a href='/guix/commit/gnu/packages/julia-jll.scm?id=dde8ec55b73f423eb6abb8f9a4c62045ca8dc792'>commit</a><a href='/guix/diff/gnu/packages/julia-jll.scm?id=dde8ec55b73f423eb6abb8f9a4c62045ca8dc792'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/julia-jll.scm'>
<input type='hidden' name='id' value='dde8ec55b73f423eb6abb8f9a4c62045ca8dc792'/><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=dde8ec55b73f423eb6abb8f9a4c62045ca8dc792'>root</a>/<a href='/guix/log/gnu?id=dde8ec55b73f423eb6abb8f9a4c62045ca8dc792'>gnu</a>/<a href='/guix/log/gnu/packages?id=dde8ec55b73f423eb6abb8f9a4c62045ca8dc792'>packages</a>/<a href='/guix/log/gnu/packages/julia-jll.scm?id=dde8ec55b73f423eb6abb8f9a4c62045ca8dc792'>julia-jll.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/julia-jll.scm?id=dde8ec55b73f423eb6abb8f9a4c62045ca8dc792&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-02-05 13:56:31 +0800'>2024-02-05</span></td><td><a href='/guix/commit/gnu/packages/julia-jll.scm?id=2b296427d7bd7b6b155e0e94403c1227ce014008'>gnu: mbedtls-apache: Rename to mbedtls-lts.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/tls.scm (mbedtls-apache): Rename package to "mbedtls".
Rename variable to…
(mbedtls-lts): …this.
(mbedtls-apache): Define as deprecated by mbedtls-lts.
(mbedtls-for-hiawatha): Adjust accordingly.
* doc/guix.texi: Likewise.
* gnu/packages/emulators.scm (dolphin-emu,retroarch)[inputs]: Likewise.
* gnu/packages/game-development.scm (godot-lts,godot)[inputs]: Likewise.
* gnu/packages/hardware.scm (hueplusplus,openrgb)[inputs]: Likewise.
* gnu/packages/haxe.scm (neko,haxe,hashlink)[inputs]: Likewise.
* gnu/packages/irc.scm (inspircd)[inputs]: Likewise.
* gnu/packages/julia-jll.scm (julia-mbedtls-jll)[arguments]&lt;#:phases&gt;,[inputs]:
Likewise.
* gnu/packages/julia.scm (julia)[arguments]&lt;#:phases&gt;,[inputs]: Likewise.
* gnu/packages/linphone.scm (bctoolbox)[inputs]: Likewise.
* gnu/packages/linux.scm (dislocker)[inputs]: Likewise.
* gnu/packages/networking.scm (nng)[inputs]: Likewise.
* gnu/packages/search.scm (dataparksearch)[inputs]: Likewise.
* gnu/packages/video.scm (obs)[inputs]: Likewise.
* gnu/packages/web.scm (hiawatha)[arguments]&lt;#:phases&gt;: Likewise.

Change-Id: I0c58b3cd0bcf6e44e7b16a69f6d2739aa3c1545b
</span></span></td><td>Hilton Chain</td></tr>