| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From ea9a15afb76c093aea37f6c56c559b61afd9a9f2 Mon Sep 17 00:00:00 2001 |
| 2 | From: rvalue <i@rvalue.moe> |
| 3 | Date: Wed, 15 Dec 2021 07:02:09 +0000 |
| 4 | Subject: [PATCH] Remove incorrect args for i18n.merge_file |
| 5 | |
| 6 | The positional argument has been silently ignored for a time. And it causes failure |
| 7 | with "ERROR: Function does not take positional arguments" since meson 0.60.0 |
| 8 | |
| 9 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124] |
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 11 | --- |
| 12 | data/meson.build | 2 -- |
| 13 | 1 file changed, 2 deletions(-) |
| 14 | |
| 15 | diff --git a/data/meson.build b/data/meson.build |
| 16 | index bb61387..28d72a1 100644 |
| 17 | --- a/data/meson.build |
| 18 | +++ b/data/meson.build |
| 19 | @@ -4,7 +4,6 @@ install_man('gedit.1') |
| 20 | |
| 21 | appdata = 'org.gnome.gedit.appdata.xml' |
| 22 | appdata_file = i18n.merge_file( |
| 23 | - appdata, |
| 24 | input: appdata + '.in', |
| 25 | output: appdata, |
| 26 | po_dir: '../po/', |
| 27 | @@ -23,7 +22,6 @@ endif |
| 28 | |
| 29 | desktop_file = 'org.gnome.gedit.desktop' |
| 30 | desktop_output_file = i18n.merge_file( |
| 31 | - desktop_file, |
| 32 | type: 'desktop', |
| 33 | input: desktop_file + '.in', |
| 34 | output: desktop_file, |