[bug#40284] [PATCH v2] gnu: emacs-arduino-mode: Change to a maintained fork.

[Evan Straw]

Nicolas Goaziou <address@hidden> writes:

> Hello,
>
> Evan Straw <address@hidden> writes:
>
>> Subject: [PATCH] gnu: emacs-arduino-mode: Change to a maintained fork.
>>
>> * gnu/packages/emacs-xyz.scm (emacs-arduino-mode): Change to a maintained
>>   fork.
>
> Thank you.
>
>> -  (let ((commit "3e2bad4569ad26e929e6db2cbcff0d6d36812698")) ;no release yet
>> +  (let ((commit "23ae47c9f28f559e70b790b471f20310e163a39b")) ;no release yet
>>      (package
>>        (name "emacs-arduino-mode")
>>        (version (git-version "0" "0" commit))
>
> We want to increment version, too, so the above should be:
>
>   (git-version "0" "1" commit)
>
> For clarity, you may want to bind `revision' to "1" right after `commit'
> and use that in the `git-version' call.
>
>> +           (add-after 'unpack 'fix-obsolete
>> +             (lambda _
>> +               (substitute* "ede-arduino.el"
>> +                 (("defmethod") "cl-defmethod")
>> +                 (("defgeneric") "cl-defgeneric")))))))
>
> The phase must end with a #f
>
> Could you send an updated patch?
>
> Regards,

Thanks for the feedback. Attached to this email should be an updated
patch. Please let me know if there's anything else I should change.

Thanks,
-- Evan <address@hidden>

From 9488d348f12631aa76b13f259434a996e3370aa9 Mon Sep 17 00:00:00 2001
From: Evan Straw <address@hidden>
Date: Sun, 29 Mar 2020 16:27:34 -0700
Subject: [PATCH] gnu: emacs-arduino-mode: Change to a maintained fork.

* gnu/packages/emacs-xyz.scm (emacs-arduino-mode): Change to a maintained
  fork.
---
 gnu/packages/emacs-xyz.scm | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 782d8650dd..4fe61fafaf 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17092,23 +17092,39 @@ other frame parameters.")
     (license license:gpl3+)))
 
 (define-public emacs-arduino-mode
-  (let ((commit "3e2bad4569ad26e929e6db2cbcff0d6d36812698")) ;no release yet
+  (let ((commit "23ae47c9f28f559e70b790b471f20310e163a39b")
+        (revision "1")) ;no release yet
     (package
       (name "emacs-arduino-mode")
-      (version (git-version "0" "0" commit))
+      (version (git-version "0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/bookest/arduino-mode.git";)
+                      (url "https://github.com/stardiviner/arduino-mode.git";)
                       (commit commit)))
                 (sha256
                  (base32
-                  "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c"))
+                  "08vnbz9gpah1l93fzfd87aawrhcnh2v1kyfxgsn88pdwg8awz8rx"))
                 (file-name (git-file-name name version))))
       (build-system emacs-build-system)
+      (inputs
+       `(("spinner" ,emacs-spinner)
+         ("flycheck" ,emacs-flycheck)))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           ;; Emacs complains that "defmethod" and "defgeneric" are obsolete
+           ;; macros when compiling. Substitute them with the recommended
+           ;; macros "cl-defmethod" and "cl-defgeneric", respectively.
+           (add-after 'unpack 'fix-obsolete
+             (lambda _
+               (substitute* "ede-arduino.el"
+                 (("defmethod") "cl-defmethod")
+                 (("defgeneric") "cl-defgeneric"))
+               #t)))))
       (synopsis "Emacs major mode for editing Arduino sketches")
       (description "Emacs major mode for editing Arduino sketches.")
-      (home-page "https://github.com/bookest/arduino-mode";)
+      (home-page "https://github.com/stardiviner/arduino-mode";)
       (license license:gpl3+))))
 
 (define-public emacs-annalist
-- 
2.20.1

signature.asc
Description: PGP signature