[PR PATCH] emacs: update to 27.0.91

[PR PATCH] emacs: update to 27.0.91

[absrd]

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

There is a new pull request by absrd against master on the void-packages repository

https://github.com/absrd/void-packages emacs
https://github.com/void-linux/void-packages/pull/21263

emacs: update to 27.0.91


A patch file from https://github.com/void-linux/void-packages/pull/21263.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-emacs-21263.patch --]
[-- Type: text/x-diff, Size: 8873 bytes --]

From 8d2f86b597de5b02b5fae7e7ffdaefa24f04961a Mon Sep 17 00:00:00 2001
From: Felix Kleinschmidt <fk@bsrd.io>
Date: Thu, 23 Apr 2020 13:14:32 +0200
Subject: [PATCH] emacs: update to 27.0.91

---
 ...auto-revert-mode-breaks-git-rebase-B.patch | 55 -------------------
 ...sure-bug-21559-applies-to-git-status.patch | 40 --------------
 srcpkgs/emacs/template                        | 28 ++++++----
 3 files changed, 16 insertions(+), 107 deletions(-)
 delete mode 100644 srcpkgs/emacs/patches/0001-Fix-for-25.0.50-auto-revert-mode-breaks-git-rebase-B.patch
 delete mode 100644 srcpkgs/emacs/patches/0002-vc-git.el-make-sure-bug-21559-applies-to-git-status.patch

diff --git a/srcpkgs/emacs/patches/0001-Fix-for-25.0.50-auto-revert-mode-breaks-git-rebase-B.patch b/srcpkgs/emacs/patches/0001-Fix-for-25.0.50-auto-revert-mode-breaks-git-rebase-B.patch
deleted file mode 100644
index c707eae0066..00000000000
--- a/srcpkgs/emacs/patches/0001-Fix-for-25.0.50-auto-revert-mode-breaks-git-rebase-B.patch
+++ /dev/null
@@ -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
-
diff --git a/srcpkgs/emacs/patches/0002-vc-git.el-make-sure-bug-21559-applies-to-git-status.patch b/srcpkgs/emacs/patches/0002-vc-git.el-make-sure-bug-21559-applies-to-git-status.patch
deleted file mode 100644
index 89e20d12cd3..00000000000
--- a/srcpkgs/emacs/patches/0002-vc-git.el-make-sure-bug-21559-applies-to-git-status.patch
+++ /dev/null
@@ -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
-
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 93807166e66..40484656c3a 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,13 +1,13 @@
 # Template file for 'emacs'
 pkgname=emacs
-version=26.3
+version=27.0.91
 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)"
-hostmakedepends="pkg-config tar"
+ $(vopt_with cairo) $(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)"
+hostmakedepends="autoconf pkg-config tar texinfo git"
 makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
  dbus-devel acl-devel
  $(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel)
@@ -20,18 +20,18 @@ 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
+distfiles="http://git.savannah.gnu.org/cgit/emacs.git/snapshot/${pkgname}-${version}.tar.gz"
+checksum=ac7b71927dfdfa3b9c034da82e827ee28e7467d58953dafed69e9ce9d700cebd
 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="cairo jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus"
 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="cairo jpeg tiff gif png xpm svg xml gnutls sound m17n"
 
 pre_configure() {
 	# Just configuring in different directories results in
@@ -45,17 +45,21 @@ pre_configure() {
 
 do_configure() {
 	cd $wrksrc/nox
+	./autogen.sh
 	./configure --without-x $(vopt_with dbus) ${configure_args}
 
 	cd $wrksrc/x11
+	./autogen.sh
 	./configure --with-x-toolkit=athena --without-toolkit-scroll-bars \
 		$(vopt_with dbus) --without-gconf --without-gsettings \
 		${configure_args}
 
 	cd $wrksrc/gtk2
+	./autogen.sh
 	./configure --with-x-toolkit=gtk2 ${configure_args}
 
 	cd $wrksrc/gtk3
+	./autogen.sh
 	./configure --with-x-toolkit=gtk3 --with-xwidgets ${configure_args}
 }
 
@@ -88,7 +92,7 @@ emacs-common_package() {
 }
 
 emacs-x11_package() {
-	depends="emacs-common-${version}_${revision}"
+	depends="emacs-common-${version}_${revision} $(vopt_if cairo cairo)"
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - X11 version"
@@ -101,7 +105,7 @@ emacs-x11_package() {
 }
 
 emacs-gtk2_package() {
-	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
+	depends="emacs-common-${version}_${revision} $(vopt_if cairo cairo) desktop-file-utils hicolor-icon-theme"
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - GTK+2 version"
@@ -114,7 +118,7 @@ emacs-gtk2_package() {
 }
 
 emacs-gtk3_package() {
-	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
+	depends="emacs-common-${version}_${revision} $(vopt_if cairo cairo) desktop-file-utils hicolor-icon-theme"
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - GTK+3 version"

Re: emacs: update to 27.0.91

[flexibeast]

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

New comment by flexibeast on void-packages repository

https://github.com/void-linux/void-packages/pull/21263#issuecomment-618366087

Comment:
Unfortunately, since this is a pre-release version, rather than [an official release](https://ftp.gnu.org/gnu/emacs/), this cannot be included in the Void repos, as per [CONTRIBUTING](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md).

Re: emacs: update to 27.0.91

[flexibeast]

[-- Attachment #1: Type: text/plain, Size: 464 bytes --]

New comment by flexibeast on void-packages repository

https://github.com/void-linux/void-packages/pull/21263#issuecomment-618366087

Comment:
Unfortunately, since this is a pre-release version, rather than [an official release](https://ftp.gnu.org/gnu/emacs/), this cannot be included in the Void repos, as per [CONTRIBUTING](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md).

(The first official release in the 27 series will be 27.1.)

Re: [PR PATCH] [Closed]: emacs: update to 27.0.91

[absrd]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

There's a closed pull request on the void-packages repository

emacs: update to 27.0.91
https://github.com/void-linux/void-packages/pull/21263

Description: