| From ea9a15afb76c093aea37f6c56c559b61afd9a9f2 Mon Sep 17 00:00:00 2001 |
| From: rvalue <i@rvalue.moe> |
| Date: Wed, 15 Dec 2021 07:02:09 +0000 |
| Subject: [PATCH] Remove incorrect args for i18n.merge_file |
| |
| The positional argument has been silently ignored for a time. And it causes failure |
| with "ERROR: Function does not take positional arguments" since meson 0.60.0 |
| |
| Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124] |
| Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| --- |
| data/meson.build | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/data/meson.build b/data/meson.build |
| index bb61387..28d72a1 100644 |
| --- a/data/meson.build |
| +++ b/data/meson.build |
| @@ -4,7 +4,6 @@ install_man('gedit.1') |
| |
| appdata = 'org.gnome.gedit.appdata.xml' |
| appdata_file = i18n.merge_file( |
| - appdata, |
| input: appdata + '.in', |
| output: appdata, |
| po_dir: '../po/', |
| @@ -23,7 +22,6 @@ endif |
| |
| desktop_file = 'org.gnome.gedit.desktop' |
| desktop_output_file = i18n.merge_file( |
| - desktop_file, |
| type: 'desktop', |
| input: desktop_file + '.in', |
| output: desktop_file, |