Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/
Date: Sat, 26 Sep 2020 22:34:32
Message-Id: 1601159661.071d4cef4eb389c5c85d020abdc22ad542edc6b1.zmedico@gentoo
1 commit: 071d4cef4eb389c5c85d020abdc22ad542edc6b1
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 26 22:32:40 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 26 22:34:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071d4cef
7
8 dev-games/irrlicht: Fix eapply failure due to trailing CRs
9
10 (Stripping trailing CRs from patch; use --binary to disable.)
11 patching file source/Irrlicht/COSOperator.cpp
12 Hunk #1 FAILED at 13 (different line endings).
13 1 out of 1 hunk FAILED -- saving rejects to file source/Irrlicht/COSOperator.cpp.rej
14
15 Closes: https://bugs.gentoo.org/740678
16 Package-Manager: Portage-3.0.8, Repoman-3.0.1
17 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
18
19 dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild | 6 ++++++
20 1 file changed, 6 insertions(+)
21
22 diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
23 index 8a74c20ddcf..93fb56f1380 100644
24 --- a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
25 +++ b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
26 @@ -51,6 +51,12 @@ src_prepare() {
27 $(grep -rl '\.\./\.\./media' examples) \
28 || die 'sed failed'
29
30 + # Fix line endings so ${P}-remove-sys-sysctl.h.patch applies
31 + sed -i \
32 + -e 's/\r$//' \
33 + source/Irrlicht/COSOperator.cpp \
34 + || die 'sed failed'
35 +
36 default
37 }