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

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

[Evan Straw]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1: [PATCH] gnu: emacs-arduino-mode: Change to a maintained fork. --]
[-- Type: text/x-patch, Size: 2341 bytes --]

From 603fe12010817b41a4d1e93fab6b8356cbf2f50f Mon Sep 17 00:00:00 2001
From: Evan Straw <evan.straw99@gmail.com>
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 | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 782d8650dd..d23905075f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17092,23 +17092,34 @@ other frame parameters.")
     (license license:gpl3+)))
 
 (define-public emacs-arduino-mode
-  (let ((commit "3e2bad4569ad26e929e6db2cbcff0d6d36812698")) ;no release yet
+  (let ((commit "23ae47c9f28f559e70b790b471f20310e163a39b")) ;no release yet
     (package
       (name "emacs-arduino-mode")
       (version (git-version "0" "0" 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
+           (add-after 'unpack 'fix-obsolete
+             (lambda _
+               (substitute* "ede-arduino.el"
+                 (("defmethod") "cl-defmethod")
+                 (("defgeneric") "cl-defgeneric")))))))
       (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


[-- Attachment #1.2: Type: text/plain, Size: 731 bytes --]


Hello!

The Emacs Arduino mode that is currently packaged in Guix is an old,
unmaintained version, and there is a newer fork of the project by the
same name that has much more functionality. The patch attached to this
email replaces the package emacs-arduino-mode with this newer version,
which basically just amounts to changing the Git repository, hash, and
commit. There's also a substitution done that stops Emacs from
complaining about obsolete macros.

I have no idea if this is the correct way of going about this, or if I
should instead make another package with a different name to refer to
the new fork of arduino-mode. Please let me know if I should change or
revise anything.

Thanks,
-- Evan <evan.straw99@gmail.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Nicolas Goaziou]

Hello,

Evan Straw <evan.straw99@gmail.com> 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,

-- 
Nicolas Goaziou

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

[Tobias Geerinckx-Rice via Guix-patches via]

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

Nicolas Goaziou 写道：
> The phase must end with a #f

Typo of course, but: #t!  :-)

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Nicolas Goaziou]

Hello,

Tobias Geerinckx-Rice via Guix-patches via <guix-patches@gnu.org>
writes:

> Nicolas Goaziou 写道：
>> The phase must end with a #f
>
> Typo of course, but: #t!  :-)

Duh! Here's what happens when I answer mails at 3 am.

Thanks,

Regards,

-- 
Nicolas Goaziou

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

[Evan Straw]

[-- Attachment #1.1: Type: text/plain, Size: 1276 bytes --]

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

> Hello,
>
> Evan Straw <evan.straw99@gmail.com> 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 <evan.straw99@gmail.com>


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Patch --]
[-- Type: text/x-patch, Size: 2673 bytes --]

From 9488d348f12631aa76b13f259434a996e3370aa9 Mon Sep 17 00:00:00 2001
From: Evan Straw <evan.straw99@gmail.com>
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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Nicolas Goaziou]

Hello,

Evan Straw <evan.straw99@gmail.com> 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.

Applied as 6957e4c13d0c01b50b616832360ee510dac58e66.

I expounded a bit the commit message.

Thank you!

Regards,

-- 
Nicolas Goaziou