summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2020-05-10 11:49:49 +0200
committerUlrich Müller <ulm@gentoo.org>2020-05-10 12:23:59 +0200
commit94ae641f7f5f45a6a45d195105497cc72af46adf (patch)
treeb39a406888fc823f240e5a2f2b81b8859a148aa2 /app-emacs
parentsys-kernel/vanilla-sources: Automated version bump to {4.4.223,4.9.223,4.14.1... (diff)
downloadgentoo-94ae641f7f5f45a6a45d195105497cc72af46adf.tar.gz
gentoo-94ae641f7f5f45a6a45d195105497cc72af46adf.tar.bz2
gentoo-94ae641f7f5f45a6a45d195105497cc72af46adf.zip
app-emacs/d-mode: Fix compilation with Emacs 27.
Closes: https://bugs.gentoo.org/722012 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/d-mode/d-mode-2.0.10.ebuild3
-rw-r--r--app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch25
2 files changed, 27 insertions, 1 deletions
diff --git a/app-emacs/d-mode/d-mode-2.0.10.ebuild b/app-emacs/d-mode/d-mode-2.0.10.ebuild
index c410ee10383..4a23ae67754 100644
--- a/app-emacs/d-mode/d-mode-2.0.10.ebuild
+++ b/app-emacs/d-mode/d-mode-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,4 +16,5 @@ KEYWORDS="~amd64 ~x86"
RESTRICT="test"
S="${WORKDIR}/Emacs-D-Mode-${PV}"
+PATCHES=("${FILESDIR}"/${P}-rx-form.patch)
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch b/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch
new file mode 100644
index 00000000000..78ed206c3a8
--- /dev/null
+++ b/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/722012
+
+From cfd1d0869d51b7548b3fb738b2f2593c76533d44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Per=20Nordl=C3=B6w?= <nordlow@users.noreply.github.com>
+Date: Wed, 9 Oct 2019 11:03:00 +0200
+Subject: [PATCH] Use rx-to-string instead of rx-form to support Emacs master
+ (#97)
+
+---
+ d-mode.el | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/d-mode.el b/d-mode.el
+index f8211cd..df72b8d 100644
+--- a/d-mode.el
++++ b/d-mode.el
+@@ -210,7 +210,7 @@ The expression is added to `compilation-error-regexp-alist' and
+ (add-to-list
+ 'compilation-error-regexp-alist-alist
+ `(,symbol
+- ,(rx-form
++ ,(rx-to-string
+ `(and
+ line-start
+ (group-n 1 (one-or-more any)) ; File name