| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 629ca0e61bb59303d43d7eac44a47ae866cc78f0 Mon Sep 17 00:00:00 2001 |
| 2 | From: rvalue <i@rvalue.moe> |
| 3 | Date: Fri, 17 Dec 2021 12:29:30 +0000 |
| 4 | Subject: [PATCH] build: fix arguments of i18n.merge_file |
| 5 | |
| 6 | `i18n.merge_file` has been ignoring positional arguments for a time |
| 7 | and explicitly rejects with error since meson 0.60.0 |
| 8 | |
| 9 | Upstream-Status: Backport |
| 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 e38a1d8..38fb520 100644 |
| 17 | --- a/data/meson.build |
| 18 | +++ b/data/meson.build |
| 19 | @@ -11,7 +11,6 @@ desktops = [ |
| 20 | |
| 21 | foreach desktop: desktops |
| 22 | i18n.merge_file ( |
| 23 | - desktop, |
| 24 | type: 'desktop', |
| 25 | input: desktop + '.in', |
| 26 | output: desktop, |
| 27 | @@ -38,7 +37,6 @@ install_data( |
| 28 | info = 'org.gnome.DiskUtility.appdata.xml' |
| 29 | |
| 30 | i18n.merge_file( |
| 31 | - info, |
| 32 | input: info + '.in', |
| 33 | output: info, |
| 34 | po_dir: po_dir, |