From patchwork Wed Feb 5 10:07:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fakhri Sajadi X-Patchwork-Id: 20135 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CE115168E2; Wed, 5 Feb 2020 14:51:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 67DCF168DF for ; Wed, 5 Feb 2020 14:51:24 +0000 (GMT) Received: from localhost ([::1]:48602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izM1T-0008Tl-VR for patchwork@mira.cbaines.net; Wed, 05 Feb 2020 09:51:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34479) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izLwJ-000324-Ns for guix-patches@gnu.org; Wed, 05 Feb 2020 09:46:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izLwI-0003Z3-Mb for guix-patches@gnu.org; Wed, 05 Feb 2020 09:46:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39314) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1izLwI-0003Xq-D5 for guix-patches@gnu.org; Wed, 05 Feb 2020 09:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1izLwI-00044O-CF for guix-patches@gnu.org; Wed, 05 Feb 2020 09:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39435] [PATCH] gnu: lxqt-config: fixing keyboard layout. Resent-From: "Fakhri Sajadi" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Feb 2020 14:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39435 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39435@debbugs.gnu.org Cc: f.sajadi@pantherx.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158091392713916 (code B ref -1); Wed, 05 Feb 2020 14:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Feb 2020 14:45:27 +0000 Received: from localhost ([127.0.0.1]:45287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izLvj-0003c3-92 for submit@debbugs.gnu.org; Wed, 05 Feb 2020 09:45:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:51768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izHb4-0007UH-Iw for submit@debbugs.gnu.org; Wed, 05 Feb 2020 05:07:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46183) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izHb3-0005g6-Gh for guix-patches@gnu.org; Wed, 05 Feb 2020 05:07:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izHb2-0005Dv-3r for guix-patches@gnu.org; Wed, 05 Feb 2020 05:07:49 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:55861) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1izHb1-0004tc-FM for guix-patches@gnu.org; Wed, 05 Feb 2020 05:07:48 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 031F05F2; Wed, 5 Feb 2020 05:07:44 -0500 (EST) Received: from imap5 ([10.202.2.55]) by compute6.internal (MEProxy); Wed, 05 Feb 2020 05:07:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pantherx.org; h= mime-version:message-id:date:from:to:cc:subject:content-type; s= fm1; bh=QEF673OSOjW42F+GBqE6j+PlKGymw+tESo3+ZEDGjaQ=; b=IibPyLe5 Qmqt6iPHaRcEr4UMHNjQo8w9LYJUziC4408f7UqBcpP4WnLIxJmz4hFIGpn45V7d 4e5+8swZuTqrrn2BVtQVTdQFTgkoU0zNnTlTcvpBFYLYnmg1NEoRMFW3Vh0Jq+hq dj30G9RskR7e+rilHckk9vpV6MIwhEdrvgLMxqe9HCxdqZpEap4mnVHsMERrE4fc FXOoRP3AwplRmUDG8cHc6pGjciOqKpAko8nk3+o5j7dMZjRtY5FydYOg2vCVs+NS HCwkK/njtAujO0qHniV3pcGwr1e+8x1xb/XpuvONKy8T1t0FPHrrDx2mQ8bek/9v DrLDBAgrjF/A1A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=QEF673OSOjW42F+GBqE6j+PlKGymw +tESo3+ZEDGjaQ=; b=GNKxsSLG93EiadJYPj3Y0Weyk8lK5vilKO9Qs3AuSutOj XSlL4kotZw3hbLWzPsILhK6Zxo6GvuVHvg9Y/h1+VWjVL24/9mf6w0NtbRcA05Ui PJjKPV8ASbeO3K/2odB5Ip+FSHMPDqC8m8RicBrg7bNv3WkgVYbqEEfIvMJ2rF+7 9FSCR5C7f0vFtESCRlGSvU+3amK3mM3pwkq5ADpuUDxgVDiHdFn/5kajJr6uFibj 7rO3RsKYzLrXBOp8BeXs5D38fVWQAmKuLg6NSykZnaIQZgZrVO66oR5OZ57aePeF Uw1ibeDazhSI0/PLgQDOxjGoOJH7cI915iI7oUB7Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrhedugddutdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkfffhvffutgesthdtredtre ertdenucfhrhhomhepfdfhrghkhhhrihcuufgrjhgrughifdcuoehfrdhsrghjrgguihes phgrnhhthhgvrhigrdhorhhgqeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehfrdhsrghjrgguihesphgrnhhthhgvrhigrdhorhhg X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 625CB5C0099; Wed, 5 Feb 2020 05:07:44 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.7-802-g7a41c81-fmstable-20200203v1 Mime-Version: 1.0 Message-Id: Date: Wed, 05 Feb 2020 13:37:23 +0330 From: "Fakhri Sajadi" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Mailman-Approved-At: Wed, 05 Feb 2020 09:45:26 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Wed, 05 Feb 2020 09:50:28 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/lxqt.scm (lxqt-config): Add xkeyboard-config in inputs. --- gnu/packages/lxqt.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 12c92e52d1..e58ec70579 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -379,6 +379,7 @@ the operating system LXQt is running on.") ("qtx11extras" ,qtx11extras) ("solid" ,solid) ("xf86-input-libinput" ,xf86-input-libinput) + ("xkeyboard-config" ,xkeyboard-config) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) @@ -394,6 +395,15 @@ the operating system LXQt is running on.") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") "DESTINATION \"etc/xdg")) #t)) + (add-after 'unpack 'set-xkeyboard-config-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Set the file name to xkeyboard-config and kbd. + (let ((xkb (assoc-ref inputs "xkeyboard-config")) + (kbd (assoc-ref inputs "kbd"))) + (substitute* "lxqt-config-input/keyboardlayoutconfig.h" + (("/usr/share/X11/xkb/rules/base.lst") + (string-append xkb "/share/X11/xkb/rules/base.lst"))) + #t))) (add-after 'unpack 'patch-translations-dir (lambda* (#:key outputs #:allow-other-keys) (substitute* '("lxqt-config-file-associations/CMakeLists.txt"