From: Oleg Pykhalov <go.wigust@gmail.com>
To: 36999@debbugs.gnu.org
Cc: Oleg Pykhalov <go.wigust@gmail.com>
Subject: [bug#36999] [PATCH 1/4] gnu: emacs-magit: Update to 2.90.1-1.c761d28.
Date: Sat, 5 Oct 2019 22:19:26 +0300 [thread overview]
Message-ID: <20191005191929.7356-2-go.wigust@gmail.com> (raw)
In-Reply-To: <20191005191929.7356-1-go.wigust@gmail.com>
* gnu/packages/emacs-xyz.scm (emacs-magit): Update to 2.90.1-1.c761d28.
[arguments]: Add patch phase.
---
gnu/packages/emacs-xyz.scm | 50 ++++++++++++++++++++++++++++++++++----
1 file changed, 45 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index afa21ee19e..7044b92240 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -265,21 +265,28 @@ on stdout instead of using a socket as the Emacsclient does.")
(license license:gpl3+)))
(define-public emacs-magit
- ;; Version 2.90.1 has trouble loading the transient library,
- ;; so we use a more recent commit that fixes it.
- (let ((commit "b4aec016b5577afa8d889f258b499814d1bb1d94"))
+ ;; `magit-setup-buffer' macro introduced in c761d28d and required in
+ ;; `emacs-forge'.
+ (let ((commit "c761d28d49e5238037512b898db0ec9b40d85770"))
(package
(name "emacs-magit")
(version (git-version "2.90.1" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/magit/magit")
+ (url "https://github.com/magit/magit.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
- "0zl7v6z0y50pcgqsf2r8c1k3r5nwjad9ba7r6sgrnf4rc62br7jv"))))
+ "16qx0404l05q1m6w7y5j8ck1z5nfmpinm00w0p2yh1hn5zzwy6dd"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Fix syntax error
+ (substitute* "lisp/magit-extras.el"
+ (("rev\\)\\)\\)\\)\\)\\)") "rev)))))"))
+ #t))))
(build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-minimal)))
@@ -318,6 +325,39 @@ on stdout instead of using a socket as the Emacsclient does.")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda _
+ (chmod "lisp/magit-extras.el" #o644)
+ (emacs-batch-edit-file "lisp/magit-extras.el"
+ `(progn (progn
+ (goto-char (point-min))
+ (re-search-forward "(defun magit-copy-buffer-revision ()")
+ (forward-sexp 2)
+ (kill-sexp)
+ (insert ,(format #f "~S"
+ '(if (use-region-p)
+ (copy-region-as-kill nil nil 'region)
+ (when-let ((rev (cl-case major-mode
+ ((magit-cherry-mode
+ magit-log-select-mode
+ magit-reflog-mode
+ magit-refs-mode
+ magit-revision-mode
+ magit-stash-mode
+ magit-stashes-mode)
+ (car magit-refresh-args))
+ ((magit-diff-mode magit-log-mode)
+ (let ((r (caar magit-refresh-args)))
+ (if (string-match "\\.\\.\\.?\\(.+\\)" r)
+ (match-string 1 r)
+ r)))
+ (magit-status-mode "HEAD"))))
+ (when (magit-commit-p rev)
+ (setq rev (magit-rev-parse rev))
+ (push (list rev default-directory) magit-revision-stack)
+ (kill-new (message "%s" rev))))))))
+ (basic-save-buffer)))
+ #t))
(delete 'configure)
(add-before
'build 'patch-exec-paths
--
2.23.0
next prev parent reply other threads:[~2019-10-05 19:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-10 16:18 [bug#36999] [PATCH] gnu: Add emacs-forge Oleg Pykhalov
2019-08-11 17:39 ` Brian Leung
2019-08-14 6:08 ` Brian Leung
2019-08-18 9:26 ` Oleg Pyhalov
2019-10-05 19:19 ` [bug#36999] [PATCH 0/4] More test and then merge to master Oleg Pykhalov
2019-10-05 19:19 ` Oleg Pykhalov [this message]
2019-10-05 19:19 ` [bug#36999] [PATCH 2/4] gnu: emacs-ghub: Update to 3.2.0-1.cf0b13a Oleg Pykhalov
2019-10-05 19:19 ` [bug#36999] [PATCH 3/4] gnu: emacs-closql: Update to 1.0.0-1.70b98db Oleg Pykhalov
2019-10-05 19:19 ` [bug#36999] [PATCH 4/4] gnu: Add emacs-forge Oleg Pykhalov
2019-10-13 19:45 ` bug#36999: emacs-forge pushed to master Oleg Pykhalov
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191005191929.7356-2-go.wigust@gmail.com \
--to=go.wigust@gmail.com \
--cc=36999@debbugs.gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).