diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 0d93d91380b..fe1e7958d1a 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,6 @@ # Template file for 'git' pkgname=git -version=2.44.0 +version=2.45.0 revision=1 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto" makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" @@ -14,7 +14,7 @@ license="GPL-2.0-only" homepage="https://git-scm.com/" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3 +checksum=0aac200bd06476e7df1ff026eb123c6827bc10fe69d2823b4bf2ebebe5953429 replaces="git-perl>=0" python_version=3 @@ -41,14 +41,13 @@ do_configure() { # this flag will skip shipping unneeded symlinks # those symlinks were kept for scripts written before 2010 SKIP_DASHED_BUILT_INS = Yes + GIT_TEST_UTF8_LOCALE=C.UTF-8 EOF if [ "$XBPS_TARGET_LIBC" = musl ]; then cat <<-EOF >>config.mak ICONV_OMITS_BOM = Yes NO_REGEX = Yes - # TZ=CST6CDT date --iso-8601=seconds -d"2005-01-31 18:00:00 -0600" - export GIT_SKIP_TESTS=t9604.2 EOF fi } @@ -64,12 +63,13 @@ do_build() { do_check() { make test ${makejobs} + GIT_TEST_DEFAULT_HASH=sha256 make test ${makejobs} + # svn and cvs, fail intermittent with reftable + GIT_TEST_DEFAULT_REF_FORMAT=reftable GIT_SKIP_TESTS='t9[16]??' \ + make test ${makejobs} make -C contrib/diff-highlight test make -C contrib/subtree test make -C contrib/credential/netrc test - cd t - # 2.44.0 - # GIT_TEST_DEFAULT_REF_FORMAT=reftable ./t0610-reftable-basics.sh } do_install() {