From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CD320158087 for ; Sat, 22 Jan 2022 18:40:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25C762BC009; Sat, 22 Jan 2022 18:40:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B12A72BC009 for ; Sat, 22 Jan 2022 18:40:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8CB32343191 for ; Sat, 22 Jan 2022 18:40:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3D84275 for ; Sat, 22 Jan 2022 18:40:49 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1642876835.4f2e9e58208431cbcca93aafba1784618ef970e9.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gvfs/files/meson-0.61.patch gnome-base/gvfs/gvfs-1.48.1-r1.ebuild X-VCS-Directories: gnome-base/gvfs/files/ gnome-base/gvfs/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 4f2e9e58208431cbcca93aafba1784618ef970e9 X-VCS-Branch: master Date: Sat, 22 Jan 2022 18:40:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e64a4634-97ad-4786-843e-80c9dff30de3 X-Archives-Hash: c9a15c68f3c9f994662a54685d9deba3 commit: 4f2e9e58208431cbcca93aafba1784618ef970e9 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jan 22 18:40:09 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jan 22 18:40:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f2e9e58 gnome-base/gvfs: backport fix for meson-0.61 Closes: https://bugs.gentoo.org/831840 Signed-off-by: Mike Gilbert gentoo.org> gnome-base/gvfs/files/meson-0.61.patch | 33 +++++++++++++++++++++++++++++++++ gnome-base/gvfs/gvfs-1.48.1-r1.ebuild | 6 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/gnome-base/gvfs/files/meson-0.61.patch b/gnome-base/gvfs/files/meson-0.61.patch new file mode 100644 index 000000000000..20e03388d7c6 --- /dev/null +++ b/gnome-base/gvfs/files/meson-0.61.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/831840 +https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/133 + +From 1522bf6a9741cf6f1fe16eaf50fd20af46882873 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Fri, 21 Jan 2022 08:32:31 +0100 +Subject: [PATCH] build: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". + +Related: https://github.com/mesonbuild/meson/issues/9441 +Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 +(cherry picked from commit 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0) +--- + daemon/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/daemon/meson.build b/daemon/meson.build +index dffeef3e..bdc506fe 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -366,7 +366,6 @@ if enable_admin + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: '@BASENAME@', + po_dir: po_dir, +-- +2.34.1 + diff --git a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild index f4b50cffc64b..38deee759bc2 100644 --- a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild +++ b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -82,6 +82,10 @@ BDEPEND=" test? ( dev-libs/libgdata ) " +PATCHES=( + "${FILESDIR}/meson-0.61.patch" +) + src_configure() { local enable_logind="false" if use systemd || use elogind; then