matteo
/
malcontent
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Remove superfluous arguments to i18n.merge_file 

It fixes the build with meson 0.61.0. The positional argument was
ignored in the past, became a warning in meson 0.60 and a hard error
starting with 0.61.0.
This commit is contained in:
Heiko Becker 2022-01-12 23:45:53 +01:00
parent 88757a149c
commit f433aaf8c8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts-service/meson.build
View File

@ -1,4 +1,4 @@
i18n.merge_file('com.endlessm.ParentalControls.policy', i18n.merge_file(
input: 'com.endlessm.ParentalControls.policy.in', input: 'com.endlessm.ParentalControls.policy.in',
output: 'com.endlessm.ParentalControls.policy', output: 'com.endlessm.ParentalControls.policy',
po_dir: po_dir, po_dir: po_dir,

6
malcontent-control/meson.build
View File

@ -36,7 +36,7 @@ malcontent_control = executable('malcontent-control',
install: true, install: true,
) )
desktop_file = i18n.merge_file('desktop-file', desktop_file = i18n.merge_file(
type: 'desktop', type: 'desktop',
input: '@0@.desktop.in'.format(application_id), input: '@0@.desktop.in'.format(application_id),
output: '@0@.desktop'.format(application_id), output: '@0@.desktop'.format(application_id),
@ -57,7 +57,7 @@ if desktop_file_validate.found()
) )
endif endif
appdata_file = i18n.merge_file('appdata-file', appdata_file = i18n.merge_file(
input: '@0@.appdata.xml.in'.format(application_id), input: '@0@.appdata.xml.in'.format(application_id),
output: '@0@.appdata.xml'.format(application_id), output: '@0@.appdata.xml'.format(application_id),
po_dir: join_paths(meson.current_source_dir(), '..', 'po'), po_dir: join_paths(meson.current_source_dir(), '..', 'po'),
@ -94,7 +94,7 @@ if xmllint.found()
) )
endif endif
policy_file = i18n.merge_file('policy-file', policy_file = i18n.merge_file(
input: '@0@.policy.in'.format(application_id), input: '@0@.policy.in'.format(application_id),
output: '@0@.policy'.format(application_id), output: '@0@.policy'.format(application_id),
po_dir: join_paths(meson.current_source_dir(), '..', 'po'), po_dir: join_paths(meson.current_source_dir(), '..', 'po'),