| From b525a64d26bcba4e3a74f09c580429625d8a2104 Mon Sep 17 00:00:00 2001 |
| From: r-value <i@rvalue.moe> |
| Date: Wed, 17 Nov 2021 18:22:45 +0800 |
| Subject: [PATCH] Remove incorrect args for i18n.merge_file |
| |
| `i18n.merge_file` has been ignoring positional arguments for |
| a time and explicitly rejects with error since meson 0.60.0 |
| |
| Upstream-Status: Backport |
| Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| --- |
| backend/meson.build | 1 - |
| data/meson.build | 1 - |
| meson.build | 1 - |
| 3 files changed, 3 deletions(-) |
| |
| diff --git a/backend/meson.build b/backend/meson.build |
| index 14629f2..2f972a8 100644 |
| --- a/backend/meson.build |
| +++ b/backend/meson.build |
| @@ -53,7 +53,6 @@ foreach backend, backend_mime_types: backends |
| ) |
| |
| i18n.merge_file( |
| - appstream, |
| input: appstream_in, |
| output: appstream, |
| po_dir: po_dir, |
| diff --git a/data/meson.build b/data/meson.build |
| index 8a308b8..afc3020 100644 |
| --- a/data/meson.build |
| +++ b/data/meson.build |
| @@ -15,7 +15,6 @@ foreach desktop: desktops |
| ) |
| |
| i18n.merge_file( |
| - desktop, |
| type: 'desktop', |
| input: desktop_in, |
| output: desktop, |
| diff --git a/meson.build b/meson.build |
| index 07fb8ec..0bb5d0f 100644 |
| --- a/meson.build |
| +++ b/meson.build |
| @@ -498,7 +498,6 @@ install_headers( |
| appdata = ev_namespace + '.appdata.xml' |
| |
| i18n.merge_file( |
| - appdata, |
| input: appdata + '.in', |
| output: appdata, |
| po_dir: po_dir, |