Mail archive
alpine-aports

Re: [alpine-aports] [PATCH v2] testing/vice: new aport

From: Jean-Louis Fuchs <g_at_1042.ch>
Date: Mon, 23 Jan 2017 14:12:56 +0100

Hi |_eo

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:

http://stackoverflow.com/questions/6289001/git-am-format-patch-control-format-of-line-endings/6677017#6677017

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
further.

Best,
    Jean-Louis




---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Mon Jan 23 2017 - 14:12:56 GMT