all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: Aaron Covrig <aaron.covrig.us@ieee.org>
Cc: 74664@debbugs.gnu.org, Ashish SHUKLA <ashish.is@lostca.se>,
	Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#74664] [PATCH v5] gnu: libgit2: Update to 1.8.4.
Date: Mon, 16 Dec 2024 19:45:13 +0100	[thread overview]
Message-ID: <87msgveabq.fsf@gnu.org> (raw)
In-Reply-To: <20241214001655.110304-1-aaron.covrig.us@ieee.org> (Aaron Covrig's message of "Fri, 13 Dec 2024 19:15:06 -0500")

Hi,

(Cc: Maxim for libjami questions.)

Aaron Covrig <aaron.covrig.us@ieee.org> skribis:

> From: Ashish SHUKLA <ashish.is@lostca.se>
>
> * 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:

--8<---------------cut here---------------start------------->8---
jamidht/conversationrepository.cpp: In member function ‘std::string jami::ConversationRepository::Impl::createMergeCommit(git_index*, const string&)’:
jamidht/conversationrepository.cpp:801:34: error: invalid conversion from ‘git_commit* const*’ to ‘const git_commit**’ [-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/commit.h:515:27: note:   initializing argument 9 of ‘int git_commit_create_buffer(git_buf*, git_repository*, const git_signature*, const git_signature*, const char*, const char*, const git_tree*, size_t, const git_commit**)’
  515 |         const git_commit *parents[]);
      |         ~~~~~~~~~~~~~~~~~~^~~~~~~~~
jamidht/conversationrepository.cpp: In member function ‘std::string jami::ConversationRepository::Impl::commit(const string&, bool)’:
jamidht/conversationrepository.cpp:1887:34: error: invalid conversion from ‘git_commit* const*’ to ‘const git_commit**’ [-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/commit.h:515:27: note:   initializing argument 9 of ‘int git_commit_create_buffer(git_buf*, git_repository*, const git_signature*, const git_signature*, const char*, const char*, const git_tree*, size_t, const git_commit**)’
  515 |         const git_commit *parents[]);
      |         ~~~~~~~~~~~~~~~~~~^~~~~~~~~
--8<---------------cut here---------------end--------------->8---

(From <https://ci.guix.gnu.org/build/7230853/details>.)

Can we “just” upgrade libjami?  Is there a patch upstream we can take?
What would you recommend, Maxim?

Ludo’.




      reply	other threads:[~2024-12-16 20:40 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-03 10:20 [bug#74664] [PATCH] gnu: libgit2: Update to 1.8.4 ashish.is--- via Guix-patches via
2024-12-05  3:02 ` Aaron Covrig via Guix-patches via
2024-12-06 22:25 ` [bug#74664] [PATCH v3] " Aaron Covrig via Guix-patches via
2024-12-07  1:06 ` [bug#74664] CI seems to be building against old commit Aaron Covrig via Guix-patches via
2024-12-07  1:08 ` [bug#74664] [PATCH v4] gnu: libgit2: Update to 1.8.4 Aaron Covrig via Guix-patches via
2024-12-14  0:15 ` [bug#74664] [PATCH v5] " Aaron Covrig via Guix-patches via
2024-12-16 18:45   ` Ludovic Courtès [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87msgveabq.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=74664@debbugs.gnu.org \
    --cc=aaron.covrig.us@ieee.org \
    --cc=ashish.is@lostca.se \
    --cc=maxim.cournoyer@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.