app-emacs/magit: Suppress warning message about missing magit-libgit

Bug: https://bugs.gentoo.org/910593 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
orbea · Jul 20, 2023 · 2a3b51e · 2a3b51e
1 parent b21cfa9
commit 2a3b51e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch b/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch
@@ -0,0 +1,15 @@
+Suppress warning message about missing magit-libgit
+https://bugs.gentoo.org/910593
+
+--- lisp/magit-core.el
++++ lisp/magit-core.el
+@@ -41,7 +41,8 @@
+ (require 'magit-transient)
+ (require 'magit-autorevert)
+
+-(when (magit--libgit-available-p)
++(when (and (not magit-inhibit-libgit)
++           (magit--libgit-available-p))
+   (condition-case err
+       (require 'magit-libgit)
+     (error
diff --git a/app-emacs/magit/magit-3.3.0-r3.ebuild → app-emacs/magit/magit-3.3.0-r4.ebuild b/app-emacs/magit/magit-3.3.0-r3.ebuild → app-emacs/magit/magit-3.3.0-r4.ebuild
@@ -23,7 +23,10 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="libgit"
 
-PATCHES=( "${FILESDIR}"/${P}-inhibit-libgit.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-inhibit-libgit.patch
+	"${FILESDIR}"/${P}-libgit-unavail.patch
+)
 DOCS=( ../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes )
 ELISP_TEXINFO="../Documentation/*.texi"
 SITEFILE="50${PN}-gentoo.el"