gnote: fix for meson 0.61

This commit is contained in:
Michal Vasilek 2022-03-09 19:31:37 +01:00
parent 608494985a
commit 19e8cc8b38

View file

@ -0,0 +1,36 @@
From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 11:53:17 +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:4:0: ERROR: Function does not take positional arguments.
data/meson.build:41: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 a6138165..8d16368a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,6 @@ install_man('gnote.1')
desktop_file = 'org.gnome.Gnote.desktop'
gnote_desktop_file = i18n.merge_file(
- desktop_file,
type: 'desktop',
input: desktop_file + '.in',
output: desktop_file,
@@ -39,7 +38,6 @@ configure_file(
gnote_appdata = 'org.gnome.Gnote.appdata.xml'
appdata_file = i18n.merge_file(
- gnote_appdata,
input: gnote_appdata + '.in',
output: gnote_appdata,
po_dir: '../po',
--
GitLab