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

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

[Ivan Vilata i Balaguer]

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

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(+)

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/

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

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

[Nicolas Goaziou]

Hello,

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

> 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.

> +    (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

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

[Ivan Vilata i Balaguer]

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

Nicolas Goaziou (2023-01-24 19:59:20 +0100) wrote:

> 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/

[-- Attachment #1.2: 0001-gnu-emacs-ergoemacs-mode-Include-keyboard-layout-SVG.patch --]
[-- Type: text/plain, Size: 1570 bytes --]

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(+)

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


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

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

[Nicolas Goaziou]

Hello,

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

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

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou