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 2CC76158087 for ; Thu, 20 Jan 2022 03:11:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B5F2E0769; Thu, 20 Jan 2022 03:11:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 DA952E0769 for ; Thu, 20 Jan 2022 03:11:05 +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 CDF133432CD for ; Thu, 20 Jan 2022 03:11:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A0982A3 for ; Thu, 20 Jan 2022 03:11:02 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642648015.c9523ed2280ff58ffa50c8742e26f1185105509b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/accountsservice/files/, sys-apps/accountsservice/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch X-VCS-Directories: sys-apps/accountsservice/ sys-apps/accountsservice/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c9523ed2280ff58ffa50c8742e26f1185105509b X-VCS-Branch: master Date: Thu, 20 Jan 2022 03:11:02 +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: 492f3103-0de2-4da7-ad55-a72a5b2b080a X-Archives-Hash: 970f9f4201ba6936637cecb86e05b63c commit: c9523ed2280ff58ffa50c8742e26f1185105509b Author: Sam James gentoo org> AuthorDate: Thu Jan 20 03:06:55 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 20 03:06:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9523ed2 sys-apps/accountsservice: fix build with meson 0.61 Closes: https://bugs.gentoo.org/831465 Signed-off-by: Sam James gentoo.org> .../accountsservice-0.6.55-r1.ebuild | 3 ++- .../accountsservice-0.6.55-meson-0.61-build.patch | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild index 9c0dcab956dd..04cf8d0705b8 100644 --- a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild +++ b/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2021 Gentoo Authors +# Copyright 2011-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -43,6 +43,7 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-0.6.35-gentoo-system-users.patch + "${FILESDIR}"/${P}-meson-0.61-build.patch ) src_configure() { diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch b/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch new file mode 100644 index 000000000000..d56f4b7e63b8 --- /dev/null +++ b/sys-apps/accountsservice/files/accountsservice-0.6.55-meson-0.61-build.patch @@ -0,0 +1,23 @@ +https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch +https://bugs.gentoo.org/831465 + +From: Luca Boccassi +Date: Sun, 31 Oct 2021 12:29:14 +0000 +Subject: [PATCH] Fix build with meson 0.60 + +Positional parameters to merge_file() were never allowed and always +ignored, so just drop it. +See: https://github.com/mesonbuild/meson/issues/9441 + +Fixes #97 +--- a/data/meson.build ++++ b/data/meson.build +@@ -33,7 +33,6 @@ configure_file( + policy = act_namespace.to_lower() + '.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: policy, + po_dir: po_dir, +GitLab