| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 6f797c21703ce9e996da17c49879e2a16dfbc256 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org> |
| 3 | Date: Thu, 23 Dec 2021 17:18:16 +0100 |
| 4 | Subject: [PATCH] build: Drop incorrect positional arg |
| 5 | |
| 6 | Unlike other targets that take a name, i18n.merge_file() does not. |
| 7 | |
| 8 | Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078> |
| 9 | Upstream-Status: Backport |
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 11 | --- |
| 12 | data/meson.build | 2 +- |
| 13 | src/calendar-server/meson.build | 2 +- |
| 14 | subprojects/extensions-app/data/meson.build | 2 +- |
| 15 | subprojects/extensions-app/data/metainfo/meson.build | 2 +- |
| 16 | subprojects/extensions-tool/src/templates/meson.build | 2 +- |
| 17 | 5 files changed, 5 insertions(+), 5 deletions(-) |
| 18 | |
| 19 | diff --git a/data/meson.build b/data/meson.build |
| 20 | index f924fdf..76ae45c 100644 |
| 21 | --- a/data/meson.build |
| 22 | +++ b/data/meson.build |
| 23 | @@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir) |
| 24 | desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') |
| 25 | |
| 26 | foreach desktop_file : desktop_files |
| 27 | - i18n.merge_file('desktop', |
| 28 | + i18n.merge_file( |
| 29 | input: configure_file( |
| 30 | input: desktop_file + '.in.in', |
| 31 | output: desktop_file + '.in', |
| 32 | diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build |
| 33 | index 7363282..8b4ef41 100644 |
| 34 | --- a/src/calendar-server/meson.build |
| 35 | +++ b/src/calendar-server/meson.build |
| 36 | @@ -27,7 +27,7 @@ configure_file( |
| 37 | install_dir: servicedir |
| 38 | ) |
| 39 | |
| 40 | -i18n.merge_file('evolution-calendar.desktop', |
| 41 | +i18n.merge_file( |
| 42 | input: 'evolution-calendar.desktop.in', |
| 43 | output: 'evolution-calendar.desktop', |
| 44 | po_dir: po_dir, |
| 45 | diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build |
| 46 | index d7e7d40..4b601e8 100644 |
| 47 | --- a/subprojects/extensions-app/data/meson.build |
| 48 | +++ b/subprojects/extensions-app/data/meson.build |
| 49 | @@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir) |
| 50 | desktopconf.set('app_id', app_id) |
| 51 | desktopconf.set('prgname', prgname) |
| 52 | |
| 53 | -i18n.merge_file('desktop', |
| 54 | +i18n.merge_file( |
| 55 | input: configure_file( |
| 56 | input: base_id + '.desktop.in.in', |
| 57 | output: desktop_file + '.in', |
| 58 | diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build |
| 59 | index c4962c0..a19bfa8 100644 |
| 60 | --- a/subprojects/extensions-app/data/metainfo/meson.build |
| 61 | +++ b/subprojects/extensions-app/data/metainfo/meson.build |
| 62 | @@ -1,5 +1,5 @@ |
| 63 | metainfo = app_id + '.metainfo.xml' |
| 64 | -i18n.merge_file(metainfo, |
| 65 | +i18n.merge_file( |
| 66 | input: base_id + '.metainfo.xml.in', |
| 67 | output: metainfo, |
| 68 | po_dir: po_dir, |
| 69 | diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build |
| 70 | index 670e2bf..d693bfa 100644 |
| 71 | --- a/subprojects/extensions-tool/src/templates/meson.build |
| 72 | +++ b/subprojects/extensions-tool/src/templates/meson.build |
| 73 | @@ -4,7 +4,7 @@ template_metas = [ |
| 74 | ] |
| 75 | template_deps = [] |
| 76 | foreach template : template_metas |
| 77 | - template_deps += i18n.merge_file(template, |
| 78 | + template_deps += i18n.merge_file( |
| 79 | input: template + '.in', |
| 80 | output: template, |
| 81 | po_dir: po_dir, |