[gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/, app-emacs/magit/files/

[gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/, app-emacs/magit/files/

[Maciej Barć]

commit:     f2e7a10d5a9bc99c0a67d5878be4ecf4a13bd0a2
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 18:35:22 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 18:40:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e7a10d

app-emacs/magit: nonfatal if failing to load libgit

Bug: https://bugs.gentoo.org/910381
Closes: https://bugs.gentoo.org/910402
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 app-emacs/magit/files/magit-3.3.0-magit-libgit.patch | 11 +++++++++++
 app-emacs/magit/magit-3.3.0-r1.ebuild                |  2 ++
 app-emacs/magit/magit-9999.ebuild                    |  2 ++
 3 files changed, 15 insertions(+)

diff --git a/app-emacs/magit/files/magit-3.3.0-magit-libgit.patch b/app-emacs/magit/files/magit-3.3.0-magit-libgit.patch
new file mode 100644
index 000000000000..f33ac1456198
--- /dev/null
+++ b/app-emacs/magit/files/magit-3.3.0-magit-libgit.patch
@@ -0,0 +1,11 @@
+--- a/magit-libgit.el
++++ b/magit-libgit.el
+@@ -51,7 +51,7 @@
+ 
+ (require 'magit-git)
+ 
+-(require 'libgit)
++(require 'libgit nil t)
+ 
+ ;;; Utilities
+ 

diff --git a/app-emacs/magit/magit-3.3.0-r1.ebuild b/app-emacs/magit/magit-3.3.0-r1.ebuild
index f5457ac3eebe..cbec2d023718 100644
--- a/app-emacs/magit/magit-3.3.0-r1.ebuild
+++ b/app-emacs/magit/magit-3.3.0-r1.ebuild
@@ -22,6 +22,8 @@ S="${S}/lisp"
 LICENSE="GPL-3+"
 SLOT="0"
 
+PATCHES=( "${FILESDIR}"/${PN}-3.3.0-magit-libgit.patch )
+
 DOCS=( ../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes )
 ELISP_TEXINFO="../Documentation/*.texi"
 SITEFILE="50${PN}-gentoo.el"

diff --git a/app-emacs/magit/magit-9999.ebuild b/app-emacs/magit/magit-9999.ebuild
index d9d3068acc4b..57f82de1ff46 100644
--- a/app-emacs/magit/magit-9999.ebuild
+++ b/app-emacs/magit/magit-9999.ebuild
@@ -22,6 +22,8 @@ S="${S}/lisp"
 LICENSE="GPL-3+"
 SLOT="0"
 
+PATCHES=( "${FILESDIR}"/${PN}-3.3.0-magit-libgit.patch )
+
 DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes )
 ELISP_TEXINFO="../docs/*.texi"
 SITEFILE="50${PN}-gentoo.el"

[gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/, app-emacs/magit/files/

[Ulrich Müller]

commit:     2a3b51eb21b1282891c5adea3faa483888e3e410
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 16:05:29 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 16:07:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a3b51eb

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

Bug: https://bugs.gentoo.org/910593
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch    | 15 +++++++++++++++
 .../{magit-3.3.0-r3.ebuild => magit-3.3.0-r4.ebuild}      |  5 ++++-
 2 files changed, 19 insertions(+), 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
new file mode 100644
index 000000000000..6373e720dffc
--- /dev/null
+++ 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 b/app-emacs/magit/magit-3.3.0-r4.ebuild
similarity index 93%
rename from app-emacs/magit/magit-3.3.0-r3.ebuild
rename to app-emacs/magit/magit-3.3.0-r4.ebuild
index eaee9f6713a7..46f40464fe43 100644
--- a/app-emacs/magit/magit-3.3.0-r3.ebuild
+++ b/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"