diff --git a/dev-vcs/git/git-2.45.2.recipe b/dev-vcs/git/git-2.48.1.recipe similarity index 95% rename from dev-vcs/git/git-2.45.2.recipe rename to dev-vcs/git/git-2.48.1.recipe index 58fa3a397..917b675f9 100644 --- a/dev-vcs/git/git-2.45.2.recipe +++ b/dev-vcs/git/git-2.48.1.recipe @@ -8,15 +8,15 @@ It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \ features like cheap local branching, convenient staging areas, and multiple \ workflows." HOMEPAGE="https://git-scm.com/" -COPYRIGHT="2005-2023 Git Authors (see git web site for list)" +COPYRIGHT="2005-2025 Git Authors (see git web site for list)" LICENSE="GNU GPL v2" -REVISION="7" +REVISION="1" SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz" -CHECKSUM_SHA256="51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb" +CHECKSUM_SHA256="1c5d545f5dc1eb51e95d2c50d98fdf88b1a36ba1fa30e9ae5d5385c6024f82ad" SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz" -CHECKSUM_SHA256_2="0938309e86537063b9d6c39b12aa4a786e16e03d02a4d12866be2f3e0db919df" +CHECKSUM_SHA256_2="4c0ede7afa4d6dbf602d2f2fd151c36ab57d3224e6b9fd17342e85f05d386886" SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz" -CHECKSUM_SHA256_3="82fdcb1bc184c34f150dd6445efcb0d75498dbec85a362e41f08c16ad8a904bb" +CHECKSUM_SHA256_3="5450321b7de6702f9ec0a41108dfac3626afeb8fdd575b3d9a78febfaa96315c" PATCHES="git-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -165,10 +165,6 @@ REQUIRES_web=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - cmd:cmp - cmd:man - cmd:nano - cmd:perl >= 5.40 devel:libcurl$secondaryArchSuffix devel:libexpat$secondaryArchSuffix devel:libiconv$secondaryArchSuffix @@ -181,12 +177,17 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" + cmd:awk + cmd:cmp cmd:find cmd:gcc$secondaryArchSuffix cmd:gettext cmd:ld$secondaryArchSuffix cmd:make + cmd:man cmd:msgfmt + cmd:nano + cmd:perl >= 5.40 cmd:sed cmd:tar " @@ -211,10 +212,7 @@ makeGit() USE_LIBPCRE2=YesPlease \ NO_D_TYPE_IN_DIRENT=YesPlease \ NO_MEMMEM=YesPlease \ - NO_MKSTEMPS=YesPlease \ NEEDS_LIBICONV=YesPlease \ - NO_R_TO_GCC_LINKER=YesPlease \ - GNU_ROFF=YesPlease \ PERL_PATH=/bin/perl \ perllibdir=$prefix/$(perl -V:installvendorlib | cut -d\' -f2 | cut -d/ -f5-) \ NO_PYTHON=YesPlease \ @@ -341,6 +339,7 @@ INSTALL() $libDir/git-core/git-instaweb } +# Note/Warning: "hp git --test" can take several hours (4 or 5). TEST() { # Version 2.45.2, results on x86_64 hrev57801 with perl 5.32.1: @@ -359,5 +358,5 @@ executable_actions { /sources/git-* kill } DONE - makeGit test + makeGit $jobArgs test } diff --git a/dev-vcs/git/patches/git-2.45.2.patchset b/dev-vcs/git/patches/git-2.48.1.patchset similarity index 76% rename from dev-vcs/git/patches/git-2.45.2.patchset rename to dev-vcs/git/patches/git-2.48.1.patchset index b795c4e39..23911c3a2 100644 --- a/dev-vcs/git/patches/git-2.45.2.patchset +++ b/dev-vcs/git/patches/git-2.48.1.patchset @@ -1,4 +1,4 @@ -From 75e283ac24397b1559d3866f773480b934ed0003 Mon Sep 17 00:00:00 2001 +From 8b0ade14783117b4625355725b137e3cb04130a1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 08:07:25 +0200 Subject: git-web--browse.sh: use "open" on Haiku @@ -21,20 +21,20 @@ index ae15253..b074d1a 100755 init_browser_path $i if type "$browser_path" > /dev/null 2>&1; then -- -2.43.2 +2.48.1 -From af0ee01688986d7c8461d1f8f50c8d037f8d8449 Mon Sep 17 00:00:00 2001 +From 0a02737f1a4d199fa672295aa258f3418c8f878e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold 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 d838d4b..d6827aa 100644 +index 07964f5..e536012 100644 --- a/path.c +++ b/path.c -@@ -19,6 +19,11 @@ +@@ -21,6 +21,11 @@ #include "lockfile.h" #include "exec-cmd.h" @@ -46,7 +46,7 @@ index d838d4b..d6827aa 100644 static int get_st_mode_bits(const char *path, int *mode) { struct stat st; -@@ -1535,11 +1540,19 @@ char *xdg_config_home_for(const char *subdir, const char *filename) +@@ -1444,11 +1449,19 @@ char *xdg_config_home_for(const char *subdir, const char *filename) { const char *home, *config_home; @@ -67,22 +67,22 @@ index d838d4b..d6827aa 100644 home = getenv("HOME"); if (home) -- -2.43.2 +2.48.1 -From 87074365dcc427a60d666bc4ce677824b6634724 Mon Sep 17 00:00:00 2001 +From 1ddc4bbc99323392f30cddfe1551c437781eda96 Mon Sep 17 00:00:00 2001 From: Oliver Tappe 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 77a0fd2..9625246 100644 +index 50f2d17..c0d4588 100644 --- a/config.c +++ b/config.c -@@ -3300,6 +3300,14 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, +@@ -3202,6 +3202,14 @@ int repo_config_set_multivar_in_file_gently(struct repository *r, if (!config_filename) - config_filename = filename_buf = git_pathdup("config"); + config_filename = filename_buf = repo_git_path(r, "config"); + if (find_last_dir_sep(config_filename) != NULL) { + char *config_dir = xstrdup(config_filename); @@ -96,10 +96,10 @@ index 77a0fd2..9625246 100644 * The lock serves a purpose in addition to locking: the new * contents of .git/config will be written into it. -- -2.43.2 +2.48.1 -From caef08d8eb899a5fb3e5b7388e627864637c63a6 Mon Sep 17 00:00:00 2001 +From f16b9a017a867c601e0327304dfc322457572dd0 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 14 Feb 2016 10:32:12 +0100 Subject: Move credential cache to the config directory. @@ -107,10 +107,10 @@ Subject: Move credential cache to the config directory. Do not clutter the home dir. diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c -index bef120b..9112f51 100644 +index 7f733cb..65319f5 100644 --- a/builtin/credential-cache.c +++ b/builtin/credential-cache.c -@@ -118,7 +118,7 @@ static char *get_socket_path(void) +@@ -121,7 +121,7 @@ static char *get_socket_path(void) { struct stat sb; char *old_dir, *socket; @@ -120,10 +120,10 @@ index bef120b..9112f51 100644 socket = xstrfmt("%s/socket", old_dir); else -- -2.43.2 +2.48.1 -From 9f4d2c847f0a70aac64e72af7510798a65301d73 Mon Sep 17 00:00:00 2001 +From 605b60f8211a4ee489812fa7b09211ab48f2cd9f Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 24 May 2024 15:15:25 -0300 Subject: config: use "xdg_config" even if "user_config" does not exist @@ -131,10 +131,10 @@ Subject: config: use "xdg_config" even if "user_config" does not exist Based on the previous patch by: sfanxiang diff --git a/config.c b/config.c -index 9625246..3c0b3d7 100644 +index c0d4588..0fd7fb3 100644 --- a/config.c +++ b/config.c -@@ -2013,18 +2013,12 @@ char *git_global_config(void) +@@ -1993,18 +1993,12 @@ char *git_global_config(void) char *user_config, *xdg_config; git_global_config_paths(&user_config, &xdg_config); @@ -159,10 +159,10 @@ index 9625246..3c0b3d7 100644 } -- -2.43.2 +2.48.1 -From 2fcd662ed91d8d19257b05b4f29eacbd96251eaa Mon Sep 17 00:00:00 2001 +From df22c5cbdb9d817180cba41e9a691338a475642b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 18 Nov 2018 11:56:26 +0100 Subject: Fix detection of Haiku for git web browse @@ -186,20 +186,20 @@ index b074d1a..0f95000 100755 fi -- -2.43.2 +2.48.1 -From 0a0191c9582c02f39eed96778d154d1afb86929d Mon Sep 17 00:00:00 2001 +From 2a800a2751d6faf7f45357827d4f2e9eeee12ab2 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 29 Nov 2019 21:46:54 +0100 Subject: ignore test failures. diff --git a/t/Makefile b/t/Makefile -index 2d95046..4cc0249 100644 +index daa5fca..0b6dd8a 100644 --- a/t/Makefile +++ b/t/Makefile -@@ -71,7 +71,7 @@ prove: pre-clean check-chainlint $(TEST_LINT) +@@ -74,7 +74,7 @@ prove: pre-clean check-chainlint $(TEST_LINT) $(MAKE) clean-except-prove-cache $(T): @@ -209,10 +209,10 @@ index 2d95046..4cc0249 100644 $(UNIT_TESTS): @echo "*** $@ ***"; $@ -- -2.43.2 +2.48.1 -From a0f34cd84e222421e4c85c25965996b67b73d8ef Mon Sep 17 00:00:00 2001 +From 1b8fe359538a000bff88a15ca699e9e248fc7cf0 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 17 Nov 2021 18:11:17 -0500 Subject: git-gui: Use symbolic links. @@ -241,5 +241,31 @@ index 667c39e..d05a4fd 100644 CLEAN_DST = echo ' ' UNINSTALL REMOVE_D0 = dir= -- -2.43.2 +2.48.1 + + +From 1162ea6b43fc5de0438013699b24c804f9e1f828 Mon Sep 17 00:00:00 2001 +From: Oscar Lesta +Date: Fri, 28 Feb 2025 15:50:56 -0300 +Subject: Workaround for HaikuPorts issue #11131. + + +diff --git a/gettext.c b/gettext.c +index 8d08a61..0defa18 100644 +--- a/gettext.c ++++ b/gettext.c +@@ -118,6 +118,11 @@ void git_setup_gettext(void) + } + + bindtextdomain("git", podir); ++#ifdef __HAIKU__ ++ // See HaikuPorts issue #11131 ++ setlocale(LC_ALL, ""); ++#else + setlocale(LC_MESSAGES, ""); + setlocale(LC_TIME, ""); ++#endif + init_gettext_charset("git"); +-- +2.48.1