Re: [PATCH] gnu: Add p7zip.

[Ricardo Wurmus <rekado@elephly.net>]

Hi Kei,

> Ricardo Wurmus <rekado@elephly.net> writes:
>
>> Kei Kebreau <kei@openmailbox.org> writes:
>>
>>> Ricardo Wurmus <rekado@elephly.net> writes:
>>>
>>>> Kei Kebreau <kei@openmailbox.org> writes:
>>>>
>>>>> Whoops, last patch was a bit messy and stacked on the previous one. This
>>>>> patch should be better!
>>>>
>>>> I just wanted to push a slightly modified version of this (attached) but
>>>> I cannot actually build the package.  The patch to remove unused code
>>>> does not apply due to different line endings.
>>>>
>>>> Could you please take a look at this again and make sure that the patch
>>>> to the sources applies?
>>>>
>>>> ~~ Ricardo
>>>>
>>> I just tried it on my machine, and everything applied and built
>>> correctly from a clean Guix tree. I don't exactly know how to proceed
>>> From here. Perhaps a third party can try to build from the patch?
>>
>> The problem might be with the inline patch in the email.  Don’t know.
>>
>> ~~ Ricardo
>
> I'll try sending it again, for lack of a better plan. If all else fails
> I can post it on paste.lisp.org.

I fetched the unpatched sources, initialised a fresh git repo, then
partially applied the patch, then fixed the errors, then regenerated the
patch and compared it to your patch.  Turns out that all of the lines in
the two failed hunks end on 0x0d0a, but in your patch this doesn’t
happen, hence the error messages.

I pushed the amended commit to master as
adbd7faf412297e48931ba4f7ad9a062d852ab8a.

~~ Ricardo