Re: git: f11ed4160472 - main - devel/libgit2: update to 1.6.4
Date: Fri, 08 Sep 2023 15:11:44 UTC
On 08/09/23 17:08, Matthias Fechner wrote: > Am 08.09.2023 um 17:06 schrieb Guido Falsi: >> /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. > > sry, this was by accident. > I just cherry-picked the commit and will make a test-round if all is > fine and will push the commit after that. > Some testing I'm doing indicates a file has been renamed upstream, src/features.h.in to src/util/git2_features.h.in. Fixing that the patch applies fine. I still have to try to build it though. -- Guido Falsi <madpilot@FreeBSD.org>