X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mailauth3.nine.ch (mailauth3.nine.ch [94.230.211.187]) by lists.alpinelinux.org (Postfix) with ESMTP id ECE715C41BC for ; Mon, 23 Jan 2017 13:12:58 +0000 (GMT) Received: from localhost (localhost [127.0.0.1]) by mailauth3.nine.ch (Postfix) with ESMTP id 9C41511F840; Mon, 23 Jan 2017 14:12:57 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mailauth3.nine.ch X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-999 required=5.8 tests=[ALL_TRUSTED=-1] autolearn=disabled Received: from mailauth3.nine.ch ([127.0.0.1]) by localhost (mailauth3.nine.ch [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BNBKsVONKm8z; Mon, 23 Jan 2017 14:12:56 +0100 (CET) Received: from vimes (174.180.4.85.dynamic.wline.res.cust.swisscom.ch [85.4.180.174]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: pf@1042.ch) by mailauth3.nine.ch (Postfix) with ESMTPSA; Mon, 23 Jan 2017 14:12:56 +0100 (CET) Received: by vimes (Postfix, from userid 1000) id 3008A80131; Mon, 23 Jan 2017 14:12:56 +0100 (CET) Date: Mon, 23 Jan 2017 14:12:56 +0100 From: Jean-Louis Fuchs To: Leonardo Arena Cc: Jean-Louis Fuchs , alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH v2] testing/vice: new aport Message-ID: <20170123131256.GA16200@vimes.1042.ch> References: <1485169970.11710.3.camel@gmail.com> <20170123120542.8623-1-ganwell@fangorn.ch> <1485175372.11710.5.camel@gmail.com> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="BOKacYhQ+x31HxR3" Content-Disposition: inline In-Reply-To: <1485175372.11710.5.camel@gmail.com> User-Agent: Mutt/1.7.2 (2016-11-26) --BOKacYhQ+x31HxR3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi |_eo On Mon, Jan 23, 2017 at 01:42:52PM +0100, Leonardo Arena wrote: > sorry but patching fails: >=20 > >>> vice: fix__u_char.patch > patching file src/opencbm.h > Hunk #1 FAILED at 131 (different line endings). > 1 out of 1 hunk FAILED -- saving rejects to file src/opencbm.h.rej >=20 > Can you send an updated patch? Also please note that APKBUILD checksums > are not updated. I'm not 100% sure, but I think the problem lies on your end. According to this stackoverflow article: http://stackoverflow.com/questions/6289001/git-am-format-patch-control-form= at-of-line-endings/6677017#6677017 you should use: git am --keep-cr The whole problem is caused by opencbm.h using DOS line endings. Please let me know if I am wrong. I'll then research the problem further. Best, Jean-Louis --BOKacYhQ+x31HxR3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJ8BAEBCgBmBQJYhgFSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ3RTBFQTE3OUE3QUY0QTdFNTU1REIzRDU0 Mzk1OUY2ODQwODg2RDQ1AAoJEEOVn2hAiG1FcrMP/20XfOxSalobGYhNrfY3wb5x LZH5EQXMApsZ9T/6IJxOYwPEyRzkrd7n39X35/vIOf27UuATmwc0+vZCq0aQ/y0w L49Bw3taNXIFy4jvp1dNTxsy3OtoRJkZq0RvIFQTFG4vwjCiDjnBmCA4mraFksbf nLxnEj1BeB2HmpDWVkZxi0LFIzxxGpwl3ZZsCiPAq/Lr9SKoobm6suRJ196xsSMX kRIRKFZFYxZ0GF3ueiY6L1UCuSFOJNORH3e6xxyx4+5deoilQvZNH2aNrxFVLE4N qKIxYkgmx+AmmVXVZDilML30A30qpxV1r63YSG165XLodMiRMGhCoYvNPnfkxDuD Jgu7eN+5vANr0yiZw9mGZbBtRbuRRh5Q7WicgebS6ZEqwBkAbbW9aXSGrOyBi/Ji FIHmzK3/ThHlqGrV5gunZHoXE6s11YRz5TWgoF3SGw4C9g3SvYzmy09kMUuoLEes wXv3WtKV/LonFqDPBpWXdva7J9wt9BCrpOoOC/yt1s5aOecDApgntyTkMcdGU9Wc 6rJLSAYTY5p7r/93JWZyPMIJTnRhTDfDNlBQyi8wGA/m1z5fRBEeKYJmKOW7Mz5h 6nU2yJ8yOM11g/qeFYAO7JwRM1ZU2NSoOmpoCRNKcI9IHW+cXrBL+/tG7YQf9KRT n93J9m5Npu25wUjm45Dv =lMD9 -----END PGP SIGNATURE----- --BOKacYhQ+x31HxR3-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---