commit: 3e35cd95723d9c74e3da7e82553bd4fd85e12a57
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 23:16:45 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 23:24:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e35cd95
dev-vcs/git: restore USE=-safe-directory patch to 2.48.0
It got lost when tidying up with the Meson switch. Also, sync 9999-r1
too for earlier changes (I'd mixed up 9999-r0 and 9999-r1 as the one
which shouldn't be touchde yet as it's pre-meson).
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-vcs/git/git-2.48.0-r2.ebuild | 12 ++++++++++++
dev-vcs/git/git-9999-r1.ebuild | 14 ++++++++++++++
dev-vcs/git/git-9999-r2.ebuild | 12 ++++++++++++
dev-vcs/git/git-9999-r3.ebuild | 12 ++++++++++++
4 files changed, 50 insertions(+)
diff --git a/dev-vcs/git/git-2.48.0-r2.ebuild b/dev-vcs/git/git-2.48.0-r2.ebuild
index ada3bd37529c..f90f10f55f15 100644
--- a/dev-vcs/git/git-2.48.0-r2.ebuild
+++ b/dev-vcs/git/git-2.48.0-r2.ebuild
@@ -181,6 +181,18 @@ src_unpack() {
}
+src_prepare() {
+ if ! use safe-directory ; then
+ # This patch neuters the "safe directory" detection.
+ # bugs #838271, #838223
+ PATCHES+=(
+ "${FILESDIR}"/git-2.46.2-unsafe-directory.patch
+ )
+ fi
+
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature curl)
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 2097a69cfdab..f90f10f55f15 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -181,6 +181,18 @@ src_unpack() {
}
+src_prepare() {
+ if ! use safe-directory ; then
+ # This patch neuters the "safe directory" detection.
+ # bugs #838271, #838223
+ PATCHES+=(
+ "${FILESDIR}"/git-2.46.2-unsafe-directory.patch
+ )
+ fi
+
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature curl)
@@ -253,6 +265,7 @@ src_compile() {
if use tk ; then
git_emake -C gitk-git
+ git_emake -C git-gui
fi
if use doc ; then
@@ -432,6 +445,7 @@ src_install() {
if use tk ; then
git_emake -C gitk-git DESTDIR="${D}" install
+ git_emake -C git-gui DESTDIR="${D}" install
fi
perl_delete_localpod
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index ada3bd37529c..f90f10f55f15 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -181,6 +181,18 @@ src_unpack() {
}
+src_prepare() {
+ if ! use safe-directory ; then
+ # This patch neuters the "safe directory" detection.
+ # bugs #838271, #838223
+ PATCHES+=(
+ "${FILESDIR}"/git-2.46.2-unsafe-directory.patch
+ )
+ fi
+
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature curl)
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index ada3bd37529c..f90f10f55f15 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -181,6 +181,18 @@ src_unpack() {
}
+src_prepare() {
+ if ! use safe-directory ; then
+ # This patch neuters the "safe directory" detection.
+ # bugs #838271, #838223
+ PATCHES+=(
+ "${FILESDIR}"/git-2.46.2-unsafe-directory.patch
+ )
+ fi
+
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature curl)
