From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54470) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5e43-00057H-SQ for guix-patches@gnu.org; Sat, 22 Feb 2020 18:20:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5e42-0007ma-MH for guix-patches@gnu.org; Sat, 22 Feb 2020 18:20:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44233) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5e42-0007mR-G5 for guix-patches@gnu.org; Sat, 22 Feb 2020 18:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5e42-0006Q4-Az for guix-patches@gnu.org; Sat, 22 Feb 2020 18:20:02 -0500 Subject: [bug#39675] [PATCH] fix Desmume on newer GCC Resent-Message-ID: Date: Sun, 23 Feb 2020 00:19:11 +0100 From: raingloom Message-Id: <1582413551.30358.0@riseup.net> In-Reply-To: <20200222153949.fkr5xlbmbm6y4mvp@gravity> References: <1582119681.2225.1@riseup.net> <20200220160417.mbd2twtzkoknr5z7@gravity> <1582363891.3461.0@riseup.net> <20200222153949.fkr5xlbmbm6y4mvp@gravity> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39675 <39675@debbugs.gnu.org> 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=20 and the docs didn't help. On Sat, Feb 22, 2020 at 16:39, Jakub K=C4=85dzio=C5=82ka =20 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. >>=20 >> Here is a patch for the current master as of a few minutes ago. >=20 > Something is still off: >=20 > 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=20 > '/gnu/store/yc9991nl8vgkyszbb77ywr9idikyi5lj-desmume-gcc6-fixes.patch'... > Backtrace: > 3 (primitive-load=20 > "/gnu/store/zxjsjnfbzqqz2zgks5xgkh63m30=E2=80=A6") > In ice-9/eval.scm: > 619:8 2 (_ #(#=20 > "desmume-=E2=80=A6")) > In srfi/srfi-1.scm: > 640:9 1 (for-each # ("/gnu/store/=E2=80= =A6"=20 > =E2=80=A6)) > In guix/build/utils.scm: > 652:6 0 (invoke _ . _) >=20 > guix/build/utils.scm:652:6: In procedure invoke: > Throw to key `srfi-34' with args `(# [program:=20 > "/gnu/store/v76scv4n63ip08g119rczh2mrw31zwpd-patch-2.7.6/bin/patch"=20 > arguments: ("--force" "--no-backup-if-mismatch" "-p1" "--input"=20 > "/gnu/store/yc9991nl8vgkyszbb77ywr9idikyi5lj-desmume-gcc6-fixes.patch")=20 > exit-status: 1 term-signal: #f stop-signal: #f] 7ffff6022d00>)'. >=20 > `file src/MMU_timing.h` in the build directory suggests that the=20 > header > file is shipped with CRLF line endings. Could `git format-patch` be > converting \r\n in your files into plain \n? >=20 > I tried to work around this with some combinations of > (origin (patch-flags '("--ignore-whitespace" "-p1"))), but no results. =