Thu Mar 10 21:25:30 2022 UTC ()
gnome-dictionary: fix build with latest meson
(nia)
diff -r1.3 -r1.4 pkgsrc/textproc/gnome-dictionary/distinfo
diff -r0 -r1.1 pkgsrc/textproc/gnome-dictionary/patches/patch-data_meson.build
--- pkgsrc/textproc/gnome-dictionary/distinfo 2021/10/26 11:21:54 1.3
+++ pkgsrc/textproc/gnome-dictionary/distinfo 2022/03/10 21:25:30 1.4
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
| 1 | $NetBSD: distinfo,v 1.3 2021/10/26 11:21:54 nia Exp $ | | 1 | $NetBSD: distinfo,v 1.4 2022/03/10 21:25:30 nia Exp $ |
| 2 | | | 2 | |
| 3 | BLAKE2s (gnome-dictionary-3.26.1.tar.xz) = 822ab7b66510e33d6d8ea4920abe64e95a24e76918f438d259bd59bb2de1ec26 | | 3 | BLAKE2s (gnome-dictionary-3.26.1.tar.xz) = 822ab7b66510e33d6d8ea4920abe64e95a24e76918f438d259bd59bb2de1ec26 |
| 4 | SHA512 (gnome-dictionary-3.26.1.tar.xz) = da7169795740295c13f02143f5263603f0f6c621e96cecf88a4ee089114399d59f083987bc4571821467da64dc43f00bebbe4ea66b46a035088f85d35d6aee27 | | 4 | SHA512 (gnome-dictionary-3.26.1.tar.xz) = da7169795740295c13f02143f5263603f0f6c621e96cecf88a4ee089114399d59f083987bc4571821467da64dc43f00bebbe4ea66b46a035088f85d35d6aee27 |
| 5 | Size (gnome-dictionary-3.26.1.tar.xz) = 662048 bytes | | 5 | Size (gnome-dictionary-3.26.1.tar.xz) = 662048 bytes |
| | | 6 | SHA1 (patch-data_meson.build) = 22860f60098033d2ca944d9c297ca5b10fb456a6 |
$NetBSD: patch-data_meson.build,v 1.1 2022/03/10 21:25:30 nia Exp $
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'),