From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:60269) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5Wst-0006Pi-2N for guix-patches@gnu.org; Sat, 22 Feb 2020 10:40:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5Wss-0001Gj-3C for guix-patches@gnu.org; Sat, 22 Feb 2020 10:40:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5Wsr-0001GZ-Vv for guix-patches@gnu.org; Sat, 22 Feb 2020 10:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5Wsr-0004yL-S5 for guix-patches@gnu.org; Sat, 22 Feb 2020 10:40:01 -0500 Subject: [bug#39675] [PATCH] fix Desmume on newer GCC Resent-Message-ID: Date: Sat, 22 Feb 2020 16:39:49 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200222153949.fkr5xlbmbm6y4mvp@gravity> References: <1582119681.2225.1@riseup.net> <20200220160417.mbd2twtzkoknr5z7@gravity> <1582363891.3461.0@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hiwgydewsojlyuej" Content-Disposition: inline In-Reply-To: <1582363891.3461.0@riseup.net> 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: raingloom Cc: 39675@debbugs.gnu.org --hiwgydewsojlyuej Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. 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.pa= tch'... Backtrace: 3 (primitive-load "/gnu/store/zxjsjnfbzqqz2zgks5xgkh63m30=E2=80= =A6") In ice-9/eval.scm: 619:8 2 (_ #(# "desmume-=E2=80=A6= ")) In srfi/srfi-1.scm: 640:9 1 (for-each # ("/gnu/store/=E2=80=A6"= =E2=80=A6)) 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 `(#)'. `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. --hiwgydewsojlyuej Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl5RS0UACgkQ4xWnWEYT FWT4hRAA0znU3xICaS1cjutDuh8GA4U3FFug5Dcq9UNIzaDyrr3jZ6bnqLc52k+/ n+1h8A9TGtbN98+ujUOFPkcDqRDy+B11lfaXpydXzS5Fo4qrGDuyqNLqp73s7DBE uCVUdScFNvloewbIzFGSAraiLfEqF291I4lrYKCJCIA3ns0oIM11V2Q1567O1kfh MsYQFRxg6FU740xjFyCCCA4mH7DnxYQmwul5bA+YWg6mkCEqGm6wyDQCF8aZDxuU WG+HC9SbzAuzt99ld22HT5OKceOb0qmlmtDLYXmcu5t9JECBRBwbpmTsiGOGOM7v vii62x1cZPPLeK7f8bYSHAS8eQnYU8pZ+nAQbY3kReERFkreD5quIbi4nhOL4613 D8+2iRXRgsdo6U+8GZt9lrQXSUMx7lQQoeNOkYjokl5e6l426Fzm2BJVYoOFL+cG N/YE25fqd8oTxmo+ti3y+51HuyghSfcLmChShOyUuLU2GPb5hMkPEwaKtGMOeZgV E6NpMJk/eiCidEV6UMsMAZ4S/TJT8PfKcyxIj5120p6BiQ0nmj9NWhBnUvGIxfVW g/FP9IWeR5QqDOGelYX6/BtXr8fx1RhDuFHQ5EEu7SmSY+lv3Al1kDK+1g+zUkpu m84dXNXehPNb8B3Ja1v06t8lLvJDHOeOc90c+7rm0TBK7IjpucY= =p782 -----END PGP SIGNATURE----- --hiwgydewsojlyuej--