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 2A43115852A for ; Fri, 23 Aug 2024 14:48:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C88DE2A21; Fri, 23 Aug 2024 14:48:43 +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 0203BE2A21 for ; Fri, 23 Aug 2024 14:48:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08792342FAE for ; Fri, 23 Aug 2024 14:48:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 436AE1F07 for ; Fri, 23 Aug 2024 14:48:40 +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: <1724424341.2e3800a592ff6bfe6fe6075e46ff3e5b6851a2ec.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xvfb-run/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild X-VCS-Directories: x11-misc/xvfb-run/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2e3800a592ff6bfe6fe6075e46ff3e5b6851a2ec X-VCS-Branch: master Date: Fri, 23 Aug 2024 14:48:40 +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: 103903de-41b2-4c01-bb2a-1cb117023d22 X-Archives-Hash: e27d05b7a5d0fdefcf8f2e62200e3614 commit: 2e3800a592ff6bfe6fe6075e46ff3e5b6851a2ec Author: Sam James gentoo org> AuthorDate: Fri Aug 23 14:45:41 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Aug 23 14:45:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e3800a5 x11-misc/xvfb-run: fix filterdiff error handling Signed-off-by: Sam James gentoo.org> x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild | 3 ++- x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild | 1 + x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild | 1 + x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild | 5 +++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild index cc9e028b4a34..d3f185b1c52f 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,6 +22,7 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + assert "filterdiff+patch failed" eapply_user } diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild index 1191b6b39e1c..d3f185b1c52f 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild @@ -22,6 +22,7 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + assert "filterdiff+patch failed" eapply_user } diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild index 1191b6b39e1c..d3f185b1c52f 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild @@ -22,6 +22,7 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + assert "filterdiff+patch failed" eapply_user } diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild index b37ac978a797..22f09ed6cbbd 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,8 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch + assert "filterdiff+patch failed" eapply_user }