From: Ulrich Müller <ulm@gentoo.org>
Date: Sun, 10 May 2020 09:49:49 +0000 (+0200)
Subject: app-emacs/d-mode: Fix compilation with Emacs 27.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=94ae641f7f5f45a6a45d195105497cc72af46adf;p=gentoo.git

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>
---

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 c410ee103834..4a23ae677547 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 000000000000..78ed206c3a80
--- /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