GNU bug report logs - #32898
[PATCH] gnu: enlightenment: Fix keyboard switching

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 32898 in the body.
You can then email your comments to 32898 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Timo Eisenmann <eisenmann <at> fn.de>
To: guix-patches <at> gnu.org
Cc: Timo Eisenmann <eisenmann <at> fn.de>
Subject: [PATCH] gnu: enlightenment: Fix keyboard switching
Date: Mon,  1 Oct 2018 18:10:35 +0200

* gnu/packages/enlightenment.scm (enlightenment)[inputs]: Add 'setxkbmap'
[arguments]: Set absolute file name to 'setxkbmap'
---
 gnu/packages/enlightenment.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index c7812e887..c0335016f 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -269,6 +269,7 @@ Libraries with some extra bells and whistles.")
          (add-before 'configure 'set-system-actions
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((xkeyboard (assoc-ref inputs "xkeyboard-config"))
+                   (setxkbmap (assoc-ref inputs "setxkbmap"))
                    (utils     (assoc-ref inputs "util-linux"))
                    (libc      (assoc-ref inputs "libc")))
                ;; We need to patch the path to 'base.lst' to be able
@@ -278,6 +279,9 @@ Libraries with some extra bells and whistles.")
                  (("/usr/share/X11/xkb/rules/xorg.lst")
                   (string-append xkeyboard
                                  "/share/X11/xkb/rules/base.lst")))
+               (substitute* "src/bin/e_xkb.c"
+                 (("\"setxkbmap \"")
+                  (string-append "\"" setxkbmap "/bin/setxkbmap \"")))
                (substitute* (list "src/bin/e_intl.c"
                                   "src/modules/conf_intl/e_int_config_intl.c"
                                   "src/modules/wizard/page_010.c")
@@ -305,6 +309,7 @@ Libraries with some extra bells and whistles.")
        ("libxcb" ,libxcb)
        ("libxext" ,libxext)
        ("linux-pam" ,linux-pam)
+       ("setxkbmap" ,setxkbmap)
        ("xcb-util-keysyms" ,xcb-util-keysyms)
        ("xkeyboard-config" ,xkeyboard-config)))
     (home-page "https://www.enlightenment.org/about-enlightenment")
-- 
2.18.0

Message #10 received at 32898-done <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Timo Eisenmann <eisenmann <at> fn.de>
Cc: 32898-done <at> debbugs.gnu.org
Subject: Re: [bug#32898] [PATCH] gnu: enlightenment: Fix keyboard switching
Date: Tue, 02 Oct 2018 11:51:32 +0200

Hello,

Timo Eisenmann <eisenmann <at> fn.de> skribis:

> * gnu/packages/enlightenment.scm (enlightenment)[inputs]: Add 'setxkbmap'
> [arguments]: Set absolute file name to 'setxkbmap'

Applied, thanks!

Ludo'.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.