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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 39675 in the body.
You can then email your comments to 39675 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: raingloom <raingloom <at> riseup.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] fix Desmume on newer GCC
Date: Wed, 19 Feb 2020 14:41:21 +0100

[Message part 1 (text/plain, inline)]

The project has not seen much development in some time, so it needed a 
few patches. I found them in the Arch package, but they seem to be from 
the upstream SourceForge project and mailing list.

[0001-gnu-desmume-fix-build-on-new-GCC-versions.patch (text/x-patch, attachment)]

Message #8 received at 39675 <at> debbugs.gnu.org (full text, mbox):

From: Jakub Kądziołka <kuba <at> kadziolka.net>
To: raingloom <raingloom <at> riseup.net>
Cc: 39675 <at> debbugs.gnu.org
Subject: Re: [PATCH] fix Desmume on newer GCC
Date: Thu, 20 Feb 2020 17:04:17 +0100

[Message part 1 (text/plain, inline)]

On Wed, Feb 19, 2020 at 02:41:21PM +0100, raingloom wrote:
> The project has not seen much development in some time, so it needed a few
> patches. I found them in the Arch package, but they seem to be from the
> upstream SourceForge project and mailing list.
> 

Hi,

the bullet points in your commit message are at the end of the lines for
some reason. Also, the added .patch files don't apply when I `guix build
desmume'. I think you'll need to resend the patch. Also, when you add
.patch files, you need to add them to a list in gnu/local.mk.

Regards,
Jakub Kądziołka

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 39675 <at> debbugs.gnu.org (full text, mbox):

From: raingloom <raingloom <at> riseup.net>
To: 39675 <at> debbugs.gnu.org
Subject: Re: [PATCH] fix Desmume on newer GCC
Date: Sat, 22 Feb 2020 10:31:31 +0100

[Message part 1 (text/plain, inline)]

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.

On Thu, Feb 20, 2020 at 17:04, Jakub Kądziołka <kuba <at> kadziolka.net> 
wrote:
> On Wed, Feb 19, 2020 at 02:41:21PM +0100, raingloom wrote:
>>  The project has not seen much development in some time, so it 
>> needed a few
>>  patches. I found them in the Arch package, but they seem to be from 
>> the
>>  upstream SourceForge project and mailing list.
>> 
> 
> Hi,
> 
> the bullet points in your commit message are at the end of the lines 
> for
> some reason. Also, the added .patch files don't apply when I `guix 
> build
> desmume'. I think you'll need to resend the patch. Also, when you add
> .patch files, you need to add them to a list in gnu/local.mk.
> 
> Regards,
> Jakub Kądziołka

[0001-gnu-desmume-fix-build-on-new-GCC-versions.patch (text/x-patch, attachment)]

Message #14 received at 39675 <at> debbugs.gnu.org (full text, mbox):

From: Jakub Kądziołka <kuba <at> kadziolka.net>
To: raingloom <raingloom <at> riseup.net>
Cc: 39675 <at> debbugs.gnu.org
Subject: Re: [PATCH] fix Desmume on newer GCC
Date: Sat, 22 Feb 2020 16:39:49 +0100

[Message part 1 (text/plain, inline)]

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.

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 39675 <at> debbugs.gnu.org (full text, mbox):

From: raingloom <raingloom <at> riseup.net>
To: 39675 <39675 <at> debbugs.gnu.org>
Subject: Re: [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.

Message #22 received at 39675-done <at> debbugs.gnu.org (full text, mbox):

From: Jakub Kądziołka <kuba <at> kadziolka.net>
To: 39675-done <at> debbugs.gnu.org
Cc: raingloom <at> riseup.net
Subject: Done: [PATCH] fix Desmume on newer GCC
Date: Sun, 23 Feb 2020 20:31:50 +0100

[Message part 1 (text/plain, inline)]

Pulling directly worked like a charm. Add your any files you create to
gnu/local.mk next time.

Pushed to master as f267420707142dc17f8e9f976f98447697823c85.

Thanks!

[signature.asc (application/pgp-signature, inline)]

Previous Next

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