From a499e158421b4fe8e211511565b7414bedfa1003 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 18 Nov 2023 10:15:00 +0100 Subject: [PATCH] git, bump version (#9762) --- .../{git-2.42.0.recipe => git-2.42.1.recipe} | 21 ++++++------ ...it-2.42.0.patchset => git-2.42.1.patchset} | 32 +++++++++---------- 2 files changed, 27 insertions(+), 26 deletions(-) rename dev-vcs/git/{git-2.42.0.recipe => git-2.42.1.recipe} (92%) rename dev-vcs/git/patches/{git-2.42.0.patchset => git-2.42.1.patchset} (92%) diff --git a/dev-vcs/git/git-2.42.0.recipe b/dev-vcs/git/git-2.42.1.recipe similarity index 92% rename from dev-vcs/git/git-2.42.0.recipe rename to dev-vcs/git/git-2.42.1.recipe index f2f0f104e..e922fb1fb 100644 --- a/dev-vcs/git/git-2.42.0.recipe +++ b/dev-vcs/git/git-2.42.1.recipe @@ -10,21 +10,21 @@ workflows." HOMEPAGE="https://git-scm.com/" COPYRIGHT="2005-2023 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="3278210e9fd2994b8484dd7e3ddd9ea8b940ef52170cdb606daa94d887c93b0d" +CHECKSUM_SHA256="8e46fa96bf35a65625d85fde50391e39bc0620d1bb39afb70b96c4a237a1a4f7" SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz" -CHECKSUM_SHA256_2="03e0dc60a077ad31b10119e6619af8b50e652bd5c8a95c891523d73af1e573b9" +CHECKSUM_SHA256_2="3d0495a10351b3541056a7923c63f3fd8a54992914cf56301809af8c69636b5d" SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz" -CHECKSUM_SHA256_3="c027ad23614d19685677899527360985ec9186e97528084dc4f8d611f6c3483f" +CHECKSUM_SHA256_3="8d593e8184cea31a3527e810a15d6e0851b2bd258c74b5293fbf32b167847421" PATCHES="git-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" GLOBAL_WRITABLE_FILES=" - settings/etc/profile.d/git-completion.sh keep-old - settings/etc/profile.d/git-prompt.sh keep-old +# settings/etc/profile.d/git-completion.sh keep-old +# settings/etc/profile.d/git-prompt.sh keep-old settings/gitconfig keep-old " USER_SETTINGS_FILES=" @@ -223,10 +223,11 @@ INSTALL() cp -rd $sourceDir3/*.html $htmlDir/ # copy bash-completions and prompt scripts - profileDir=$settingsDir/etc/profile.d - mkdir -p $profileDir - cp $sourceDir/contrib/completion/git-completion.bash $profileDir/git-completion.sh - cp $sourceDir/contrib/completion/git-prompt.sh $profileDir + # Disable for now: https://github.com/haikuports/haikuports/issues/9741 +# profileDir=$settingsDir/etc/profile.d +# mkdir -p $profileDir +# cp $sourceDir/contrib/completion/git-completion.bash $profileDir/git-completion.sh +# cp $sourceDir/contrib/completion/git-prompt.sh $profileDir # Default system-wide gitconfig. Settings in this file are only used # if they are unset both for the repository and globally (global options diff --git a/dev-vcs/git/patches/git-2.42.0.patchset b/dev-vcs/git/patches/git-2.42.1.patchset similarity index 92% rename from dev-vcs/git/patches/git-2.42.0.patchset rename to dev-vcs/git/patches/git-2.42.1.patchset index 5cbb887ab..364a2b718 100644 --- a/dev-vcs/git/patches/git-2.42.0.patchset +++ b/dev-vcs/git/patches/git-2.42.1.patchset @@ -1,4 +1,4 @@ -From f848ea5b273e070c22dd5d9659180b28eab55cc6 Mon Sep 17 00:00:00 2001 +From d76d0f338cd939904b75b3ff05eb149d52be4ecb 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,10 +21,10 @@ index ae15253..b074d1a 100755 init_browser_path $i if type "$browser_path" > /dev/null 2>&1; then -- -2.37.3 +2.42.1 -From 3d173515b72bbb12fbbbb7a28ca76eaffad6eccf Mon Sep 17 00:00:00 2001 +From 7cf641be5e878f38dd6374291c4388ba44c3b01c 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 @@ -67,10 +67,10 @@ index 67e2690..95d98f3 100644 home = getenv("HOME"); if (home) -- -2.37.3 +2.42.1 -From 37020c1d335aad247c188108ec4083dc44dc239c Mon Sep 17 00:00:00 2001 +From 05dff4504f99fa31e9562ea7e5786d444bde3ab2 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. @@ -96,10 +96,10 @@ index 3846a37..301ad6c 100644 * The lock serves a purpose in addition to locking: the new * contents of .git/config will be written into it. -- -2.37.3 +2.42.1 -From 9086bb3a2e3d8083b60a94204e4db3f7df8ad742 Mon Sep 17 00:00:00 2001 +From 090f78ca7956d26e71ec9129d9cce40000ae7bc6 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. @@ -120,10 +120,10 @@ index 43b9d0e..9e8be52 100644 socket = xstrfmt("%s/socket", old_dir); else -- -2.37.3 +2.42.1 -From e9e1546f40bf9bab2158b83aa553440ab91407a0 Mon Sep 17 00:00:00 2001 +From 9de908fc0e75a4c15cd06efc1b55ad1d09c38cf5 Mon Sep 17 00:00:00 2001 From: sfanxiang Date: Mon, 1 Jan 2018 13:26:28 +0000 Subject: builtin: config: use xdg_config even if it does not exist @@ -163,10 +163,10 @@ index 11a4d4e..67dc39d 100644 } else if (use_system_config) { -- -2.37.3 +2.42.1 -From 2c82a2f2ea5a11d8265af1dec9ac803e7fbecd2b Mon Sep 17 00:00:00 2001 +From 150f7fa461a292adfc13378eacf659d510888297 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 @@ -190,10 +190,10 @@ index b074d1a..0f95000 100755 fi -- -2.37.3 +2.42.1 -From 4987ee3ec76af0db865e0899a315d9403b3d1657 Mon Sep 17 00:00:00 2001 +From d1a56cd070ef9039f67ae55a5ab41c7bbbfe7ce7 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 29 Nov 2019 21:46:54 +0100 Subject: ignore test failures. @@ -213,10 +213,10 @@ index 3e00cdd..8b27e50 100644 pre-clean: $(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)' -- -2.37.3 +2.42.1 -From 1683665e2a7192afce292530e7259f37acd02ea2 Mon Sep 17 00:00:00 2001 +From 56649a0389cff232cff2674f806dce571f19e5fa 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. @@ -245,5 +245,5 @@ index a0d5a4b..b00a622 100644 CLEAN_DST = echo ' ' UNINSTALL REMOVE_D0 = dir= -- -2.37.3 +2.42.1