From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id eIRnN/F3YmdIcAEAqHPOHw:P1 (envelope-from ) for ; Wed, 18 Dec 2024 07:21:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id eIRnN/F3YmdIcAEAqHPOHw (envelope-from ) for ; Wed, 18 Dec 2024 08:21:22 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="Nmqut4/5"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Rql5WxDb; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734506481; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9dp7orZWcbskRf11/+k7p9JCun1uvW91M8r0DjXG8IY=; b=gKemCb13kcALrZhCTgorfeSqJHLb3j9m7Qt/y6qFxVTFNiDHgzE8xuJajwy7q4kpvwcsS0 9bxNw8dIBIti7DRV9DNyP2aqCKOfsDN7f+jXxUmeoEZC0gXHMtUL4YTl5AT6EMDaLgaB0g tXg8K0um8c27ZiC+qy0HcXQJobdnadiBbcmDaepp78mhKWiIn0jVq/X3Gsm1ZuYbtD3cas ZWAAzd5L4g0UkDLBTOPrK1j5DH7PG/lGsk6PyBUD7PFAW9gxDnsGeLaBEv6Wus0Rrb8XGX 26ZulbZJdSVQ93dlCVuBRf3T9180+fP7XDpb2Xx+XvfkLosq3A3oEl7TMlxmUQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734506481; a=rsa-sha256; cv=none; b=TI/mjWPoUHieuax7WG0A/nZ/qh07qv/lJ/3gRHLktLSuUjK1XhVmyeAI/YicMtcZS8yvkD 1oiM+xLSDBE6gABR6XJyZ8zAigrnzox1J3mMOpgZovlijagTn8X/4YtJM9wRBKcTW4t20+ JDmdPgvmeVp5ZbqJrrfhklNJkcCVu54wVP0Hi1i48UG8ggfoZln9yZxPSeCOiZ2dR3uAj+ eYpFXC48Pszz5LV6cW95oPlfS6SiGEwr1E1HQw8oLx8JY1CJz9FdypG85zqfyol8EkrK09 6SguLYYDspZc+3myKp3r44BQ9GfauOJa5GdmMzqODAHp468rALTt3oJUMUgQXw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="Nmqut4/5"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Rql5WxDb; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) 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 E06DF8201D for ; Wed, 18 Dec 2024 08:21:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNoMt-0003U3-S4; Wed, 18 Dec 2024 02:21:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tNoMk-0003SC-Tc for guix-patches@gnu.org; Wed, 18 Dec 2024 02:21:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tNoMf-0007rk-V0 for guix-patches@gnu.org; Wed, 18 Dec 2024 02:21:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=9dp7orZWcbskRf11/+k7p9JCun1uvW91M8r0DjXG8IY=; b=Nmqut4/5mU7tuoKVRJ1FoPUrf+c9qNBSJCHB/XjgcYVTzri7raPQO+rLiHuWQbku9S7bgLA0oCQftKd058YL5mHTCdnjsajhiM+Dvt9hAyJE64S7/7nNDk7YPmkLJCt2FqRbUIyy/yeJVVLrd1uewh5CeTeod33KQdMVVfj84JO2d+AFCxqbPG9DGC6SGOqgMddYBzKeLPkKuZASFpk4b8vLkmQm6eckMx82hi763fSVA1iCFkqfie2AS4JO/XyOnnB4S+oYtmimgtWIwsy1vtk5rt6wmBdbyt9eAe4XjmWcBG+9qulf9qt7ga6cCIp1gHjgLaqc+27U29eyaOt3tQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tNoMf-0001yF-MU for guix-patches@gnu.org; Wed, 18 Dec 2024 02:21:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74664] [PATCH v5] gnu: libgit2: Update to 1.8.4. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Dec 2024 07:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74664 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74664@debbugs.gnu.org, Aaron Covrig , Ashish SHUKLA Received: via spool by 74664-submit@debbugs.gnu.org id=B74664.17345064067115 (code B ref 74664); Wed, 18 Dec 2024 07:21:01 +0000 Received: (at 74664) by debbugs.gnu.org; 18 Dec 2024 07:20:06 +0000 Received: from localhost ([127.0.0.1]:33157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNoLl-0001qb-6k for submit@debbugs.gnu.org; Wed, 18 Dec 2024 02:20:06 -0500 Received: from mail-qk1-f181.google.com ([209.85.222.181]:57466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNoLh-0001pk-U6 for 74664@debbugs.gnu.org; Wed, 18 Dec 2024 02:20:03 -0500 Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7b6eeff1fdfso470276085a.2 for <74664@debbugs.gnu.org>; Tue, 17 Dec 2024 23:20:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734506336; x=1735111136; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9dp7orZWcbskRf11/+k7p9JCun1uvW91M8r0DjXG8IY=; b=Rql5WxDbynOAimiCzyWwU3s1Jfgq2F0BeH8Bfbw3dnytTK9ces5loGoVoabrQpdqFu HLp7Dvq9g87D3sKFPb5yEPRJS4NERLO8uQBnndNogg1Fqodh0CFJNU2kQOI3Cn+DWy1X FYJeSS8DqNn+x4pxN5UJxIG3KSl4zVPkbuo5FyZ85fJs5DW5E9jT9fL/AJE1V3MUDAAr rcdnMjFZZH1ri6M2y1pcURzTM1IrTTDX1y3wlR/IkJCAEqfqLBrQWeDTawMSItGO8BCB uScAaN96WGRURf0ySAD1EtiN0E2Wtis2S6aJzWyKMrUkKC9lBgUPgbEZqU2Pp5XUYflc E3wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734506336; x=1735111136; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9dp7orZWcbskRf11/+k7p9JCun1uvW91M8r0DjXG8IY=; b=d6o4XJxrlj/l6++PZncbuCDvGEZmafw/AKVSiiOMSK+Af5lGjHsKKlu8322+ugm4FI wcjyzxftagZF+E4uzh9dCxQSPiLYkOkQ64Z8XPkIxfJZ6v/MIQl/fEIunsMgk7rcM1Rk l0qxakf1Gt4dqxazMoreg9VYGBc8Ch1B7c5V6pu26QIClZa29r/MFWHxFXxyN6ygSs2W JE48eK46vxl4+HzD7IhyobcTTZGipy1ZHs/k5leonSlFf4AyTQMUKhKri1wjpHtJ6nuz OrX8Z6FWg0WBchyFdodFZc9YHjnxwps0zi5FI/J7HYbUyRCthG1BnyfUiwx3BI8xT0tF uuDA== X-Forwarded-Encrypted: i=1; AJvYcCUUjO5upmG1Z7HOcjYAaWtJYA3CSgABF8mR1KCifXYjd3E/5aGkieIEAhPew3167bm6tvUUyg==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzBuE9Q+1+b9fXhgI1NuL8c9coj5wOdCLRxn3kxByfR5nvBqdic eHy3wug3GcgKJTghrJ2+WuCYQqgS1adURRX7JJF71HESudz3SdnT X-Gm-Gg: ASbGnctePT0G+lRAcwc0gaXDqegtjL+CirB2nxWEocfw8v04UoCIbNOFAsej//HPbUB ZJUoJppYqyJeVUkcDbrjgR9Ka0RoVth2ts8h08h4VQlUGDiI+zpWzJ5x4uis9lEGYJYweEn08wo dCnZeSMGDQY49QTDUXtneUzKp25EkNfAvphA8PsK0Z6sJ6w6iwEH/kWJNzm5IlN2gbDJVk2H7pw laLYD42fWVZHn9sa81yjwS1x/OFkhylT2i0SWFsBYc0PfpPTfHVMy7yp5EMfot1QguMnBGnkbsn zw== X-Google-Smtp-Source: AGHT+IGfPQFdUIoo7v1NTshto9/3ZgPDj/d2BBZqqrhZzRvZqfJ1rRf9MvhcP2jf4QBCom17Nhnv3A== X-Received: by 2002:a05:620a:4096:b0:7b6:f595:7550 with SMTP id af79cd13be357-7b863755426mr314642385a.36.1734506336318; Tue, 17 Dec 2024 23:18:56 -0800 (PST) Received: from terra (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b7047aa68fsm397540785a.13.2024.12.17.23.18.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 23:18:55 -0800 (PST) From: Maxim Cournoyer In-Reply-To: <87msgveabq.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Mon, 16 Dec 2024 19:45:13 +0100") References: <20241214001655.110304-1-aaron.covrig.us@ieee.org> <87msgveabq.fsf@gnu.org> Date: Wed, 18 Dec 2024 16:18:43 +0900 Message-ID: <87h671pigc.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -0.66 X-Spam-Score: -0.66 X-Migadu-Queue-Id: E06DF8201D X-TUID: YrLgVR4ixDYS Hi, Ludovic Court=C3=A8s writes: > Hi, > > (Cc: Maxim for libjami questions.) > > Aaron Covrig skribis: > >> From: Ashish SHUKLA >> >> * gnu/packages/version-control.scm (libgit2-1.8): Update to 1.8.4. >> --- >> Restoring the original reference base as the build system hasn't picked >> this up and it looks like the arm64 substitute count is getting close to >> being enough for the CI instance to start processing other architectures >> again. > > The upgrade apparently breaks libjami: > > jamidht/conversationrepository.cpp: In member function =E2=80=98std::stri= ng jami::ConversationRepository::Impl::createMergeCommit(git_index*, const = string&)=E2=80=99: > jamidht/conversationrepository.cpp:801:34: error: invalid conversion from= =E2=80=98git_commit* const*=E2=80=99 to =E2=80=98const git_commit**=E2=80= =99 [-fpermissive] > 801 | &parents_ptr[0]) > | ^~~~~~~~~~~~~~~ > | | > | git_commit* const* > In file included from /gnu/store/1bwhw59mfrs2zk98l31ymhr6qw7cp45p-libgit2= -1.8.4/include/git2/repository.h:14, > from /gnu/store/1bwhw59mfrs2zk98l31ymhr6qw7cp45p-libgit2= -1.8.4/include/git2/annotated_commit.h:11, > from /gnu/store/1bwhw59mfrs2zk98l31ymhr6qw7cp45p-libgit2= -1.8.4/include/git2.h:11, > from jamidht/conversationrepository.h:21, > from jamidht/conversationrepository.cpp:18: > /gnu/store/1bwhw59mfrs2zk98l31ymhr6qw7cp45p-libgit2-1.8.4/include/git2/co= mmit.h:515:27: note: initializing argument 9 of =E2=80=98int git_commit_c= reate_buffer(git_buf*, git_repository*, const git_signature*, const git_sig= nature*, const char*, const char*, const git_tree*, size_t, const git_commi= t**)=E2=80=99 > 515 | const git_commit *parents[]); > | ~~~~~~~~~~~~~~~~~~^~~~~~~~~ > jamidht/conversationrepository.cpp: In member function =E2=80=98std::stri= ng jami::ConversationRepository::Impl::commit(const string&, bool)=E2=80=99: > jamidht/conversationrepository.cpp:1887:34: error: invalid conversion fro= m =E2=80=98git_commit* const*=E2=80=99 to =E2=80=98const git_commit**=E2=80= =99 [-fpermissive] > 1887 | &head_ref[0]) > | ^~~~~~~~~~~~ > | | > | git_commit* const* > In file included from /gnu/store/1bwhw59mfrs2zk98l31ymhr6qw7cp45p-libgit2= -1.8.4/include/git2/repository.h:14, > from /gnu/store/1bwhw59mfrs2zk98l31ymhr6qw7cp45p-libgit2= -1.8.4/include/git2/annotated_commit.h:11, > from /gnu/store/1bwhw59mfrs2zk98l31ymhr6qw7cp45p-libgit2= -1.8.4/include/git2.h:11, > from jamidht/conversationrepository.h:21, > from jamidht/conversationrepository.cpp:18: > /gnu/store/1bwhw59mfrs2zk98l31ymhr6qw7cp45p-libgit2-1.8.4/include/git2/co= mmit.h:515:27: note: initializing argument 9 of =E2=80=98int git_commit_c= reate_buffer(git_buf*, git_repository*, const git_signature*, const git_sig= nature*, const char*, const char*, const git_tree*, size_t, const git_commi= t**)=E2=80=99 > 515 | const git_commit *parents[]); > | ~~~~~~~~~~~~~~~~~~^~~~~~~~~ > > (From .) > > Can we =E2=80=9Cjust=E2=80=9D upgrade libjami? Is there a patch upstream= we can take? > What would you recommend, Maxim? There may be a commit that could be cherry picked, but ideally we should just update all Jami components to its latest nightly, if it supports the latest libgit2 1.8.x. I have an upgrade of Jami on a local branch, but it's not finished, and I haven't checked yet if it would resolve that particular problem. --=20 Thanks, Maxim