Solaris/dbpware-for-solaris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git: update to 2.2.2

Browse Source
This commit is contained in:
Tom G. Christensen 2015-01-20 19:27:04 +01:00
parent 265fff9fa0
commit 01c71f0fca
4 changed files with 53 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git/build.sh
View File

@ -6,13 +6,13 @@
########################################################### ###########################################################
# Check the following 4 variables before running the script # Check the following 4 variables before running the script
topdir=git topdir=git
version=2.1.2 version=2.2.2
pkgver=1 pkgver=1
source[0]=https://www.kernel.org/pub/software/scm/git/$topdir-$version.tar.gz 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 source[1]=https://www.kernel.org/pub/software/scm/git/$topdir-manpages-$version.tar.gz
# If there are no patches, simply comment this # If there are no patches, simply comment this
patch[0]=git-1.8.1.5-inet_addrstrlen.patch patch[0]=git-1.8.1.5-inet_addrstrlen.patch
patch[1]=git-2.1.2-fix-no-pthreads.patch patch[1]=git-2.2.1-restore-tcl84-support.patch
# Source function library # Source function library
. ${BUILDPKG_SCRIPTS}/buildpkg.functions . ${BUILDPKG_SCRIPTS}/buildpkg.functions

4
git/meta/ChangeLog
View File

@ -1,5 +1,9 @@
CHANGELOG CHANGELOG
--------- ---------
* Tue Jan 20 2015 Tom G. Christensen <swpkg@jupiterrise.com> - 2.2.2-1
- Update to 2.2.2
- Fix git-gui support for Tcl 8.4 (from Kyle J. McKay)
* Wed Oct 01 2014 Tom G. Christensen <swpkg@jupiterrise.com> - 2.1.2-1 * Wed Oct 01 2014 Tom G. Christensen <swpkg@jupiterrise.com> - 2.1.2-1
- Update to 2.1.2 - Update to 2.1.2

12
git/src/git-2.1.2-fix-no-pthreads.patch
View File

@ -1,12 +0,0 @@
--- git-2.1.2/builtin/index-pack.c.pthreads 2014-09-30 21:00:40.000000000 +0200
+++ git-2.1.2/builtin/index-pack.c 2014-10-15 13:29:54.353854000 +0200
@@ -185,6 +185,9 @@
#define deepest_delta_lock()
#define deepest_delta_unlock()
+#define type_cas_lock()
+#define type_cas_unlock()
+
#endif

47
git/src/git-2.2.1-restore-tcl84-support.patch Normal file
View File

@ -0,0 +1,47 @@
From: "Kyle J. McKay" <mackyle@gmail.com>
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 <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
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