From: "Maciej Barć" <xgqt@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/, app-emacs/magit/files/
Date: Sat, 15 Jul 2023 18:40:03 +0000 (UTC) [thread overview]
Message-ID: <1689446400.f2e7a10d5a9bc99c0a67d5878be4ecf4a13bd0a2.xgqt@gentoo> (raw)
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"
next reply other threads:[~2023-07-15 18:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-15 18:40 Maciej Barć [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-07-20 16:07 [gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/, app-emacs/magit/files/ Ulrich Müller
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=1689446400.f2e7a10d5a9bc99c0a67d5878be4ecf4a13bd0a2.xgqt@gentoo \
--to=xgqt@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