haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

git: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2017-10-26 14:04:33 +02:00
parent 7a488cf54e
commit c4296a9468
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dev-vcs/git/git-2.14.2.recipe → dev-vcs/git/git-2.14.3.recipe
View File

@@ -10,16 +10,16 @@ workflows."
HOMEPAGE="https://git-scm.com/"
COPYRIGHT="2005-2017 Git Authors (see git web site for list)"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
CHECKSUM_SHA256="50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1"
CHECKSUM_SHA256="5330960dd52467f6e5bf1931b9fd42b76d3f8ce9bc75150b54ecfb57d407151d"
SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
CHECKSUM_SHA256_2="6dd350d1e9d00159a549f0fad08a9f954b1d12576fc8d5865fbed9dee15105fc"
CHECKSUM_SHA256_2="5b0e3d93bafd539046b67778db0b5d627fe08ee5ef1be8b5b924517ed141b001"
SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
CHECKSUM_SHA256_3="a36661e81e5b21e788cd84e11860bcd0cafa402eff06e6371415a5a0e0b80dfb"
CHECKSUM_SHA256_3="9d28b922ad861bf747ca34a4f083efa3ce41ca39cccb0dfab8bdcf0b58694ccb"
PATCHES="git-$portVersion.patchset"

29
dev-vcs/git/patches/git-2.14.2.patchset → dev-vcs/git/patches/git-2.14.3.patchset
View File

@@ -1,4 +1,4 @@
From 9facc47a027213cf39f830957e75f5e7ed299134 Mon Sep 17 00:00:00 2001
From 7d19038ccca2379140022037e6861a8f8d5fe8fa Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 13 Aug 2013 08:07:25 +0200
Subject: git-web--browse.sh: use "open" on Haiku
@@ -20,17 +20,17 @@ index ae15253..1f6e306 100755
for i in $browser_candidates; do
init_browser_path $i
--
2.13.4
2.14.2
From e7061f621b2ab5d02c3f0c2d11ca64306e2c6822 Mon Sep 17 00:00:00 2001
From c28ebdeca7e0ad7a4d14a1026a5471ee2d8937db Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 19 Jan 2015 15:37:16 -0500
Subject: On Haiku use the user settings directory instead of HOME
diff --git a/path.c b/path.c
index e50d2be..c58b5b5 100644
index 335d4dd..615c9d4 100644
--- a/path.c
+++ b/path.c
@@ -10,6 +10,11 @@
@@ -66,28 +66,28 @@ index e50d2be..c58b5b5 100644
home = getenv("HOME");
if (home)
--
2.13.4
2.14.2
From 8e914732026761d8c5f799c268016e961a90ed54 Mon Sep 17 00:00:00 2001
From bb13568f941bb3e59a8e33f91676364313544614 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Mon, 19 Jan 2015 15:50:09 -0500
Subject: Ensure config-directory exists before using it.
diff --git a/config.c b/config.c
index 231f9a7..00eaf3f 100644
index 17e1349..ad93c39 100644
--- a/config.c
+++ b/config.c
@@ -2402,6 +2402,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
@@ -2404,6 +2404,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
int ret;
struct lock_file *lock = NULL;
static struct lock_file lock;
char *filename_buf = NULL;
+ char *config_dir = NULL;
char *contents = NULL;
size_t contents_sz;
@@ -2415,6 +2416,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
@@ -2417,6 +2418,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (!config_filename)
config_filename = filename_buf = git_pathdup("config");
@@ -101,10 +101,10 @@ index 231f9a7..00eaf3f 100644
* The lock serves a purpose in addition to locking: the new
* contents of .git/config will be written into it.
--
2.13.4
2.14.2
From 6275da6fb46ef0628c5fbbe69a4fb010fff17b7c Mon Sep 17 00:00:00 2001
From 66ce1d4e8611573bde7ae110d015c45cc5529adf Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Feb 2016 10:32:12 +0100
Subject: Move credential cache to the config directory.
@@ -112,7 +112,7 @@ Subject: Move credential cache to the config directory.
Do not clutter the home dir.
diff --git a/credential-cache.c b/credential-cache.c
index 91550bf..e2432dc 100644
index 1cccc3a..076f6fa 100644
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -87,7 +87,7 @@ static char *get_socket_path(void)
@@ -125,4 +125,5 @@ index 91550bf..e2432dc 100644
socket = xstrfmt("%s/socket", old_dir);
else
--
2.13.4
2.14.2