Summary: | dev-games/irrlicht-1.8.4-r1 : * patch -p1 failed with /var/tmp/portage/dev-games/irrlicht-1.8.4-r1/files/irrlicht-1.8.4-remove-sy | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Toralf Förster <toralf> |
Component: | Current packages | Assignee: | Gentoo Games <games> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | bjh-gentoobt, silvio.gerli, zmedico |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Attachments: |
emerge-info.txt
dev-games:irrlicht-1.8.4-r1:20200906-103405.log emerge-history.txt environment etc.portage.tbz2 logs.tbz2 temp.tbz2 |
Description
Toralf Förster
2020-09-06 10:41:03 UTC
Created attachment 658732 [details]
emerge-info.txt
Created attachment 658734 [details]
dev-games:irrlicht-1.8.4-r1:20200906-103405.log
Created attachment 658736 [details]
emerge-history.txt
Created attachment 658738 [details]
environment
Created attachment 658740 [details]
etc.portage.tbz2
Created attachment 658742 [details]
logs.tbz2
Created attachment 658744 [details]
temp.tbz2
The code line that the patch remove-sys-sysctl.h tries to remove, is removed from the irrlicht upstream already. So after dropping out the patch, ie. commenting out the line "${FILESDIR}/${P}-remove-sys-sysctl.h.patch" in the ebuild, irrlicht builds fine. If you read dev-games:irrlicht-1.8.4-r1:20200906-103405.log, you'll find that the error is due to "different line endings". The files/irrlicht-1.8.4-remove-sys-sysctl.h.patch has Unix line endings (LF) and the source file has DOS line endings (CRLF). Unfortunately, we're also pulling in patches from https://dev.gentoo.org/~mgorny/ which has CRLF line endings to match the source. So either we need to convert files/irrlicht-1.8.4-remove-sys-sysctl.h.patch to use CRLF, or dos2unix both the source tree and the mgorny patchset during src_unpack(). Yes, the remove-sys-sysctl patch is not necessary for upstream trunk, but that hasn't made its way to a release yet. The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071d4cef4eb389c5c85d020abdc22ad542edc6b1 commit 071d4cef4eb389c5c85d020abdc22ad542edc6b1 Author: Zac Medico <zmedico@gentoo.org> AuthorDate: 2020-09-26 22:32:40 +0000 Commit: Zac Medico <zmedico@gentoo.org> CommitDate: 2020-09-26 22:34:21 +0000 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> dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) |