From patchwork Tue Sep 10 09:52:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 15341 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 6E8A1173C1; Tue, 10 Sep 2019 10:53:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2BC191736D for ; Tue, 10 Sep 2019 10:53:15 +0100 (BST) Received: from localhost ([::1]:36938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cpm-00067Q-EX for patchwork@mira.cbaines.net; Tue, 10 Sep 2019 05:53:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50192) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cpc-00065x-A5 for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7cpa-0000sF-U7 for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60377) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7cpa-0000sA-Qy for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i7cpa-0006ks-Pj for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37367] [PATCH 3/3] gnu: Add ktouch. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2019 09:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37367@debbugs.gnu.org Received: via spool by 37367-submit@debbugs.gnu.org id=B37367.156810917025934 (code B ref 37367); Tue, 10 Sep 2019 09:53:02 +0000 Received: (at 37367) by debbugs.gnu.org; 10 Sep 2019 09:52:50 +0000 Received: from localhost ([127.0.0.1]:40963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i7cpO-0006k8-C0 for submit@debbugs.gnu.org; Tue, 10 Sep 2019 05:52:50 -0400 Received: from flashner.co.il ([178.62.234.194]:51228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i7cpI-0006jS-8z for 37367@debbugs.gnu.org; Tue, 10 Sep 2019 05:52:45 -0400 Received: from localhost (unknown [188.120.128.191]) by flashner.co.il (Postfix) with ESMTPSA id 55E41402DE; Tue, 10 Sep 2019 09:52:38 +0000 (UTC) From: Efraim Flashner Date: Tue, 10 Sep 2019 12:52:31 +0300 Message-Id: <20190910095231.24326-3-efraim@flashner.co.il> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190910095231.24326-1-efraim@flashner.co.il> References: <20190910095008.23860-1-efraim@flashner.co.il> <20190910095231.24326-1-efraim@flashner.co.il> MIME-Version: 1.0 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-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/education.scm (ktouch): New variable. --- gnu/packages/education.scm | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 0ec1de7b75..3181746282 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages javascript) + #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) ; extra-cmake-modules #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -547,3 +548,74 @@ difficult timetables, it may take a longer time, a matter of hours.") "Klavaro is a simple tutor to teach correct typing, almost independently of language and very flexible regarding to new or unknown keyboard layouts.") (license license:gpl3+))) + +(define-public ktouch + (package + (name "ktouch") + (version "19.08.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" + version "/src/ktouch-" version ".tar.xz")) + (sha256 + (base32 + "19rdk94pls75hdvx11hnfk3qpm6l28p9q45q5f04sknxagrfaznr")))) + (build-system cmake-build-system) + (arguments + `(#:modules ((guix build cmake-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%cmake-build-system-modules + (guix build qt-utils)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-makefiles + (lambda* (#:key inputs #:allow-other-keys) + (let ((qtdec (assoc-ref inputs "qtdeclarative"))) + (substitute* '("src/CMakeFiles/ktouch_autogen.dir/build.make" + "src/CMakeFiles/ktouch.dir/build.make") + (("/gnu/store/.*qmlcachegen") + (string-append qtdec "/bin/qmlcachegen")))) + #t)) + (add-after 'install 'wrap-executable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program out "ktouch")) + #t))))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools) + ("pkg-config" ,pkg-config))) + (inputs + `(("kcmutils" ,kcmutils) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kdeclarative" ,kdeclarative) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kitemviews" ,kitemviews) + ("kqtquickcharts" ,kqtquickcharts) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libxcb" ,libxcb) + ("libxkbfile" ,libxkbfile) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtquickcontrols2" ,qtquickcontrols2) + ("qtx11extras" ,qtx11extras) + ("qtxmlpatterns" ,qtxmlpatterns))) + (home-page "https://edu.kde.org/ktouch/") + (synopsis "Touch typing tutor") + (description + "KTouch is an aid for learning how to type with speed and accuracy. It +provides a sample text to type and indicates which fingers should be used for +each key. A collection of lessons are included for a wide range of different +languages and keyboard layouts, and typing statistics are used to dynamically +adjust the level of difficulty.") + (license license:gpl2)))