Re: [alpine-aports] [PATCH v2] testing/vice: new aport
On Mon, Jan 23, 2017 at 01:42:52PM +0100, Leonardo Arena wrote:
> sorry but patching fails:
> >>> vice: fix__u_char.patch
> patching file src/opencbm.h
> Hunk #1 FAILED at 131 (different line endings).
> 1 out of 1 hunk FAILED -- saving rejects to file src/opencbm.h.rej
> Can you send an updated patch? Also please note that APKBUILD checksums
> are not updated.
I'm not 100% sure, but I think the problem lies on your end. According
to this stackoverflow article:
you should use:
git am --keep-cr
The whole problem is caused by opencbm.h using DOS line endings.
Please let me know if I am wrong. I'll then research the problem
Received on Mon Jan 23 2017 - 14:12:56 UTC