git: update to 2.25.2.

This commit is contained in:
Đoàn Trần Công Danh 2020-03-18 13:21:18 +07:00 committed by Juan RP
parent 4775b328b5
commit c0ab53b2f5
4 changed files with 21 additions and 11 deletions

View File

@ -30,6 +30,9 @@ glib_cv_have_qsort_r=${glib_cv_have_qsort_r=yes}
#dbus-glib
ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
# git
ac_cv_iconv_omits_bom=${ac_cv_iconv_omits_bom=no}
# gnucash
am_cv_scanf_lld=${am_cv_scanf_lld=yes}

View File

@ -82,6 +82,10 @@ bash_cv_wcwidth_broken=no
ac_cv_file__dev_ptmx=yes
ac_cv_file__dev_ptc=no
# git
ac_cv_snprintf_returns_bogus=no
ac_cv_fread_reads_directories=yes
# gnulib
gl_cv_func_fstatat_zero_flag=yes
gl_cv_func_memchr_works=yes

View File

@ -175,3 +175,6 @@ ac_cv_sizeof_blkcnt_t=8
# Force detection of musl's iconv
ac_cv_libiconv_utf8=yes
# musl omits BOM on UTF-16 and UTF-32
ac_cv_iconv_omits_bom=yes

View File

@ -1,11 +1,9 @@
# Template file for 'git'
pkgname=git
version=2.25.1
version=2.25.2
revision=1
build_style=gnu-configure
configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2
ac_cv_snprintf_returns_bogus=no ac_cv_fread_reads_directories=yes"
make_check_target=test
configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
# Required by https://
@ -16,17 +14,12 @@ 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=222796cc6e3bf2f9fd765f8f097daa3c3999bb7865ac88a8c974d98182e29f26
checksum=9b937103e048e2d3bf964d4132a0e7edccc2583d4ef30bc8a516f93a76de7123
replaces="git-perl>=0"
register_shell=/usr/bin/git-shell
subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" ac_cv_iconv_omits_bom=yes" ;;
*) configure_args+=" ac_cv_iconv_omits_bom=no" ;;
esac
post_configure() {
cat <<-EOF >config.mak
NO_INSTALL_HARDLINKS=Yes
@ -39,10 +32,17 @@ post_build() {
make ${makejobs} -C Documentation man
make ${makejobs} -C contrib/contacts all git-contacts.1
make ${makejobs} -C contrib/diff-highlight all
make ${makejobs} -C contrib/subtree all git-subtree.1
make ${makejobs} -C contrib/subtree all man
make ${makejobs} -C contrib/credential/libsecret
}
do_check() {
make test
make -C contrib/diff-highlight test
make -C contrib/subtree test
make -C contrib/credential/netrc test
}
post_install() {
make DESTDIR=${DESTDIR} install-doc
vinstall contrib/completion/git-completion.bash 644 \