Fri Mar 11 07:45:02 2022 UTC ()
nautilus: fix building with latest meson
(nia)
diff -r1.57 -r1.58 pkgsrc/sysutils/nautilus/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/nautilus/patches/patch-data_meson.build
--- pkgsrc/sysutils/nautilus/distinfo 2021/10/26 11:19:53 1.57
+++ pkgsrc/sysutils/nautilus/distinfo 2022/03/11 07:45:02 1.58
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
1 | $NetBSD: distinfo,v 1.57 2021/10/26 11:19:53 nia Exp $ | | 1 | $NetBSD: distinfo,v 1.58 2022/03/11 07:45:02 nia Exp $ |
2 | | | 2 | |
3 | BLAKE2s (nautilus-3.38.1.tar.xz) = 5d73695c7ea0fe7b2d7da638a9f89850dc2a642fc4e6809e45ab15037757ecd0 | | 3 | BLAKE2s (nautilus-3.38.1.tar.xz) = 5d73695c7ea0fe7b2d7da638a9f89850dc2a642fc4e6809e45ab15037757ecd0 |
4 | SHA512 (nautilus-3.38.1.tar.xz) = 5b0f7bb3fd49d953976d1f71294c70eb3a4df883941d3a0134c63bd562367df45ffa982b40b9273bf8d85cd7cb6e5f0d9828ad2a71cfb82865cca91f624ea195 | | 4 | SHA512 (nautilus-3.38.1.tar.xz) = 5b0f7bb3fd49d953976d1f71294c70eb3a4df883941d3a0134c63bd562367df45ffa982b40b9273bf8d85cd7cb6e5f0d9828ad2a71cfb82865cca91f624ea195 |
5 | Size (nautilus-3.38.1.tar.xz) = 3220728 bytes | | 5 | Size (nautilus-3.38.1.tar.xz) = 3220728 bytes |
| | | 6 | SHA1 (patch-data_meson.build) = c82d49d31d270e4e2c145e072ea81f3ef6c5d1ad |
$NetBSD: patch-data_meson.build,v 1.1 2022/03/11 07:45:02 nia Exp $
Remove unused positional arguments. Previously these were ignored,
now they cause build failures.
--- data/meson.build.orig 2020-10-02 12:27:26.648589800 +0000
+++ data/meson.build
@@ -30,7 +30,6 @@ desktop_conf = configuration_data()
desktop_conf.set('icon', application_id)
desktop = i18n.merge_file(
- 'desktop',
input: configure_file(
input: files('org.gnome.Nautilus.desktop.in.in'),
output: 'org.gnome.Nautilus.desktop.in',
@@ -44,7 +43,6 @@ desktop = i18n.merge_file(
)
desktop_autorun_software = i18n.merge_file(
- 'desktop-autorun-software',
input: 'nautilus-autorun-software.desktop.in',
output: 'nautilus-autorun-software.desktop',
install: true,
@@ -58,7 +56,6 @@ appdata_conf = configuration_data()
appdata_conf.set('appid', application_id)
appdata = i18n.merge_file(
- 'appdata',
input: configure_file(
input: files('org.gnome.Nautilus.appdata.xml.in.in'),
output: 'org.gnome.Nautilus.appdata.xml.in',