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

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

[Patrice Clement]

commit:     d2c8a7a975be56584155e48633d44ec7f6ab20dc
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jul  4 19:32:21 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 07:19:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c8a7a9

app-emacs/magit: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/1826

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../magit/files/magit-1.2.0-delete-directory.patch | 33 ----------------------
 1 file changed, 33 deletions(-)

diff --git a/app-emacs/magit/files/magit-1.2.0-delete-directory.patch b/app-emacs/magit/files/magit-1.2.0-delete-directory.patch
deleted file mode 100644
index 6c85345..0000000
--- a/app-emacs/magit/files/magit-1.2.0-delete-directory.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix byte-compile failure with Emacs 24.3.91.
-
-The upstream git repo has a more complicated fix which we don't use,
-because the Gentoo package need not care about Emacs 22 and XEmacs
-compatibility. Instead, always define magit-delete-directory as an
-alias of delete-directory. This will work for all supported Emacs
-versions.
-
---- magit-1.2.0-orig/magit.el
-+++ magit-1.2.0/magit.el
-@@ -775,21 +775,7 @@
-                 after-change-functions)
-             ,@body)))))
- 
--  (if (>= (magit-max-args-internal 'delete-directory) 2)
--      (defalias 'magit-delete-directory 'delete-directory)
--    (defun magit-delete-directory (directory &optional recursive)
--      "Deletes a directory named DIRECTORY.  If RECURSIVE is non-nil,
--recursively delete all of DIRECTORY's contents as well.
--
--Does not follow symlinks."
--      (if (or (file-symlink-p directory)
--              (not (file-directory-p directory)))
--          (delete-file directory)
--        (if recursive
--            ;; `directory-files-no-dot-files-regex' borrowed from Emacs 23
--            (dolist (file (directory-files directory 'full "\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
--              (magit-delete-directory file recursive)))
--        (delete-directory directory)))))
-+  (defalias 'magit-delete-directory 'delete-directory))
- 
- ;;; Utilities
- 

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

[Maciej Barć]

commit:     23ff9d7adddeb5ecb4219845ebaf2d1405d85b00
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Feb 18 13:58:54 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 01:04:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ff9d7a

app-emacs/magit: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../magit/files/magit-3.3.0-inhibit-libgit.patch   | 22 ----------------------
 .../magit/files/magit-3.3.0-libgit-unavail.patch   | 15 ---------------
 2 files changed, 37 deletions(-)

diff --git a/app-emacs/magit/files/magit-3.3.0-inhibit-libgit.patch b/app-emacs/magit/files/magit-3.3.0-inhibit-libgit.patch
deleted file mode 100644
index 20fb2381b6c5..000000000000
--- a/app-emacs/magit/files/magit-3.3.0-inhibit-libgit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 451cbe5c24f2af7ed505f1422af6ad4e8f05205b
-Author: Jonas Bernoulli <jonas@bernoul.li>
-Date:   Sun Feb 19 13:37:28 2023 +0100
-
-    Inhibit use of libgit by default
-
---- lisp/magit-git.el
-+++ lisp/magit-git.el
-@@ -66,8 +66,11 @@
- 
- ;;; Git implementations
- 
--(defvar magit-inhibit-libgit nil
--  "Whether to inhibit the use of libgit.")
-+(defvar magit-inhibit-libgit t
-+  "Whether to inhibit the use of libgit.
-+Use of libgit is inhibited by default because support for libgit
-+in magit is only a stub for now.  There is no benefit in using
-+it.")
- 
- (defvar magit--libgit-available-p 'unknown
-   "Whether libgit is available.

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
deleted file mode 100644
index 6373e720dffc..000000000000
--- a/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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