From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/, app-emacs/magit/files/
Date: Thu, 20 Jul 2023 16:07:43 +0000 (UTC) [thread overview]
Message-ID: <1689869257.2a3b51eb21b1282891c5adea3faa483888e3e410.ulm@gentoo> (raw)
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"
next reply other threads:[~2023-07-20 16:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 16:07 Ulrich Müller [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-07-15 18:40 [gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/, app-emacs/magit/files/ Maciej Barć
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1689869257.2a3b51eb21b1282891c5adea3faa483888e3e410.ulm@gentoo \
--to=ulm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox