head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.34 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.32 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.30 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.28 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.26 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.24 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.22 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.20 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.18 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.16 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.14 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.12 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.10 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.8 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.6 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.4 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.2 pkgsrc-2022Q1-base:1.1; locks; strict; comment @# @; 1.1 date 2022.03.10.21.25.30; author nia; state Exp; branches; next ; commitid fwEmJ4HTxPVkqIvD; desc @@ 1.1 log @gnome-dictionary: fix build with latest meson @ text @$NetBSD$ Remove incorrect positional arguments, previously these would have been silently ignored but now they cause build failures. --- data/meson.build.orig 2017-10-01 14:14:30.000000000 +0000 +++ data/meson.build @@@@ -1,5 +1,4 @@@@ -i18n.merge_file ('desktop', - input: 'org.gnome.Dictionary.desktop.in', +i18n.merge_file (input: 'org.gnome.Dictionary.desktop.in', output: 'org.gnome.Dictionary.desktop', install: true, install_dir: join_paths(gdict_datadir, 'applications'), @@@@ -14,8 +13,7 @@@@ if desktop_file_validate.found() workdir: meson.current_build_dir()) endif -i18n.merge_file ('desktop', - input: 'org.gnome.Dictionary.appdata.xml.in', +i18n.merge_file (input: 'org.gnome.Dictionary.appdata.xml.in', output: 'org.gnome.Dictionary.appdata.xml', install: true, install_dir: join_paths(gdict_datadir, 'appdata'), @@@@ -48,8 +46,7 @@@@ sources = [ ] foreach s: sources - i18n.merge_file('desktop', - input: '@@0@@.in'.format(s), + i18n.merge_file(input: '@@0@@.in'.format(s), output: s, install: true, install_dir: join_paths(gdict_datadir, 'gdict-1.0', 'sources'), @