From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2MGhBSK/fl8ZcQAA0tVLHw (envelope-from ) for ; Thu, 08 Oct 2020 07:26:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id MOdkASK/fl86ewAAbx9fmQ (envelope-from ) for ; Thu, 08 Oct 2020 07:26:26 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CC042940105 for ; Thu, 8 Oct 2020 07:26:25 +0000 (UTC) Received: from localhost ([::1]:53568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQQJk-0005AR-NZ for larch@yhetil.org; Thu, 08 Oct 2020 03:26:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQQJX-0005AG-Na for guix-devel@gnu.org; Thu, 08 Oct 2020 03:26:12 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:35503) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQQJU-000646-SM for guix-devel@gnu.org; Thu, 08 Oct 2020 03:26:11 -0400 X-Originating-IP: 90.92.160.122 Received: from bababa (lfbn-idf2-1-1094-122.w90-92.abo.wanadoo.fr [90.92.160.122]) (Authenticated sender: mail@ambrevar.xyz) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id C02FE1BF20C; Thu, 8 Oct 2020 07:26:03 +0000 (UTC) From: Pierre Neidhardt To: Jan Wielkiewicz , guix-devel@gnu.org Subject: Re: Trying to update Jami, patching pjproject fails In-Reply-To: <20201007224048.3f51243f@interia.pl> References: <20201007224048.3f51243f@interia.pl> Date: Thu, 08 Oct 2020 09:26:03 +0200 Message-ID: <87tuv5b2lw.fsf@ambrevar.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=217.70.183.201; envelope-from=mail@ambrevar.xyz; helo=relay8-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/08 03:26:04 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) BAYES_00=-1.9, FROM_SUSPICIOUS_NTLD=0.498, PDS_OTHER_BAD_TLD=1.998, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -0.61 X-TUID: XP0zHgIfDB3a --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Jan! Jan Wielkiewicz writes: > patching file pjnath/src/pjnath/ice_strans.c > Hunk #1 succeeded at 460 (offset 42 lines). > Hunk #2 succeeded at 529 with fuzz 2 (offset 49 lines). > Hunk #3 succeeded at 589 with fuzz 1 (offset 49 lines). > Hunk #4 FAILED at 680. > 1 out of 4 hunks FAILED -- saving rejects to file > pjnath/src/pjnath/ice_strans.c.rej command "patch" "--force" "-p1" "-i" > "sfl-patches/0013-Assign-unique-local-preferences-for-candidates-with-.pa= tch" > failed with status 1 builder for If you build with the -K flag you should find the .rej files in the corresponding /tmp folder. This and the patch at line 680 should tell you more what's not compatible. I suggest you ask upstream about this incompatibility, they must know what's going on :) =2D-=20 Pierre Neidhardt https://ambrevar.xyz/ --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFGBAEBCAAwFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAl9+vwsSHG1haWxAYW1i cmV2YXIueHl6AAoJEJvc9Jeku8x/iN0H/1MjvpoUcDXFdkjNcyTWpooEiXq60Lms P2iRp/b83gIi9GJwyO4mXN5/y/hYHp36SdE6fp/UYbrzQkvPO3KIXbjPouz4zAHq Y63VGsUCEpIDV7i0pJzJXe761N32KlysrbxA7wdL8YtmUyFfM87xWK5w0RsY3aVC +6p7xp7tMDKc6eJResbPr6yODpw1mnsh/POw35Y9rIqnrALhO2g+OSymJUfEDPMt OcR1tOOsxJuXRRBVSyDERukmUBLRsDR6oIT87758VeHenu3BRwwTY0Cjr0/Ih4/0 EviFLQrBuJtgBRGXm/NYoqcsQ4PJi36hrtQ7GNrkjzMbxHcGYgs9ZD4= =EBfJ -----END PGP SIGNATURE----- --=-=-=--