From 071d4cef4eb389c5c85d020abdc22ad542edc6b1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 26 Sep 2020 15:32:40 -0700 Subject: dev-games/irrlicht: Fix eapply failure due to trailing CRs (Stripping trailing CRs from patch; use --binary to disable.) patching file source/Irrlicht/COSOperator.cpp Hunk #1 FAILED at 13 (different line endings). 1 out of 1 hunk FAILED -- saving rejects to file source/Irrlicht/COSOperator.cpp.rej Closes: https://bugs.gentoo.org/740678 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Zac Medico --- dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'dev-games') diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild index 8a74c20ddcfb..93fb56f1380e 100644 --- a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild +++ b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild @@ -51,6 +51,12 @@ src_prepare() { $(grep -rl '\.\./\.\./media' examples) \ || die 'sed failed' + # Fix line endings so ${P}-remove-sys-sysctl.h.patch applies + sed -i \ + -e 's/\r$//' \ + source/Irrlicht/COSOperator.cpp \ + || die 'sed failed' + default } -- cgit v1.2.3-65-gdbad