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

git: bump version

Browse Source
This commit is contained in:
Jerome Duval
2021-01-04 16:48:43 +01:00
parent 7df74fb554
commit fc2c4cc688
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dev-vcs/git/git-2.28.0.recipe → dev-vcs/git/git-2.30.0.recipe
View File

@@ -12,11 +12,11 @@ COPYRIGHT="2005-2020 Git Authors (see git web site for list)"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
CHECKSUM_SHA256="dfa5d1a253aa451465478fe45c6a40ab8605b340fdb4c4e80b16d7f87708439d"
CHECKSUM_SHA256="55735021109565721af805af382c45cce73c3cfaa59daad22443d1477d334d19"
SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
CHECKSUM_SHA256_2="665a7fa41f9a39248e48422dcf533e1a0133a4a6eddfc25ee55e28e42fc07cb7"
CHECKSUM_SHA256_2="7b2b8405d5bdd149e3891617053de37f7e8d5a5b3834317a5af9f30ccc93cf76"
SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
CHECKSUM_SHA256_3="24feed3b584e2121418de9bde9f2e23fdcf78e4f914279787f669d3dc375bfe6"
CHECKSUM_SHA256_3="820132c62ade3df12b4178857cfc5c92276b847b2307a5f7f4d24c27774f962f"
PATCHES="git-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -164,6 +164,7 @@ makeGit()
DEFAULT_EDITOR=nano \
DEFAULT_HELP_FORMAT=web \
BASIC_LDFLAGS="-lnetwork -lbsd" \
CPPFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS" \
"$@"
}
@@ -245,20 +246,20 @@ INSTALL()
TEST()
{
# x86_64
#failed test(s): t0005 t0006 t0210 t0211 t0301 t0302 t1010 t1013 t1060 t1100 t1300 t1305 t1306 t1308 t1309 t1400 t1500 t1510 t2013 t2400 t2403 t3007 t3200 t3420 t3426 t3512 t3513 t3600 t3903 t3906 t4015 t4027 t4059 t4060 t4064 t4067 t4137 t4208 t4255 t5000 t5003 t5300 t5310 t5318 t5400 t5410 t5505 t5510 t5516 t5525 t5526 t5545 t5562 t5572 t5601 t5604 t5605 t5614 t5616 t5617 t5702 t5811 t5814 t5815 t6008 t6041 t6120 t6134 t7001 t7003 t7060 t7064 t7112 t7300 t7400 t7401 t7403 t7405 t7406 t7407 t7408 t7409 t7410 t7411 t7412 t7413 t7414 t7415 t7416 t7417 t7418 t7419 t7506 t7507 t7508 t7610 t7613 t7700 t7701 t7800 t7814 t9300 t9350
#failed test(s): t0001 t0005 t0006 t0090 t0210 t0211 t0301 t0302 t0410 t1013 t1060 t1091 t1100 t1300 t1305 t1306 t1308 t1309 t1400 t1500 t1510 t1512 t2013 t2400 t2403 t2405 t3007 t3200 t3203 t3205 t3206 t3420 t3426 t3512 t3513 t3600 t3701 t3903 t3906 t3920 t4014 t4015 t4027 t4034 t4059 t4060 t4064 t4067 t4137 t4202 t4207 t4208 t4214 t4215 t4255 t5000 t5003 t5300 t5310 t5317 t5318 t5322 t5409 t5410 t5411 t5505 t5509 t5510 t5516 t5525 t5526 t5545 t5562 t5572 t5601 t5604 t5605 t5614 t5616 t5617 t5702 t5811 t5814 t5815 t6006 t6008 t6041 t6112 t6120 t6134 t6300 t6416 t6437 t6438 t6500 t7001 t7003 t7004 t7060 t7064 t7112 t7300 t7400 t7401 t7403 t7406 t7407 t7408 t7409 t7411 t7412 t7413 t7414 t7415 t7416 t7417 t7418 t7419 t7420 t7421 t7506 t7507 t7508 t7601 t7610 t7700 t7701 t7800 t7810 t7814 t8001 t8012 t9300 t9304 t9350 t9351 t9902
#fixed 2
#success 19182
#failed 1042
#broken 236
#total 20841
#success 20393
#failed 1353
#broken 235
#total 22417
# x86_gcc2
#failed test(s): t0005 t0006 t0090 t0210 t0301 t0302 t0410 t1013 t1060 t1100 t1300 t1305 t1306 t1308 t1309 t1400 t1500 t1501 t1510 t1512 t2013 t2400 t2403 t3007 t3200 t3203 t3205 t3206 t3420 t3426 t3512 t3513 t3600 t3903 t3906 t4014 t4015 t4027 t4034 t4059 t4060 t4064 t4067 t4137 t4202 t4203 t4207 t4208 t4209 t4210 t4214 t4255 t5003 t5300 t5310 t5317 t5318 t5322 t5409 t5410 t5505 t5510 t5516 t5525 t5526 t5545 t5562 t5572 t5601 t5604 t5605 t5614 t5616 t5617 t5702 t5811 t5813 t5814 t5815 t6006 t6008 t6036 t6041 t6112 t6120 t6132 t6134 t6135 t6300 t6500 t7001 t7003 t7004 t7011 t7060 t7064 t7112 t7300 t7400 t7401 t7403 t7405 t7406 t7407 t7408 t7409 t7410 t7411 t7412 t7413 t7414 t7415 t7416 t7417 t7418 t7419 t7506 t7507 t7508 t7610 t7613 t7700 t7701 t7800 t7810 t7811 t7814 t7815 t7816 t8001 t8012 t9300 t9350 t9902
#failed test(s): t0001 t0005 t0006 t0090 t0210 t0211 t0301 t0302 t0410 t1013 t1060 t1091 t1100 t1300 t1305 t1306 t1308 t1309 t1400 t1500 t1510 t1512 t2013 t2400 t2403 t2405 t3007 t3200 t3203 t3205 t3206 t3420 t3426 t3512 t3513 t3600 t3701 t3903 t3906 t3920 t4014 t4015 t4027 t4034 t4059 t4060 t4064 t4067 t4137 t4202 t4207 t4208 t4214 t4215 t4255 t5003 t5300 t5310 t5317 t5318 t5322 t5409 t5410 t5411 t5500 t5505 t5509 t5510 t5516 t5525 t5526 t5528 t5533 t5545 t5562 t5572 t5601 t5604 t5605 t5614 t5616 t5617 t5702 t5811 t5814 t5815 t6006 t6008 t6041 t6112 t6120 t6134 t6300 t6416 t6437 t6438 t6500 t7001 t7003 t7004 t7060 t7064 t7112 t7300 t7400 t7401 t7403 t7406 t7407 t7408 t7409 t7411 t7412 t7413 t7414 t7415 t7416 t7417 t7418 t7419 t7420 t7421 t7506 t7507 t7508 t7601 t7610 t7700 t7701 t7800 t7810 t7814 t8001 t8012 t9300 t9304 t9350 t9351 t9902
#fixed 2
#success 18744
#failed 1392
#broken 236
#total 20841
#success 20383
#failed 1358
#broken 235
#total 22417
cat << DONE
!!Make sure to configure the debug_server in \

54
dev-vcs/git/patches/git-2.28.0.patchset → dev-vcs/git/patches/git-2.30.0.patchset
View File

@@ -1,4 +1,4 @@
From 56acac1a903dcbdd37c3b57fc168ad20179596b1 Mon Sep 17 00:00:00 2001
From 1c74acedb8f0c4682a3e889cf23b43cde4b5f5a3 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
@@ -21,17 +21,17 @@ index ae15253..b074d1a 100755
init_browser_path $i
if type "$browser_path" > /dev/null 2>&1; then
--
2.24.1
2.28.0
From 0f557f23acaef82951851dc2165c9a9a4065703e Mon Sep 17 00:00:00 2001
From aa131000e2bb5119015c0cdabeb026c03de8e659 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 88cf593..aa4eb37 100644
index 7b385e5..f0669d6 100644
--- a/path.c
+++ b/path.c
@@ -13,6 +13,11 @@
@@ -67,20 +67,20 @@ index 88cf593..aa4eb37 100644
home = getenv("HOME");
if (home)
--
2.24.1
2.28.0
From 2df42bd79662a4db16c91348283c22bddd728523 Mon Sep 17 00:00:00 2001
From b9658a023ab00baaabde5fb9a6eba55293b0a34b 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 d17d2bd..6d51342 100644
index 1137bd7..6dd4b41 100644
--- a/config.c
+++ b/config.c
@@ -2729,6 +2729,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
@@ -2761,6 +2761,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
int ret;
struct lock_file lock = LOCK_INIT;
char *filename_buf = NULL;
@@ -88,7 +88,7 @@ index d17d2bd..6d51342 100644
char *contents = NULL;
size_t contents_sz;
struct config_store_data store;
@@ -2745,6 +2746,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
@@ -2777,6 +2778,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (!config_filename)
config_filename = filename_buf = git_pathdup("config");
@@ -102,21 +102,21 @@ index d17d2bd..6d51342 100644
* The lock serves a purpose in addition to locking: the new
* contents of .git/config will be written into it.
--
2.24.1
2.28.0
From e2d721e9456e591cd467759a5b8fa6a9102df0b7 Mon Sep 17 00:00:00 2001
From 2af7a649faab7562fee5cd32de2a4e8e522b5c1b 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.
Do not clutter the home dir.
diff --git a/credential-cache.c b/credential-cache.c
index 1cccc3a..076f6fa 100644
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -87,7 +87,7 @@ static char *get_socket_path(void)
diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c
index 9b3f709..893db81 100644
--- a/builtin/credential-cache.c
+++ b/builtin/credential-cache.c
@@ -90,7 +90,7 @@ static char *get_socket_path(void)
{
struct stat sb;
char *old_dir, *socket;
@@ -126,20 +126,20 @@ index 1cccc3a..076f6fa 100644
socket = xstrfmt("%s/socket", old_dir);
else
--
2.24.1
2.28.0
From 5841649bb9d07c614031f95dc211e066b9f4650a Mon Sep 17 00:00:00 2001
From 0663035df5770c9cb2edc3c6f7578bfc38e5ef49 Mon Sep 17 00:00:00 2001
From: sfanxiang <sfanxiang@gmail.com>
Date: Mon, 1 Jan 2018 13:26:28 +0000
Subject: builtin: config: use xdg_config even if it does not exist
diff --git a/builtin/config.c b/builtin/config.c
index ee4aef6..7de3510 100644
index f71fa39..0843a19 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -645,24 +645,11 @@ int cmd_config(int argc, const char **argv, const char *prefix)
@@ -674,24 +674,11 @@ int cmd_config(int argc, const char **argv, const char *prefix)
char *user_config = expand_user_path("~/.gitconfig", 0);
char *xdg_config = xdg_config_home("config");
@@ -169,10 +169,10 @@ index ee4aef6..7de3510 100644
}
else if (use_system_config) {
--
2.24.1
2.28.0
From 82d3fea48bc155df46881f065349b3408c4ac75b Mon Sep 17 00:00:00 2001
From 68029054d6d00db50c422d37284246908a493e26 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 18 Nov 2018 11:56:26 +0100
Subject: Fix detection of Haiku for git web browse
@@ -196,20 +196,20 @@ index b074d1a..0f95000 100755
fi
--
2.24.1
2.28.0
From 3ff86a8daa60790bb711c0ffff255a4cecafda33 Mon Sep 17 00:00:00 2001
From 97dfbc1daa64c44975dc8617eacdf5a7688dcbc6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 29 Nov 2019 21:46:54 +0100
Subject: ignore test failures.
diff --git a/t/Makefile b/t/Makefile
index c83fd18..88e0c41 100644
index 882d26e..3252f7f 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -53,7 +53,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
@@ -54,7 +54,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
$(MAKE) clean-except-prove-cache
$(T):
@@ -219,5 +219,5 @@ index c83fd18..88e0c41 100644
pre-clean:
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
--
2.24.1
2.28.0