From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dK6ax-0001sJ-T3 for guix-patches@gnu.org; Sun, 11 Jun 2017 13:24:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dK6aq-0005MM-JF for guix-patches@gnu.org; Sun, 11 Jun 2017 13:24:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:38684) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dK6aq-0005KW-Fc for guix-patches@gnu.org; Sun, 11 Jun 2017 13:24:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dK6ao-0004UM-15 for guix-patches@gnu.org; Sun, 11 Jun 2017 13:24:02 -0400 Subject: bug#27332: Enlightenment: Fix the inability to switch keyboard layout. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dK6Zd-0001pc-Gj for guix-patches@gnu.org; Sun, 11 Jun 2017 13:22:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dK6ZZ-000539-7E for guix-patches@gnu.org; Sun, 11 Jun 2017 13:22:49 -0400 Received: from aibo.runbox.com ([91.220.196.211]:35920) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dK6ZY-00052e-Ug for guix-patches@gnu.org; Sun, 11 Jun 2017 13:22:45 -0400 Received: from [10.9.9.212] (helo=mailfront12.runbox.com) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1dK6ZW-0007hT-5N for guix-patches@gnu.org; Sun, 11 Jun 2017 19:22:42 +0200 Received: from [109.236.90.209] (helo=localhost) by mailfront12.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1dK6Yr-0001te-8N for guix-patches@gnu.org; Sun, 11 Jun 2017 19:22:01 +0200 Date: Sun, 11 Jun 2017 17:21:58 +0000 From: ng0 Message-ID: <20170611172158.homs6y3qrlfm4f25@abyayala> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="tblu64yw6rn4fgsk" Content-Disposition: inline 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: 27332@debbugs.gnu.org --tblu64yw6rn4fgsk Content-Type: multipart/mixed; boundary="xnnp4svhknvclglm" Content-Disposition: inline --xnnp4svhknvclglm Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Patch appended. --=20 ng0 OpenPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 --xnnp4svhknvclglm Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-enlightenment-Fix-the-inability-to-switch-keyboa.patch" Content-Transfer-Encoding: quoted-printable =46rom 0391c83d94812173b3c13f38e40b9772358c75b3 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Sun, 11 Jun 2017 00:00:07 +0000 Subject: [PATCH] gnu: enlightenment: Fix the inability to switch keyboard layout. * gnu/packages/enlightenment.scm (enlightenment): Add new 'fix-keyboard' ph= ase. (inputs): Add 'xkeyboard-config'. --- gnu/packages/enlightenment.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 165ca50ce..648744633 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2015 Tom=C3=A1=C5=A1 =C4=8Cech ;;; Copyright =C2=A9 2015 Daniel Pimentel ;;; Copyright =C2=A9 2015, 2016, 2017 Efraim Flashner +;;; Copyright =C2=A9 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -208,7 +209,19 @@ Libraries with some extra bells and whistles.") "1xvngjdsa0p901vfhrh2qpa50k32hwwhc8bgi16a9b5d9byzfhvn")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--enable-mount-eeze"))) + `(#:configure-flags '("--enable-mount-eeze") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-keyboard + (lambda _ + (let ((xkeyboard (assoc-ref %build-inputs "xkeyboard-config")= )) + ;; We need to patch the path to 'base.lst' to be able + ;; to switch the keyboard layout in E. + (substitute* "src/modules/xkbswitch/e_mod_parse.c" + (("/usr/share/X11/xkb/rules/xorg.lst") + (string-append xkeyboard + "/share/X11/xkb/rules/base.lst"))) + #t)))))) (native-inputs `(("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) @@ -220,7 +233,8 @@ Libraries with some extra bells and whistles.") ("libxcb" ,libxcb) ("libxext" ,libxext) ("linux-pam" ,linux-pam) - ("xcb-util-keysyms" ,xcb-util-keysyms))) + ("xcb-util-keysyms" ,xcb-util-keysyms) + ("xkeyboard-config" ,xkeyboard-config))) (home-page "https://www.enlightenment.org/about-enlightenment") (synopsis "Lightweight desktop environment") (description --=20 2.13.1 --xnnp4svhknvclglm-- --tblu64yw6rn4fgsk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlk9fDYACgkQ4i+bv+40 hYiVmw//Wj0RLg0B0RZekf6y+kfg+pENZsm5s01YuqBxLigFcjHQl4tCHFTIACT+ Bw1djNFHH+4HTW7THdlZe9AkFRjhCaU2VUk9OdcU4/VoB66rIO0SbrJwrFRVVagT iEIBXJk6xNPJkT8w7m3xJCNuOdj2/uMXj1zUL4Rz3H1PfSHIRby/+eiGK/ixubZe IR9SCgIHfSsE6oQKHIYrZyvF9tWGFPD4DAj8utiowQDSd9rJPtlYNPlA+zBuCrsA ezuRc6KrLo8BQ1IsdgK/36MR+IRF46NGiSRDTtN0zpqwPD8lqxNkEwgxYaGourtt dj2z7M/+e9DXgiQmav1uMtr3NRvYRsc78NkMETFnO0ywGolvDShquvA9+mxKqO1X ksnE8PMIi9c6V6dj7BfxGICAx1jkqk3AbQrzA3yokHiSD+wP0Qmzm8bnUKzGrJ5/ jQ+aj6/3Ieq7i3vgYzHzxQED6eqfVmLLpUiPaaNzBxuTngBwWpzkG7V3rpqjFZZE nog2pB+uydw8r1uE0IcKqI+Kkzze8Hdx6JyjLDIzBqaqUDGWb/QOL7RYt7B5Up5h 3yhNE36SgjSvm5Y262R1bPHy7KgfC9dc3GD72A5LuFuEilYVI0MIiQWnggyljCUf gU/fVp74zgxFXAopKn0B6n4HsZxLs28g40j8I/LWODuPQWYcozs= =YP/4 -----END PGP SIGNATURE----- --tblu64yw6rn4fgsk--