From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EFE5E15800A for ; Sat, 15 Jul 2023 18:40:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 397C2E089D; Sat, 15 Jul 2023 18:40:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F28FE0845 for ; Sat, 15 Jul 2023 18:40:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5760A340CB4 for ; Sat, 15 Jul 2023 18:40:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5277A99 for ; Sat, 15 Jul 2023 18:40:03 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1689446400.f2e7a10d5a9bc99c0a67d5878be4ecf4a13bd0a2.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/, app-emacs/magit/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emacs/magit/files/magit-3.3.0-magit-libgit.patch app-emacs/magit/magit-3.3.0-r1.ebuild app-emacs/magit/magit-9999.ebuild X-VCS-Directories: app-emacs/magit/ app-emacs/magit/files/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: f2e7a10d5a9bc99c0a67d5878be4ecf4a13bd0a2 X-VCS-Branch: master Date: Sat, 15 Jul 2023 18:40:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 55837a6a-a972-4066-9389-6a2fad27cad5 X-Archives-Hash: ed1f6397c9327d087270b5801c4ff794 commit: f2e7a10d5a9bc99c0a67d5878be4ecf4a13bd0a2 Author: Maciej Barć gentoo org> AuthorDate: Sat Jul 15 18:35:22 2023 +0000 Commit: Maciej Barć gentoo 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ć 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"