Re: git: f11ed4160472 - main - devel/libgit2: update to 1.6.4

On 08/09/23 12:35, Matthias Fechner wrote:
> The branch main has been updated by mfechner:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=f11ed41604723ab3c75c6a108850858b7efd4f10
> 
> commit f11ed41604723ab3c75c6a108850858b7efd4f10
> Author:     Matthias Fechner <mfechner@FreeBSD.org>
> AuthorDate: 2023-09-02 09:07:59 +0000
> Commit:     Matthias Fechner <mfechner@FreeBSD.org>
> CommitDate: 2023-09-08 10:34:38 +0000
> 
>      devel/libgit2: update to 1.6.4
>      
>      Required for gitlab-ce 16.3.
>      Bump of pending ports will be done in another commit.
>      
>      Changelog:
>      https://github.com/libgit2/libgit2/tags

Hi,

This commit removed a patch required to make it build with clang 16 
(default in FreeBSD 14 and 15/head).

This version fails with errors:

/wrkdirs/usr/ports/devel/libgit2/work/libgit2-1.6.4/src/util/util.c:731:28: 
error: incompatible function pointer types passing 'int (void *, const 
void *, const void *)' to parameter of type 'int (*)(const void *, const 
void *, void *)' [-Wincompatible-function-pointer-types]
         qsort_s(els, nel, elsize, git__qsort_r_glue_cmp, &glue);
                                   ^~~~~~~~~~~~~~~~~~~~~
/usr/include/stdlib.h:396:11: note: passing argument to parameter here
     int (*)(const void *, const void *, void *), void *);
           ^
1 error generated.


The commit which added the patch to fix this is here:

https://cgit.freebsd.org/ports/commit/devel/libgit2?id=a62f1b5796b641bb502b33f7f073238a49dc4d0c


Looking at upstream it looks like this fix is included there only 
starting from version 1.7.0 (correct me if I'm wrong)

I'll take a look at adding back the patch.

-- 
Guido Falsi <madpilot@FreeBSD.org>