From 814cabff5abfa98d6b675f9edb27c65d713a471c Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Thu, 2 Jul 2015 18:23:45 +0200 Subject: [PATCH] git: update to 2.4.5 --- git/build.sh | 3 +- git/meta/ChangeLog | 3 ++ git/src/git-2.2.1-restore-tcl84-support.patch | 47 ------------------- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 git/src/git-2.2.1-restore-tcl84-support.patch diff --git a/git/build.sh b/git/build.sh index f3eda6a..87ca7b0 100755 --- a/git/build.sh +++ b/git/build.sh @@ -6,13 +6,12 @@ ########################################################### # Check the following 4 variables before running the script topdir=git -version=2.3.7 +version=2.4.5 pkgver=1 source[0]=https://www.kernel.org/pub/software/scm/git/$topdir-$version.tar.gz source[1]=https://www.kernel.org/pub/software/scm/git/$topdir-manpages-$version.tar.gz # If there are no patches, simply comment this patch[0]=git-1.8.1.5-inet_addrstrlen.patch -patch[1]=git-2.2.1-restore-tcl84-support.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions diff --git a/git/meta/ChangeLog b/git/meta/ChangeLog index 2b155ee..65d49e5 100644 --- a/git/meta/ChangeLog +++ b/git/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG --------- +* Wed Jul 01 2015 Tom G. Christensen - 2.4.5-1 +- Update to 2.4.5 + * Wed Apr 29 2015 Tom G. Christensen - 2.3.7-1 - Update to 2.3.7 diff --git a/git/src/git-2.2.1-restore-tcl84-support.patch b/git/src/git-2.2.1-restore-tcl84-support.patch deleted file mode 100644 index 5871724..0000000 --- a/git/src/git-2.2.1-restore-tcl84-support.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: "Kyle J. McKay" -Date: Tue, 6 Jan 2015 02:41:21 -0800 - -Tcl 8.5 introduced an extended vsatisfies syntax that is not -supported by Tcl 8.4. - -Since only Tcl 8.4 is required this presents a problem. - -The extended syntax was used starting with Git 2.0.0 in commit -b3f0c5c0 (git-gui: tolerate major version changes when comparing the -git version, 2014-05-17), so that a major version change would still -satisfy the condition. - -However, what we really want is just a basic version compare, so use -vcompare instead to restore compatibility with Tcl 8.4. - -Signed-off-by: Kyle J. McKay -Signed-off-by: Junio C Hamano ---- - git-gui.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/git-gui.sh b/git-gui.sh -index b186329d..a1a23b56 100755 ---- a/git-gui/git-gui.sh -+++ b/git-gui/git-gui.sh -@@ -1283,7 +1283,7 @@ load_config 0 - apply_config - - # v1.7.0 introduced --show-toplevel to return the canonical work-tree --if {[package vsatisfies $_git_version 1.7.0-]} { -+if {[package vcompare $_git_version 1.7.0] >= 0} { - if { [is_Cygwin] } { - catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]} - } else { -@@ -1539,7 +1539,7 @@ proc rescan_stage2 {fd after} { - close $fd - } - -- if {[package vsatisfies $::_git_version 1.6.3-]} { -+ if {[package vcompare $::_git_version 1.6.3] >= 0} { - set ls_others [list --exclude-standard] - } else { - set ls_others [list --exclude-per-directory=.gitignore] --- -2.1.4 -