Merge branch 'fix-build-with-meson-0-61' into 'main'
Remove superfluous arguments to i18n.merge_file See merge request pwithnall/malcontent!132
This commit is contained in:
commit
db48b73b6e
|
@ -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,
|
||||||
|
|
|
@ -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'),
|
||||||
|
|
Loading…
Reference in New Issue