From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:45285) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIijg-0004wT-N6 for guix-patches@gnu.org; Sun, 29 Mar 2020 20:57:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jIije-0008MZ-DO for guix-patches@gnu.org; Sun, 29 Mar 2020 20:57:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jIije-0008MK-6g for guix-patches@gnu.org; Sun, 29 Mar 2020 20:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jIije-0001jm-5Y for guix-patches@gnu.org; Sun, 29 Mar 2020 20:57:02 -0400 Subject: [bug#40284] [PATCH v2] gnu: emacs-arduino-mode: Change to a maintained fork. Resent-Message-ID: From: Evan Straw References: <87k13220st.fsf@gmail.com> <87sghqaf1w.fsf@nicolasgoaziou.fr> Date: Sun, 29 Mar 2020 17:56:10 -0700 In-Reply-To: <87sghqaf1w.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Mon, 30 Mar 2020 01:59:07 +0200") Message-ID: <877dz21x05.fsf_-_@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Nicolas Goaziou Cc: Tobias Geerinckx-Rice , 40284@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Nicolas Goaziou writes: > Hello, > > Evan Straw 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-emacs-arduino-mode-Change-to-a-maintained-fork.patch Content-Transfer-Encoding: quoted-printable Content-Description: Patch From=209488d348f12631aa76b13f259434a996e3370aa9 Mon Sep 17 00:00:00 2001 From: Evan Straw 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. =2D-- 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 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17092,23 +17092,39 @@ other frame parameters.") (license license:gpl3+))) =20 (define-public emacs-arduino-mode =2D (let ((commit "3e2bad4569ad26e929e6db2cbcff0d6d36812698")) ;no release= yet + (let ((commit "23ae47c9f28f559e70b790b471f20310e163a39b") + (revision "1")) ;no release yet (package (name "emacs-arduino-mode") =2D (version (git-version "0" "0" commit)) + (version (git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference =2D (url "https://github.com/bookest/arduino-mode.git") + (url "https://github.com/stardiviner/arduino-mode.gi= t") (commit commit))) (sha256 (base32 =2D "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 obsole= te + ;; 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.") =2D (home-page "https://github.com/bookest/arduino-mode") + (home-page "https://github.com/stardiviner/arduino-mode") (license license:gpl3+)))) =20 (define-public emacs-annalist =2D-=20 2.20.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE6f/SZXb4DLdwy+VR9TDDtKKp8G0FAl6BQ6oACgkQ9TDDtKKp 8G1HbBAAmH7k+ENMMG/OzRxc3LPSdaf5De0A5RXkmopUbqmdJtda8tMDDLXx6OJL b6vuvTI85C3ceCNCLoCoD3oXx2Jx2y4YO+r7MFR0naOVOstKpiHJSphAR2H0rXgl dKa/i+SParS3crMcUpLPcOuKK0+ilcQ812Ne+5LGJiJmlFyKIYnzEqYfQ3dPYkS0 O3lzo5pq4ItsWW1YhsnASMhrONoZn2WYkbDgacFKP1oVHoD9iT8D5P2DkdJdc8BF qEs5Cqlwp9fv++pV4qCxMzpnwg3zGcK7WNtihS7cPDy4qGSRuY/Iu9MARvo9TZIJ 4QVXgH+W2ZF/Yqn1U2KPteOaYv60nqrqPBfyNjj4XyygZ7zTT/AV88L6C2BL0ZA2 z4NSd19vFX6VfNgaTMbocqAlCHHs972d0hlKlxJHsiq70V7/aEMbBqtsiVqThqj7 5Jz5+aoeb69SBuhWabsDR8Ef3tjBx0B5s0LHT3GL63iIjKPQ/GtOvHlseheds62N PluOfp8dy4BJZikvJZXXPYhuhh0LRSwELfG86tJ+kltmhqdyUSefyEQYOD+IfWgS 0r7g0gobIQLmoaGHL/G2dVbZ6YDbbkD8/ycAFvMuNEbGmeNloAaC7LGwEfH5GoqV jKOMPipbFcj72tgudI1DGXxQ/Buq7hYQgdnfTrW/Xs/j5MIC8QY= =L9L9 -----END PGP SIGNATURE----- --==-=-=--