[bug#74664] [PATCH] gnu: libgit2: Update to 1.8.4.

[bug#74664] [PATCH] gnu: libgit2: Update to 1.8.4.

[ashish.is--- via Guix-patches via]

From: Ashish SHUKLA <ashish.is@lostca.se>

* gnu/packages/version-control.scm (libgit2-1.8): Update to 1.8.4.

Change-Id: I6a200a1b490962a0083e78008b5be763fd0439ed
---
 gnu/packages/version-control.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 289b981911..333548d54f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1174,7 +1174,7 @@ (define-public libgit2-1.7
 (define-public libgit2-1.8
   (package
     (inherit libgit2-1.7)
-    (version "1.8.3")
+    (version "1.8.4")
     (source (origin
               (inherit (package-source libgit2-1.7))
               (uri (git-reference
@@ -1183,7 +1183,7 @@ (define-public libgit2-1.8
               (file-name (git-file-name "libgit2" version))
               (sha256
                (base32
-                "11jyxy6ckl19ayqpq5s3nlbcd0s1q4sdy8884m4pjrbzgxg6y1ds"))
+                "0jydckwn0bbrp2kbcr1ih1bz4sc6yhx7lrl22lqcgnf2v6ml6n01"))
               (patches
                (search-patches "libgit2-uninitialized-proxy-settings.patch"))
 	      (snippet

base-commit: 58a134224e327cfc0af105314598d080dfc0392d
-- 
2.47.1

[bug#74664] [PATCH] gnu: libgit2: Update to 1.8.4.

[Aaron Covrig via Guix-patches via]

From: Ashish SHUKLA <ashish.is@lostca.se>

* gnu/packages/version-control.scm (libgit2-1.8): Update to 1.8.4.
---
I went ahead and re-applied/rebased your commit, for some reason
it seems it looks like it was applied against a different base or
master just received a bunch of changes.

 gnu/packages/version-control.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 289b981911..333548d54f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1174,7 +1174,7 @@ (define-public libgit2-1.7
 (define-public libgit2-1.8
   (package
     (inherit libgit2-1.7)
-    (version "1.8.3")
+    (version "1.8.4")
     (source (origin
               (inherit (package-source libgit2-1.7))
               (uri (git-reference
@@ -1183,7 +1183,7 @@ (define-public libgit2-1.8
               (file-name (git-file-name "libgit2" version))
               (sha256
                (base32
-                "11jyxy6ckl19ayqpq5s3nlbcd0s1q4sdy8884m4pjrbzgxg6y1ds"))
+                "0jydckwn0bbrp2kbcr1ih1bz4sc6yhx7lrl22lqcgnf2v6ml6n01"))
               (patches
                (search-patches "libgit2-uninitialized-proxy-settings.patch"))
 	      (snippet

base-commit: 006679d1e6ca7acea0629b4f019c8cf89cde08be
-- 
2.47.0

[bug#74664] [PATCH v3] gnu: libgit2: Update to 1.8.4.

[Aaron Covrig via Guix-patches via]

From: Ashish SHUKLA <ashish.is@lostca.se>

* gnu/packages/version-control.scm (libgit2-1.8): Update to 1.8.4.
---
It seems I forgot to attach the revision tag to the prior patch...

 gnu/packages/version-control.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 289b981911..333548d54f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1174,7 +1174,7 @@ (define-public libgit2-1.7
 (define-public libgit2-1.8
   (package
     (inherit libgit2-1.7)
-    (version "1.8.3")
+    (version "1.8.4")
     (source (origin
               (inherit (package-source libgit2-1.7))
               (uri (git-reference
@@ -1183,7 +1183,7 @@ (define-public libgit2-1.8
               (file-name (git-file-name "libgit2" version))
               (sha256
                (base32
-                "11jyxy6ckl19ayqpq5s3nlbcd0s1q4sdy8884m4pjrbzgxg6y1ds"))
+                "0jydckwn0bbrp2kbcr1ih1bz4sc6yhx7lrl22lqcgnf2v6ml6n01"))
               (patches
                (search-patches "libgit2-uninitialized-proxy-settings.patch"))
 	      (snippet

base-commit: 0972a27572a12158c0cb5a3bbc28a86eaf82dc33
-- 
2.46.0

[bug#74664] CI seems to be building against old commit

[Aaron Covrig via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

For whatever reason the CI is building against a fairly old
commit... (maybe this is how the CI is enforcing the current package
build suspension till aarch64 substitutes get caught up).

For reference, based on the qa error message, it looks to be building
against a commit from Nov. 19:
```
commit f129a6cc591817c5c51770d5b8712eeb344ba4e4
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Nov 19 15:18:06 2024 +0100
```

I may try to rebase against this commit and see what happens...

v/r,

Aaron

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[bug#74664] [PATCH v4] gnu: libgit2: Update to 1.8.4.

[Aaron Covrig via Guix-patches via]

From: Ashish SHUKLA <ashish.is@lostca.se>

* gnu/packages/version-control.scm (libgit2-1.8): Update to 1.8.4.
---
Applying against the old commit that the CI seems to be using

 gnu/packages/version-control.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c892a83a98..eca8ebc42c 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1170,7 +1170,7 @@ (define-public libgit2-1.7
 (define-public libgit2-1.8
   (package
     (inherit libgit2-1.7)
-    (version "1.8.1")
+    (version "1.8.4")
     (source (origin
               (inherit (package-source libgit2-1.7))
               (uri (git-reference
@@ -1179,7 +1179,7 @@ (define-public libgit2-1.8
               (file-name (git-file-name "libgit2" version))
               (sha256
                (base32
-                "1mh55804cvxl2cyl4clinajzgfn3zmlhacnv1pdvdj4w6z2w4si7"))
+                "0jydckwn0bbrp2kbcr1ih1bz4sc6yhx7lrl22lqcgnf2v6ml6n01"))
               (patches
                (search-patches "libgit2-uninitialized-proxy-settings.patch"))
 	      (snippet

base-commit: f129a6cc591817c5c51770d5b8712eeb344ba4e4
-- 
2.46.0

[bug#74664] [PATCH v5] gnu: libgit2: Update to 1.8.4.

[Aaron Covrig via Guix-patches via]

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.

- Aaron

 gnu/packages/version-control.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 3339e79390..330072e575 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1174,7 +1174,7 @@ (define-public libgit2-1.7
 (define-public libgit2-1.8
   (package
     (inherit libgit2-1.7)
-    (version "1.8.3")
+    (version "1.8.4")
     (source (origin
               (inherit (package-source libgit2-1.7))
               (uri (git-reference
@@ -1183,7 +1183,7 @@ (define-public libgit2-1.8
               (file-name (git-file-name "libgit2" version))
               (sha256
                (base32
-                "11jyxy6ckl19ayqpq5s3nlbcd0s1q4sdy8884m4pjrbzgxg6y1ds"))
+                "0jydckwn0bbrp2kbcr1ih1bz4sc6yhx7lrl22lqcgnf2v6ml6n01"))
               (patches
                (search-patches "libgit2-uninitialized-proxy-settings.patch"))
 	      (snippet

base-commit: 0787a180b3ca64d3958438920ca1b58a2a27fba4
-- 
2.46.0

[bug#74664] [PATCH v5] gnu: libgit2: Update to 1.8.4.

[Ludovic Courtès]

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’.

[bug#74664] [PATCH v5] gnu: libgit2: Update to 1.8.4.

[Maxim Cournoyer]

Hi,

Ludovic Courtès <ludo@gnu.org> writes:

> 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:
>
> 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[]);
>       |         ~~~~~~~~~~~~~~~~~~^~~~~~~~~
>
> (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?

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.

-- 
Thanks,
Maxim