brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Drop incorrect positional arg

Browse Source 
Unlike other targets that take a name, i18n.merge_file() does not.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
This commit is contained in:
Florian Müllner 2021-12-23 17:18:16 +01:00 committed by Marge Bot
parent 920714008c
commit 65450a836e
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/meson.build
View File

@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
foreach desktop_file : desktop_files foreach desktop_file : desktop_files
i18n.merge_file('desktop', i18n.merge_file(
input: configure_file( input: configure_file(
input: desktop_file + '.in.in', input: desktop_file + '.in.in',
output: desktop_file + '.in', output: desktop_file + '.in',

2
src/calendar-server/meson.build
View File

@ -27,7 +27,7 @@ configure_file(
install_dir: servicedir install_dir: servicedir
) )
i18n.merge_file('evolution-calendar.desktop', i18n.merge_file(
input: 'evolution-calendar.desktop.in', input: 'evolution-calendar.desktop.in',
output: 'evolution-calendar.desktop', output: 'evolution-calendar.desktop',
po_dir: po_dir, po_dir: po_dir,

2
subprojects/extensions-app/data/meson.build
View File

@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
desktopconf.set('app_id', app_id) desktopconf.set('app_id', app_id)
desktopconf.set('prgname', prgname) desktopconf.set('prgname', prgname)
i18n.merge_file('desktop', i18n.merge_file(
input: configure_file( input: configure_file(
input: base_id + '.desktop.in.in', input: base_id + '.desktop.in.in',
output: desktop_file + '.in', output: desktop_file + '.in',

2
subprojects/extensions-app/data/metainfo/meson.build
View File

@ -1,5 +1,5 @@
metainfo = app_id + '.metainfo.xml' metainfo = app_id + '.metainfo.xml'
i18n.merge_file(metainfo, i18n.merge_file(
input: base_id + '.metainfo.xml.in', input: base_id + '.metainfo.xml.in',
output: metainfo, output: metainfo,
po_dir: po_dir, po_dir: po_dir,

2
subprojects/extensions-tool/src/templates/meson.build
View File

@ -4,7 +4,7 @@ template_metas = [
] ]
template_deps = [] template_deps = []
foreach template : template_metas foreach template : template_metas
template_deps += i18n.merge_file(template, template_deps += i18n.merge_file(
input: template + '.in', input: template + '.in',
output: template, output: template,
po_dir: po_dir, po_dir: po_dir,