diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh index bf6baa7fd93..cc4de30bc3a 100644 --- a/common/build-helper/rust.sh +++ b/common/build-helper/rust.sh @@ -24,9 +24,6 @@ fi # For cross-compiling rust -sys crates export PKG_CONFIG_ALLOW_CROSS=1 -# libgit2-sys -export LIBGIT2_SYS_USE_PKG_CONFIG=1 - # gettext-rs export GETTEXT_BIN_DIR=/usr/bin export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext" diff --git a/common/shlibs b/common/shlibs index 1b0de9cd41a..7a1e5b5d5eb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1306,7 +1306,7 @@ libunwind-ppc64.so.8 libunwind-1.2.1_1 libunwind-setjmp.so.0 libunwind-1.4_1 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1 libmicrodns.so.0 libmicrodns-0.1.0_1 -libgit2.so.28 libgit2-0.28.0_1 +libgit2.so.1.0 libgit2-1.0.0_1 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1 libagg.so.2 agg-2.5_1 libzzip-0.so.13 zziplib-0.13.62_1 diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 7a8247c212b..f9f3cd47425 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,24 +1,16 @@ # Template file for 'libgit2' pkgname=libgit2 -version=0.28.4 +version=1.0.0 revision=1 build_style=cmake -configure_args="-DTHREADSAFE=ON" hostmakedepends="python3 git pkg-config" -makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel libuv-devel" +makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel" short_desc="Git linkable library" -maintainer="Orphaned " +maintainer="q66 " license="custom:GPL-2.0-or-later WITH GCC-exception-2.0" homepage="https://libgit2.org" distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz" -checksum=30f3877469d09f2e4a21be933b4e2800560d16646028dd800744dc5f7fb0c749 - -case "$XBPS_TARGET_MACHINE" in - *-musl) - # Don't use qsort_r, see src/util.c - CFLAGS="-D__ANDROID_API__" - ;; -esac +checksum=6a1fa16a7f6335ce8b2630fbdbb5e57c4027929ebc56fcd1ac55edb141b409b4 post_install() { vlicense COPYING