diff --git a/packages/libgit2/build.sh b/packages/libgit2/build.sh index b82d417f54..665ef4d3c5 100644 --- a/packages/libgit2/build.sh +++ b/packages/libgit2/build.sh @@ -1,12 +1,23 @@ TERMUX_PKG_HOMEPAGE=https://libgit2.github.com/ TERMUX_PKG_DESCRIPTION="C library implementing Git core methods" TERMUX_PKG_LICENSE="GPL-2.0" +TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.3.0 +TERMUX_PKG_VERSION=1.4.1 TERMUX_PKG_SRCURL=https://github.com/libgit2/libgit2/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e +TERMUX_PKG_SHA256=fccd371a271133e29d002dd207490d22a0c9b06992b874b8edb8366532a94f54 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="libcurl, openssl, libssh2, zlib, libiconv" +TERMUX_PKG_DEPENDS="libssh2, openssl, pcre, zlib" +TERMUX_PKG_BUILD_DEPENDS="libiconv, libpcreposix" TERMUX_PKG_BREAKS="libgit2-dev" TERMUX_PKG_REPLACES="libgit2-dev" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_CLAR=OFF" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DBUILD_TESTS=OFF +-DUSE_SSH=ON +-DREGEX_BACKEND=pcre +" + +termux_step_pre_configure() { + find "$TERMUX_PKG_SRCDIR" -name CMakeLists.txt | xargs -n 1 \ + sed -i 's/\( PROPERTIES C_STANDARD\) 90/\1 99/g' +} diff --git a/packages/libgit2/fix-etc-dir-path.patch b/packages/libgit2/fix-etc-dir-path.patch index 073e55c1f5..8cc35972ea 100644 --- a/packages/libgit2/fix-etc-dir-path.patch +++ b/packages/libgit2/fix-etc-dir-path.patch @@ -1,12 +1,11 @@ -diff -uNr libgit2-0.26.0/src/sysdir.c libgit2-0.26.0.mod/src/sysdir.c ---- libgit2-0.26.0/src/sysdir.c 2017-06-14 14:31:20.000000000 +0300 -+++ libgit2-0.26.0.mod/src/sysdir.c 2017-09-12 11:57:35.382990676 +0300 -@@ -30,7 +30,7 @@ +--- a/src/sysdir.c ++++ b/src/sysdir.c +@@ -33,7 +33,7 @@ #ifdef GIT_WIN32 - return git_win32__find_system_dirs(out, L"etc\\"); + return git_win32__find_system_dirs(out, "etc"); #else -- return git_buf_sets(out, "/etc"); -+ return git_buf_sets(out, "@TERMUX_PREFIX@/etc"); +- return git_str_sets(out, "/etc"); ++ return git_str_sets(out, "@TERMUX_PREFIX@/etc"); #endif }