diff --git a/srcpkgs/git-libsecret b/srcpkgs/git-libsecret new file mode 120000 index 00000000000..0899c2993da --- /dev/null +++ b/srcpkgs/git-libsecret @@ -0,0 +1 @@ +git \ No newline at end of file diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 211fcc440a4..e404c89fbd3 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,15 +1,15 @@ # Template file for 'git' pkgname=git version=2.20.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2 ac_cv_snprintf_returns_bogus=no" make_install_args="NO_INSTALL_HARDLINKS=1 INSTALLDIRS=vendor perllibdir=/usr/share/perl5/vendor_perl" make_check_target=test -hostmakedepends="asciidoc perl tk xmlto" -makedepends="libcurl-devel pcre2-devel tk-devel" +hostmakedepends="asciidoc perl pkg-config tk xmlto" +makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" # Required by https:// depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL" short_desc="Git Tree History Storage Tool" @@ -21,7 +21,7 @@ distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" checksum=9d2e91e2faa2ea61ba0a70201d023b36f54d846314591a002c610ea2ab81c3e9 replaces="git-perl>=0" -subpackages="git-cvs git-svn gitk git-gui git-all" +subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret" case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" ac_cv_fread_reads_directories=yes" ;; @@ -31,6 +31,7 @@ esac post_build() { make ${makejobs} -C Documentation man make ${makejobs} -C contrib/subtree all git-subtree.1 + make ${makejobs} -C contrib/credential/libsecret } post_install() { make NO_INSTALL_HARDLINKS=1 DESTDIR=${DESTDIR} install-doc @@ -38,6 +39,7 @@ post_install() { usr/share/bash-completion/completions git vinstall contrib/completion/git-prompt.sh 644 usr/share/git make -C contrib/subtree DESTDIR=${DESTDIR} prefix=/usr install install-man + vinstall contrib/credential/libsecret/git-credential-libsecret 755 usr/libexec/git-core } git-cvs_package() { @@ -91,3 +93,10 @@ git-all_package() { depends="${subpackages/git-all/}" short_desc+=" - meta-package for complete Git installation" } +git-libsecret_package() { + depends="git-${version}_${revision}" + short_desc+=" - libsecret credential helper" + pkg_install() { + vmove usr/libexec/git-core/git-credential-libsecret + } +}