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"
