| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 1 | From cdaa837d48894737ca0b4e7d2dfb365119e53759 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jan Beich <jbeich@FreeBSD.org> |
| 3 | Date: Tue, 25 Jan 2022 11:49:54 +0000 |
| 4 | Subject: [PATCH] meson: Drop unused argument for i18n.merge_file() |
| 5 | |
| 6 | Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. |
| 7 | |
| 8 | data/meson.build:23:0: ERROR: Function does not take positional arguments. |
| 9 | |
| 10 | Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/210> |
| 11 | |
| 12 | Upstream-Status: Backport[https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/commit/cdaa837d48894737ca0b4e7d2dfb365119e53759] |
| 13 | --- |
| 14 | data/meson.build | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/data/meson.build b/data/meson.build |
| 18 | index 27f4287..a4bcd5e 100644 |
| 19 | --- a/data/meson.build |
| 20 | +++ b/data/meson.build |
| 21 | @@ -1,5 +1,5 @@ |
| 22 | session_desktop = 'gnome-classic.desktop' |
| 23 | -i18n.merge_file('', |
| 24 | +i18n.merge_file( |
| 25 | input: session_desktop + '.in', |
| 26 | output: session_desktop, |
| 27 | po_dir: '../po', |
| 28 | -- |
| 29 | 2.34.1 |
| 30 | |