commit: 071d4cef4eb389c5c85d020abdc22ad542edc6b1 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sat Sep 26 22:32:40 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sat Sep 26 22:34:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071d4cef
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 <zmedico <AT> gentoo.org> dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild index 8a74c20ddcf..93fb56f1380 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 }
