[PATCH] gnu: emacs-ergoemacs-mode: Include keyboard layout SVGs.

  • Done
  • quality assurance status badge
Details
2 participants
  • Ivan Vilata i Balaguer
  • Nicolas Goaziou
Owner
unassigned
Submitted by
Ivan Vilata i Balaguer
Severity
normal
I
I
Ivan Vilata i Balaguer wrote on 24 Jan 19:16 +0100
(address . guix-patches@gnu.org)
Y9AgYHwF0jflV3rZ@sax
A couple of SVG files from the source need to be installed to make
‘ergoemacs-theme-describe’ and ‘ergoemacs-layout-describe’ work.

* gnu/packages/emacs-xyz.scm (emacs-ergoemacs-mode)[arguments]: New field.
---
gnu/packages/emacs-xyz.scm | 8 ++++++++
1 file changed, 8 insertions(+)

Toggle diff (32 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 41a0ccf09e..ec8dffc3e5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -120,6 +120,7 @@
;;; Copyright © 2022 Thiago Jung Bauermann <bauermann@kolabnow.com>
;;; Copyright © 2022 Joeke de Graaf <joeke@posteo.net>
;;; Copyright © 2023 Simon Streit <simon@netpanic.org>
+;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19952,6 +19953,13 @@ (define-public emacs-ergoemacs-mode
(base32
"1ipwzl0l26g5qvc1sgmz2ra5vn1j3hl0mnkgzpa3j4p8gsmxdiqr"))))
(build-system emacs-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'install-kbd-svgs
+ (lambda _
+ (let ((dir (elpa-directory #$output)))
+ (install-file "kbd.svg" dir)
+ (install-file "kbd-ergo.svg" dir)))))))
(propagated-inputs
(list emacs-undo-tree))
(home-page "https://ergoemacs.github.io/")
--
2.38.1


--
Ivan Vilata i Balaguer -- https://elvil.net/
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEHpvwBPZcchIQr6TuPezBBfXdI4IFAmPQIFoACgkQPezBBfXd
I4JBqBAAg5epa9K1+droDyuhuL+pVhgFp+UzppeDZ1urEBTVqWydT4SszFtzmMxu
VMTGIfpEj29YUn3XPT3GlSHn0LjcijoLaVgA9c6JkkhCdP3mkhwr4RCc//RMjIV3
rYMN9Gx+/I8Hdsr+YMU0zXbKmJu/uWZ+mSSEauYWNy1l2adT8bF0HAoM48FxrC9d
7kssUqy8TUU/FF15zJJfO6rnB8lWQc9rxnMeVuxsdvBvCV28DA3pbR2xEPoYhuIS
9qcxOYs0S3mDYKrxhD6PYBJnqH1BxoPvNWBb+4jCcHoilWQlWE1nquIFP4wEHaru
Ta7U2dwtjbtkRocdXteZANS4oeGR33GZZcJhJsIucmR6HPd08elcYuNTenpLCqrs
pwtCyqmf8F4C/GgPM5p2vgvfA8e6DariqIILfYPq4tm37MWCPX9hJbA7GY+02kzD
Obe6n7oFZtal8EI9mOxdbcPtsBEAaB4elef9n3y4/IF2ElO/aDZzeD2vy3UkrZwx
dqCbS0IbI8ej+Y8dqB+gVufKiosatP1ZEDvhcptWFLnNox/exCG6EZVf2H3yud86
23rHReKA6BP5lAivlDLwYpmlmGhqTjAtz59gQQoQ8CU6BC3hR6ulIgELXjDYsh4G
G5NpozCJZLDl2rmj9sgdyxvqbRXsTsq+KAx1oasJ4jxfCL3eNu0=
=4Pnh
-----END PGP SIGNATURE-----


N
N
Nicolas Goaziou wrote on 24 Jan 19:59 +0100
(name . Ivan Vilata i Balaguer)(address . ivan@selidor.net)(address . 61040@debbugs.gnu.org)
87mt67oj1z.fsf@nicolasgoaziou.fr
Hello,

Ivan Vilata i Balaguer <ivan@selidor.net> writes:

Toggle quote (6 lines)
> A couple of SVG files from the source need to be installed to make
> ‘ergoemacs-theme-describe’ and ‘ergoemacs-layout-describe’ work.
>
> * gnu/packages/emacs-xyz.scm (emacs-ergoemacs-mode)[arguments]: New
> field.

Thank you.

Toggle quote (8 lines)
> + (arguments
> + (list #:phases #~(modify-phases %standard-phases
> + (add-after 'install 'install-kbd-svgs
> + (lambda _
> + (let ((dir (elpa-directory #$output)))
> + (install-file "kbd.svg" dir)
> + (install-file "kbd-ergo.svg" dir)))))))

Please use #:include keyword for these files instead of this
hand-crafted phase.

Regards,
--
Nicolas Goaziou
I
I
Ivan Vilata i Balaguer wrote on 25 Jan 10:33 +0100
(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)
Y9D3eu7X5Hqn7DQt@sax
Nicolas Goaziou (2023-01-24 19:59:20 +0100) wrote:

Toggle quote (13 lines)
> Ivan Vilata i Balaguer <ivan@selidor.net> writes:
>
> > + (arguments
> > + (list #:phases #~(modify-phases %standard-phases
> > + (add-after 'install 'install-kbd-svgs
> > + (lambda _
> > + (let ((dir (elpa-directory #$output)))
> > + (install-file "kbd.svg" dir)
> > + (install-file "kbd-ergo.svg" dir)))))))
>
> Please use #:include keyword for these files instead of this
> hand-crafted phase.

Thanks Nicolas, I didn't know about the keyword. Attaching the updated patch.
Much simpler! 🙂

Salut !

--
Ivan Vilata i Balaguer -- https://elvil.net/
From 7c21f589e4871ffedcc0d6d2aef4e64bfa08ce58 Mon Sep 17 00:00:00 2001
From: Ivan Vilata-i-Balaguer <ivan@selidor.net>
Date: Wed, 25 Jan 2023 10:29:56 +0100
Subject: [PATCH] gnu: emacs-ergoemacs-mode: Include keyboard layout SVGs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A couple of SVG files from the source need to be installed to make
‘ergoemacs-theme-describe’ and ‘ergoemacs-layout-describe’ work.

* gnu/packages/emacs-xyz.scm (emacs-ergoemacs-mode)[arguments]: New field.
---
gnu/packages/emacs-xyz.scm | 4 ++++
1 file changed, 4 insertions(+)

Toggle diff (24 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ee115192f9..77ab0bc448 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -120,6 +120,7 @@
;;; Copyright © 2022 Thiago Jung Bauermann <bauermann@kolabnow.com>
;;; Copyright © 2022 Joeke de Graaf <joeke@posteo.net>
;;; Copyright © 2023 Simon Streit <simon@netpanic.org>
+;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19974,6 +19975,9 @@ (define-public emacs-ergoemacs-mode
(base32
"1ipwzl0l26g5qvc1sgmz2ra5vn1j3hl0mnkgzpa3j4p8gsmxdiqr"))))
(build-system emacs-build-system)
+ (arguments
+ (list #:include #~(cons* "^kbd\\.svg$" "^kbd-ergo\\.svg$"
+ %default-include)))
(propagated-inputs
(list emacs-undo-tree))
(home-page "https://ergoemacs.github.io/")
--
2.38.1
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEHpvwBPZcchIQr6TuPezBBfXdI4IFAmPQ924ACgkQPezBBfXd
I4LJKhAAlRTtJB0Ymo6O+atol/XnuTiSjW7lF3MYPqO72qs4qVLvkO/ckE51NzNL
DKzgQ89rS1teQy9m/znGUSy6Y01gUH0T158gTRn7jyI21OFTDMJGlR53MwoDXUE3
IwUH6eIZhP4M82xwtBdaVEQ0esYEXD5688scWaYW/SNM95RrhOHp+iFOr7ClKc7L
qj9USUr4TSTINzkh61Uj/Uesdrdm4QlZB2oMHIUQy38ZXnN+AD/OB9YlYANizUm2
EogTtREhW8ZYmY/8IKETgwvZwCwsW6nd4I+d2NTaVvfTVDRzwYFNVJfBAwvD3Avn
x+tsYChiNOXCtsElFkxw3JLTVvHvnegEqFE52JM1Qa2thJ6jZeiJXaKZSpfCS2sb
ostTjPE2qYCJKrI69XfkxS6qzTXl7ZS7EgiejbRwvI79dWJOJhSD97qvXjEqaEk8
DTb6l/6x/8YmHh23N0A8f+xEHbnzjy4OE/FJ3tT4QtJl0W09YkC014tp3MDTaQpb
LtbRO8/az2sjMJGgRNwQapwDLrVtbe3Nvr+t/fMMOJ/44/O0TdLPIT/cn9nWx54N
sR7P5VlckjKDdHhPwUoY375HRs1saZ0cFZadHaZp8rIAYj0+kgBDzjHeRazBly5X
xx2s5a6vH06Cn4yuU7i0fojl12cSB3nQJxo8/yiaMKKwbaDLYAg=
=A85M
-----END PGP SIGNATURE-----


N
N
Nicolas Goaziou wrote on 27 Jan 09:34 +0100
(name . Ivan Vilata i Balaguer)(address . ivan@selidor.net)(address . 61040-done@debbugs.gnu.org)
871qngml3v.fsf@nicolasgoaziou.fr
Hello,

Ivan Vilata i Balaguer <ivan@selidor.net> writes:

Toggle quote (3 lines)
> Thanks Nicolas, I didn't know about the keyword. Attaching the updated patch.
> Much simpler! 🙂

Applied. Thank you.

Regards,
--
Nicolas Goaziou
Closed
?