From 62d008f5eb82275a4a7eb0080dc849036485d8cf Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sun, 26 Jan 2020 20:12:17 +0200
Subject: [PATCH] git: add subpackages git-gui and git-gitk

Requested in https://github.com/termux/termux-packages/issues/4841.
---
 packages/git/build.sh               | 6 +++---
 packages/git/git-gitk.subpackage.sh | 7 +++++++
 packages/git/git-gui.subpackage.sh  | 8 ++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 packages/git/git-gitk.subpackage.sh
 create mode 100644 packages/git/git-gui.subpackage.sh

diff --git a/packages/git/build.sh b/packages/git/build.sh
index 3ed56cd5e..e1e304656 100644
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://git-scm.com/
 TERMUX_PKG_DESCRIPTION="Fast, scalable, distributed revision control system"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.25.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=c060291a3ffb43d7c99f4aa5c4d37d3751cf6bca683e7344ea407ea504d9a8d0
-# less is required as a pager for git log, and the busybox less does not handle used escape sequences.
-TERMUX_PKG_DEPENDS="libcurl, libiconv, less, openssl, pcre2, zlib"
+TERMUX_PKG_DEPENDS="libcurl, libiconv, less, openssl, pcre2, tk, zlib"
 
 ## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -14,8 +14,8 @@ ac_cv_header_libintl_h=no
 ac_cv_iconv_omits_bom=no
 ac_cv_snprintf_returns_bogus=no
 --with-curl
---without-tcltk
 --with-shell=$TERMUX_PREFIX/bin/sh
+--with-tcltk=$TERMUX_PREFIX/bin/wish
 "
 # expat is only used by git-http-push for remote lock management over DAV, so disable:
 # NO_INSTALL_HARDLINKS to use symlinks instead of hardlinks (which does not work on Android M):
diff --git a/packages/git/git-gitk.subpackage.sh b/packages/git/git-gitk.subpackage.sh
new file mode 100644
index 000000000..b9026448a
--- /dev/null
+++ b/packages/git/git-gitk.subpackage.sh
@@ -0,0 +1,7 @@
+TERMUX_SUBPKG_DESCRIPTION="Git repository browser"
+TERMUX_SUBPKG_DEPENDS="tk"
+TERMUX_SUBPKG_INCLUDE="
+bin/gitk
+share/gitk
+share/man/man1/gitk.1*
+"
diff --git a/packages/git/git-gui.subpackage.sh b/packages/git/git-gui.subpackage.sh
new file mode 100644
index 000000000..2ddb69376
--- /dev/null
+++ b/packages/git/git-gui.subpackage.sh
@@ -0,0 +1,8 @@
+TERMUX_SUBPKG_DESCRIPTION="A graphical interface to Git"
+TERMUX_SUBPKG_DEPENDS="tk"
+TERMUX_SUBPKG_INCLUDE="
+libexec/git-core/git-gui
+libexec/git-core/git-gui--askpass
+share/git-gui
+share/man/man1/git-gui.1.gz
+"