diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2020-09-26 15:32:40 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2020-09-26 15:34:21 -0700 |
| commit | 071d4cef4eb389c5c85d020abdc22ad542edc6b1 (patch) | |
| tree | 605eee992507b56ea0acef3da6a954f6d39791d4 /dev-games | |
| parent | mail-filter/pyzor: stable 1.0.0_p20200523 for hppa (diff) | |
| download | gentoo-071d4cef4eb389c5c85d020abdc22ad542edc6b1.tar.gz gentoo-071d4cef4eb389c5c85d020abdc22ad542edc6b1.tar.bz2 gentoo-071d4cef4eb389c5c85d020abdc22ad542edc6b1.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild | 6 |
1 files changed, 6 insertions, 0 deletions
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 } |