From 2e3800a592ff6bfe6fe6075e46ff3e5b6851a2ec Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 23 Aug 2024 15:45:41 +0100 Subject: [PATCH] x11-misc/xvfb-run: fix filterdiff error handling Signed-off-by: Sam James --- 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 cc9e028b4a34c..d3f185b1c52f0 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 1191b6b39e1cc..d3f185b1c52f0 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 1191b6b39e1cc..d3f185b1c52f0 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 b37ac978a7973..22f09ed6cbbd7 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 }