git: activate gitk.

It does not work perfectly (complains about possible problems in the tcl
package), and buttons are huge, but it allows to browse history.

git-gui OTOH does not start at all, it only complains that tk is not
correctly installed, so it is commented out.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/git/git-native_1.7.0.2.bb b/recipes/git/git-native_1.7.0.2.bb
index b55070a..7daee84 100644 (file)
--- a/recipes/git/git-native_1.7.0.2.bb
+++ b/recipes/git/git-native_1.7.0.2.bb
@@ -6,3 +6,4 @@ SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
 SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
 
 EXTRA_OECONF_append = " --without-python"
+EXTRA_OEMAKE = "NO_TCLTK=1"

diff --git a/recipes/git/git.inc b/recipes/git/git.inc
index 8275adb..bbbd7e9 100644 (file)
--- a/recipes/git/git.inc
+++ b/recipes/git/git.inc
@@ -8,8 +8,6 @@ S = "${WORKDIR}/git-${PV}"
 
 inherit autotools
 
-EXTRA_OEMAKE = "NO_TCLTK=1"
-
 do_install () {
        oe_runmake install DESTDIR="${D}" bindir=${bindir} \
                template_dir=${datadir}/git-core/templates \

diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
index 24698e6..526c888 100644 (file)
--- a/recipes/git/git_1.7.0.2.bb
+++ b/recipes/git/git_1.7.0.2.bb
@@ -8,13 +8,13 @@ SRC_URI += "file://git-less-hardlinks.diff;patch=1"
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
 
 
-DEPENDS = "openssl curl zlib expat"
+DEPENDS = "openssl curl zlib expat tcl-native"
 RDEPENDS_${PN} = "findutils sed"
 
 # Dropbear ssh needs a wrapper script, so install openssh-ssh to make it work out of the box
 RRECOMMENDS_${PN} = "openssh-ssh"
 
-PR = "r9"
+PR = "r10"
 
 do_install_append() {
        # Fix broken hardlinks
@@ -72,3 +72,21 @@ FILES_${PN}-large += " \
 #      ${libexecdir}/git-core/git-remote-http \
 #"
 RDEPENDS_${PN}-large = "${PN}"
+
+# git-tk package with gitk and git-gui
+PACKAGES =+ "${PN}-tk"
+RDEPENDS_${PN}-tk = "${PN} tk tcl"
+EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh"
+FILES_${PN}-tk = " \
+       ${bindir}/gitk \
+       ${datadir}/gitk \
+"
+# git gui does not start at all at this time
+#FILES_${PN}-tk += " \
+#      ${libexecdir}/git-core/git-gui \
+#      ${libexecdir}/git-core/git-gui--askpass \
+#      ${datadir}/git-gui \
+#"
+#PACKAGES += "${PN}-tk-locale"
+#PACKAGES_DYNAMIC = "${PN}-tk-locale-*"
+#FILES_${PN}-tk-locale = "${datadir}/git-gui/lib/msgs"