From 4d40fd4f08d7f0b84f390ea9367e89d12bd25718 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 15:00:53 +0200 Subject: [PATCH] libgit2: update to 1.7.2 --- common/shlibs | 2 +- .../patches/fix-missing-oid-type.patch | 24 ------------------- srcpkgs/libgit2/template | 4 ++-- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch diff --git a/common/shlibs b/common/shlibs index 93b8afebaaa..1ee5b1f0544 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1336,7 +1336,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3 libunwind-setjmp.so.0 libunwind-1.5.0_3 libmicrohttpd.so.12 libmicrohttpd-0.9.73_1 libmicrodns.so.1 libmicrodns-0.2.0_1 -libgit2.so.1.6 libgit2-1.6.4_1 +libgit2.so.1.7 libgit2-1.7.2_1 libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1 libagg.so.2 agg-2.5_1 libzzip-0.so.13 zziplib-0.13.62_1 diff --git a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch deleted file mode 100644 index 8d24809f244..00000000000 --- a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 47ebf589250159d6a98bd91625aefd2e1383ec26 Mon Sep 17 00:00:00 2001 -From: Oliver Reiche -Date: Wed, 3 May 2023 12:57:06 +0200 -Subject: [PATCH] Fix missing oid type for "fake" repositories - -... otherwise git_tree__parse_raw() will fail to obtain -the correct oid size, which causes the entire parse to fail. ---- - src/libgit2/repository.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/libgit2/repository.c b/src/libgit2/repository.c -index 804e436abeb..c45c5855058 100644 ---- a/src/libgit2/repository.c -+++ b/src/libgit2/repository.c -@@ -1152,6 +1152,8 @@ int git_repository_wrap_odb(git_repository **repo_out, git_odb *odb) - repo = repository_alloc(); - GIT_ERROR_CHECK_ALLOC(repo); - -+ repo->oid_type = GIT_OID_DEFAULT; -+ - git_repository_set_odb(repo, odb); - *repo_out = repo; - diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 934338ef7b8..5c4e1a48a75 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,6 +1,6 @@ # Template file for 'libgit2' pkgname=libgit2 -version=1.6.5 +version=1.7.2 revision=1 build_style=cmake configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="custom:GPL-2.0-or-later WITH GCC-exception-2.0" homepage="https://libgit2.org" distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz" -checksum=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75 +checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTS=ON"