GNU bug report logs - #39675
[PATCH] fix Desmume on newer GCC

Previous Next

Full log

View this message in rfc822 format

From: raingloom <raingloom <at> riseup.net>
To: 39675 <39675 <at> debbugs.gnu.org>
Subject: [bug#39675] [PATCH] fix Desmume on newer GCC
Date: Sun, 23 Feb 2020 00:19:11 +0100

It could for all I know. What if you just pulled it from my gitlab?

https://gitlab.com/raingloom/guix-source/-/tree/raingloom/desmume

I have no idea how to preserve mixed line endings in git format-patch 
and the docs didn't help.

On Sat, Feb 22, 2020 at 16:39, Jakub Kądziołka <kuba <at> kadziolka.net> 
wrote:
> On Sat, Feb 22, 2020 at 10:31:31AM +0100, raingloom wrote:
>>  Ah, I forgot to leave a blank line in the commit message.
>> 
>>  Here is a patch for the current master as of a few minutes ago.
> 
> Something is still off:
> 
> patching file src/MMU_timing.h
> Hunk #1 FAILED at 155 (different line endings).
> 1 out of 1 hunk FAILED -- saving rejects to file src/MMU_timing.h.rej
> patching file src/ctrlssdl.cpp
> patching file src/wifi.cpp
> Hunk #1 succeeded at 314 (offset -6 lines).
> source is under 'desmume-0.9.11'
> applying 
> '/gnu/store/yc9991nl8vgkyszbb77ywr9idikyi5lj-desmume-gcc6-fixes.patch'...
> Backtrace:
>            3 (primitive-load 
> "/gnu/store/zxjsjnfbzqqz2zgks5xgkh63m30…")
> In ice-9/eval.scm:
>     619:8  2 (_ #(#<directory (guile-user) 7ffff5c70140> 
> "desmume-…"))
> In srfi/srfi-1.scm:
>     640:9  1 (for-each #<procedure apply-patch (a)> ("/gnu/store/…" 
> …))
> In guix/build/utils.scm:
>     652:6  0 (invoke _ . _)
> 
> guix/build/utils.scm:652:6: In procedure invoke:
> Throw to key `srfi-34' with args `(#<condition &invoke-error 
> [program: 
> "/gnu/store/v76scv4n63ip08g119rczh2mrw31zwpd-patch-2.7.6/bin/patch" 
> arguments: ("--force" "--no-backup-if-mismatch" "-p1" "--input" 
> "/gnu/store/yc9991nl8vgkyszbb77ywr9idikyi5lj-desmume-gcc6-fixes.patch") 
> exit-status: 1 term-signal: #f stop-signal: #f] 7ffff6022d00>)'.
> 
> `file src/MMU_timing.h` in the build directory suggests that the 
> header
> file is shipped with CRLF line endings. Could `git format-patch` be
> converting \r\n in your files into plain \n?
> 
> I tried to work around this with some combinations of
> (origin (patch-flags '("--ignore-whitespace" "-p1"))), but no results.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.