(address . guix-patches@gnu.org)(name . Matthew James Kraai)(address . kraai@ftbfs.org)
20220529033643.14249-1-kraai@ftbfs.org
* gnu/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch:
New file.
* gnu/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode:
New file.
* gnu/packages/emacs-xyz.scm (emacs-elm-mode)[patches]: Use them here.
* gnu/local.mk (dist_patch_DATA): Add them here.
---
gnu/local.mk | 2 ++
gnu/packages/emacs-xyz.scm | 6 +++-
...when-arg-for-obsolete-function-alias.patch | 25 +++++++++++++++
...rn-off-functions-for-elm-indent-mode.patch | 31 +++++++++++++++++++
4 files changed, 63 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch
create mode 100644 gnu/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch
This is an alternative to #55675, backporting just the patches that are
necessary to fix the build.
Toggle diff (100 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index bc82c5ba9f..eb087c5c46 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1024,6 +1024,8 @@ dist_patch_DATA = \
%D%/packages/patches/elm-reactor-static-files.patch \
%D%/packages/patches/elogind-revert-polkit-detection.patch \
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
+ %D%/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch \
+ %D%/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch \
%D%/packages/patches/emacs-exec-path.patch \
%D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch \
%D%/packages/patches/emacs-git-email-missing-parens.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 31822dc641..9b71b4cd61 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19710,7 +19710,11 @@ (define-public emacs-elm-mode
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0iwk4fmw8hq3ry4ky1zc7lgl4cpbnrjyk74c2xzddfspi3ks41fd"))))
+ (base32 "0iwk4fmw8hq3ry4ky1zc7lgl4cpbnrjyk74c2xzddfspi3ks41fd"))
+ (patches
+ (search-patches
+ "emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch"
+ "emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch"))))
(propagated-inputs
(list emacs-dash emacs-f emacs-reformatter emacs-s))
(build-system emacs-build-system)
diff --git a/gnu/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch b/gnu/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch
new file mode 100644
index 0000000000..0734dc7b48
--- /dev/null
+++ b/gnu/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch
@@ -0,0 +1,25 @@
+From 714a3cebb3fe7e82a294d046d7fa7978e9ca8945 Mon Sep 17 00:00:00 2001
+From: Steve Purcell <steve@sanityinc.com>
+Date: Wed, 6 Jan 2021 15:28:10 +1300
+Subject: [PATCH] Add now-mandatory "when" arg for obsolete function alias
+
+---
+ elm-indent.el | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/elm-indent.el b/elm-indent.el
+index 1527434..17fab78 100644
+--- a/elm-indent.el
++++ b/elm-indent.el
+@@ -1200,7 +1200,7 @@ TYPE is either 'guard or 'rhs."
+ (define-key map [?\C-c ?\C-=] 'elm-indent-insert-equal)
+ map))
+
+-(define-obsolete-variable-alias 'elm-indent-map 'elm-indent-mode-map)
++(define-obsolete-variable-alias 'elm-indent-map 'elm-indent-mode-map "2017-10-29")
+
+ ;;;###autoload
+ (define-minor-mode elm-indent-mode
+--
+2.36.1
+
diff --git a/gnu/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch b/gnu/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch
new file mode 100644
index 0000000000..f1a4f49152
--- /dev/null
+++ b/gnu/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch
@@ -0,0 +1,31 @@
+From 688d20b7cd0220af334d618608d8dfb0df250c69 Mon Sep 17 00:00:00 2001
+From: Steve Purcell <steve@sanityinc.com>
+Date: Sun, 5 Apr 2020 15:22:40 +1200
+Subject: [PATCH] Remove obsolete turn-on- and turn-off- functions for
+ elm-indent-mode
+
+---
+ elm-indent.el | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/elm-indent.el b/elm-indent.el
+index a1a2a1c..8ffcd9f 100644
+--- a/elm-indent.el
++++ b/elm-indent.el
+@@ -1233,13 +1233,6 @@ Invokes `elm-indent-hook' if not nil."
+ (kill-local-variable 'indent-line-function)
+ (kill-local-variable 'indent-region-function)))
+
+-;;;###autoload
+-(define-obsolete-function-alias 'turn-on-elm-indent 'elm-indent-mode)
+-
+-(defun turn-off-elm-indent ()
+- "Turn off ``intelligent'' Elm indentation mode."
+- (elm-indent-mode nil))
+-
+
+ (provide 'elm-indent)
+ ;;; elm-indent.el ends here
+--
+2.36.1
+
--
2.36.1