Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 0B5661A9239 for ; Fri, 11 Mar 2022 07:45:05 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 259DC84F06; Fri, 11 Mar 2022 07:45:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5DF2C84EED for ; Fri, 11 Mar 2022 07:45:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id aDxQvGrITjgO for ; Fri, 11 Mar 2022 07:45:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CE29A84EC7 for ; Fri, 11 Mar 2022 07:45:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C7AD3FB24; Fri, 11 Mar 2022 07:45:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1646984702218400" MIME-Version: 1.0 Date: Fri, 11 Mar 2022 07:45:02 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/sysutils/nautilus To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20220311074502.C7AD3FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1646984702218400 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Mar 11 07:45:02 UTC 2022 Modified Files: pkgsrc/sysutils/nautilus: distinfo Added Files: pkgsrc/sysutils/nautilus/patches: patch-data_meson.build Log Message: nautilus: fix building with latest meson To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 pkgsrc/sysutils/nautilus/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/nautilus/patches/patch-data_meson.build Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1646984702218400 Content-Disposition: inline Content-Length: 2156 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/nautilus/distinfo diff -u pkgsrc/sysutils/nautilus/distinfo:1.57 pkgsrc/sysutils/nautilus/distinfo:1.58 --- pkgsrc/sysutils/nautilus/distinfo:1.57 Tue Oct 26 11:19:53 2021 +++ pkgsrc/sysutils/nautilus/distinfo Fri Mar 11 07:45:02 2022 @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.57 2021/10/26 11:19:53 nia Exp $ +$NetBSD: distinfo,v 1.58 2022/03/11 07:45:02 nia Exp $ BLAKE2s (nautilus-3.38.1.tar.xz) = 5d73695c7ea0fe7b2d7da638a9f89850dc2a642fc4e6809e45ab15037757ecd0 SHA512 (nautilus-3.38.1.tar.xz) = 5b0f7bb3fd49d953976d1f71294c70eb3a4df883941d3a0134c63bd562367df45ffa982b40b9273bf8d85cd7cb6e5f0d9828ad2a71cfb82865cca91f624ea195 Size (nautilus-3.38.1.tar.xz) = 3220728 bytes +SHA1 (patch-data_meson.build) = c82d49d31d270e4e2c145e072ea81f3ef6c5d1ad Added files: Index: pkgsrc/sysutils/nautilus/patches/patch-data_meson.build diff -u /dev/null pkgsrc/sysutils/nautilus/patches/patch-data_meson.build:1.1 --- /dev/null Fri Mar 11 07:45:02 2022 +++ pkgsrc/sysutils/nautilus/patches/patch-data_meson.build Fri Mar 11 07:45:02 2022 @@ -0,0 +1,31 @@ +$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', --_----------=_1646984702218400--