Subject: bug#43230: closed (Re: [bug#43230] [PATCH] gnu: lxqt-panel: Patching the kbindicator to xkeyboard-config path for reading the keyboard layouts.)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 06 Sep 2020 06:35:02 +0000

Your bug report

#43230: [PATCH] gnu: lxqt-panel: Patching the kbindicator to xkeyboard-config path for reading the keyboard layouts.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
43230: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=43230
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#43230] [PATCH] gnu: lxqt-panel: Patching the kbindicator to xkeyboard-config path for reading the keyboard layouts.
From: Efraim Flashner <[email-masked]>
To: Hamzeh Nasajpour <[email-masked]>
Cc: [email-masked]
Date: Sun, 6 Sep 2020 09:34:03 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

I rewrote the commit message and pushed it.

Thanks!

-- 
Efraim Flashner   <[email-masked]>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Subject: [PATCH] gnu: lxqt-panel: Patching the kbindicator to xkeyboard-config path for reading the keyboard layouts.
From: "Hamzeh Nasajpour" <[email-masked]>
To: [email-masked]
Date: Sun, 06 Sep 2020 00:30:02 +0430
List-Id: <debbugs-submit.debbugs.gnu.org>

diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 21587609ce..8d54bb0bd7 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -591,7 +591,8 @@ of other programs.")
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)
-       ("xcb-util" ,xcb-util)))
+       ("xcb-util" ,xcb-util)
+       ("xkeyboard-config" ,xkeyboard-config)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("lxqt-build-tools" ,lxqt-build-tools)
@@ -619,7 +620,15 @@ of other programs.")
                (("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
                 (string-append (assoc-ref outputs "out")
                                "/share/lxqt/translations")))
-             #t)))))
+             #t))
+         (add-after 'unpack 'set-xkeyboard-config-file-path
+                (lambda* (#:key inputs #:allow-other-keys)
+                  ;; Set the path to xkeyboard-config.
+                  (let ((xkb (assoc-ref inputs "xkeyboard-config")))
+                    (substitute* "plugin-kbindicator/src/x11/kbdlayout.cpp"
+                      (("/usr/share/X11/xkb/rules/evdev.xml")
+                       (string-append xkb "/share/X11/xkb/rules/evdev.xml")))
+                  #t))))))
     (home-page "https://lxqt.github.io")
     (synopsis "The LXQt desktop panel")
     (description "lxqt-panel represents the taskbar of LXQt.")