emacs: update to 27.1.
This commit is contained in:
Ivan Sokolov
Leah Neukirchen
parent
a56cd961cc
commit
7282599aa8
3 changed files with 9 additions and 101 deletions
|
|
@ -1,55 +0,0 @@
|
|||
From 6a11fbebd8459a987a2e5878b468e5f1f9e0dd75 Mon Sep 17 00:00:00 2001
|
||||
From: Alexei Khlebnikov <alexei.khlebnikov@gmail.com>
|
||||
Date: Thu, 22 Feb 2018 12:21:49 +0100
|
||||
Subject: [PATCH 1/2] Fix for: "25.0.50; auto-revert-mode breaks git rebase"
|
||||
(Bug#21559)
|
||||
|
||||
* lisp/autorevert.el (auto-revert-handler):
|
||||
Set "revert-buffer-in-progress-p" flag before calling
|
||||
"vc-refresh-state".
|
||||
|
||||
* lisp/vc/vc-git.el (vc-git-command):
|
||||
If "revert-buffer-in-progress-p" flag is set, prepend
|
||||
"GIT_OPTIONAL_LOCKS=0" to "process-environment". (Bug#21559)
|
||||
---
|
||||
lisp/autorevert.el | 3 ++-
|
||||
lisp/vc/vc-git.el | 9 ++++++++-
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git lisp/autorevert.el lisp/autorevert.el
|
||||
index 7b8302695f..13cc25043d 100644
|
||||
--- lisp/autorevert.el
|
||||
+++ lisp/autorevert.el
|
||||
@@ -719,7 +719,8 @@ This is an internal function used by Auto-Revert Mode."
|
||||
;; `preserve-modes' avoids changing the (minor) modes. But we do
|
||||
;; want to reset the mode for VC, so we do it manually.
|
||||
(when (or revert auto-revert-check-vc-info)
|
||||
- (vc-refresh-state))))
|
||||
+ (let ((revert-buffer-in-progress-p t))
|
||||
+ (vc-refresh-state)))))
|
||||
|
||||
(defun auto-revert-tail-handler (size)
|
||||
(let ((modified (buffer-modified-p))
|
||||
diff --git lisp/vc/vc-git.el lisp/vc/vc-git.el
|
||||
index efe853e5ee..0cea5334f4 100644
|
||||
--- lisp/vc/vc-git.el
|
||||
+++ lisp/vc/vc-git.el
|
||||
@@ -1564,7 +1564,14 @@ The difference to vc-do-command is that this function always invokes
|
||||
(or coding-system-for-read vc-git-log-output-coding-system))
|
||||
(coding-system-for-write
|
||||
(or coding-system-for-write vc-git-commits-coding-system))
|
||||
- (process-environment (cons "GIT_DIR" process-environment)))
|
||||
+ (process-environment
|
||||
+ (append
|
||||
+ `("GIT_DIR"
|
||||
+ ;; Avoid repository locking during background operations
|
||||
+ ;; (bug#21559).
|
||||
+ ,@(when revert-buffer-in-progress-p
|
||||
+ '("GIT_OPTIONAL_LOCKS=0")))
|
||||
+ process-environment)))
|
||||
(apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program
|
||||
;; https://debbugs.gnu.org/16897
|
||||
(unless (and (not (cdr-safe file-or-list))
|
||||
--
|
||||
2.19.0
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From 1842a410263aa9d6ddd23efc7603122f9ce6bcb3 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Ruder <andy@aeruder.net>
|
||||
Date: Mon, 24 Sep 2018 21:29:00 -0700
|
||||
Subject: [PATCH 2/2] vc-git.el: make sure bug#21559 applies to git status
|
||||
|
||||
The fix for Bug#21559 is mostly right, but the one command we were
|
||||
trying to protect, git status --porcelain, doesn't go through
|
||||
vc-git-command and doesn't actually get the GIT_OPTIONAL_LOCKS=0 treatment.
|
||||
|
||||
* lisp/vc/vc-git.el (vc-git--call): Override GIT_OPTIONAL_LOCKS=0
|
||||
during revert-buffer-in-progress-p
|
||||
---
|
||||
lisp/vc/vc-git.el | 11 +++++++++--
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git lisp/vc/vc-git.el lisp/vc/vc-git.el
|
||||
index 0cea5334f4..e779109191 100644
|
||||
--- lisp/vc/vc-git.el
|
||||
+++ lisp/vc/vc-git.el
|
||||
@@ -1598,8 +1598,15 @@ The difference to vc-do-command is that this function always invokes
|
||||
(or coding-system-for-read vc-git-log-output-coding-system))
|
||||
(coding-system-for-write
|
||||
(or coding-system-for-write vc-git-commits-coding-system))
|
||||
- (process-environment (cons "PAGER=" process-environment)))
|
||||
- (push "GIT_DIR" process-environment)
|
||||
+ (process-environment
|
||||
+ (append
|
||||
+ `("GIT_DIR"
|
||||
+ "PAGER="
|
||||
+ ;; Avoid repository locking during background operations
|
||||
+ ;; (bug#21559).
|
||||
+ ,@(when revert-buffer-in-progress-p
|
||||
+ '("GIT_OPTIONAL_LOCKS=0")))
|
||||
+ process-environment)))
|
||||
(apply 'process-file vc-git-program nil buffer nil command args)))
|
||||
|
||||
(defun vc-git--out-ok (command &rest args)
|
||||
--
|
||||
2.19.0
|
||||
|
||||
15
srcpkgs/emacs/template
Normal file → Executable file
15
srcpkgs/emacs/template
Normal file → Executable file
|
|
@ -1,12 +1,13 @@
|
|||
# Template file for 'emacs'
|
||||
pkgname=emacs
|
||||
version=26.3
|
||||
version=27.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-file-notification=inotify --with-modules
|
||||
$(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
|
||||
$(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
|
||||
$(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)"
|
||||
$(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)
|
||||
$(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)"
|
||||
hostmakedepends="pkg-config tar"
|
||||
makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
|
||||
dbus-devel acl-devel
|
||||
|
|
@ -14,24 +15,26 @@ makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
|
|||
$(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel)
|
||||
$(vopt_if svg librsvg-devel) $(vopt_if imagemagick libmagick-devel)
|
||||
$(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
|
||||
$(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)"
|
||||
$(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)
|
||||
$(vopt_if json jansson-devel) $(vopt_if harfbuzz harfbuzz-devel)
|
||||
$(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)"
|
||||
depends="emacs-common-${version}_${revision}"
|
||||
short_desc="GNU Emacs editor"
|
||||
maintainer="Leah Neukirchen <leah@vuxu.org>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="http://www.gnu.org/software/emacs/"
|
||||
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
|
||||
checksum=4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485
|
||||
checksum=4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41
|
||||
replaces="emacs>=0"
|
||||
nocross=yes
|
||||
nopie=yes
|
||||
|
||||
# Package build options
|
||||
build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus"
|
||||
build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp"
|
||||
desc_option_xpm="Enable support for XPM images"
|
||||
desc_option_sound="Enable support for sound"
|
||||
desc_option_m17n="Enable support for m17n multilingual text processing"
|
||||
build_options_default="jpeg tiff gif png xpm svg xml gnutls sound m17n"
|
||||
build_options_default="jpeg tiff gif png xpm svg xml gnutls sound m17n json gmp"
|
||||
|
||||
pre_configure() {
|
||||
# Just configuring in different directories results in
|
||||
|
|
|
|||
Loading…
Reference in a new issue