From patchwork Tue Sep 10 09:52:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 15340 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 179D9173C1; 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 B594E1736D for ; Tue, 10 Sep 2019 10:53:14 +0100 (BST) Received: from localhost ([::1]:36940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cpm-00067R-5C for patchwork@mira.cbaines.net; Tue, 10 Sep 2019 05:53:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50176) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cpb-00065v-7G for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7cpa-0000rg-00 for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60375) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7cpZ-0000rc-TO for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i7cpZ-0006kd-RO for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37367] [PATCH 1/3] gnu: Add klavaro. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2019 09:53:01 +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.156810916925917 (code B ref 37367); Tue, 10 Sep 2019 09:53:01 +0000 Received: (at 37367) by debbugs.gnu.org; 10 Sep 2019 09:52:49 +0000 Received: from localhost ([127.0.0.1]:40958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i7cpH-0006jl-AU for submit@debbugs.gnu.org; Tue, 10 Sep 2019 05:52:49 -0400 Received: from flashner.co.il ([178.62.234.194]:51220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i7cpD-0006jL-Ky for 37367@debbugs.gnu.org; Tue, 10 Sep 2019 05:52:41 -0400 Received: from localhost (unknown [188.120.128.191]) by flashner.co.il (Postfix) with ESMTPSA id B775240045; Tue, 10 Sep 2019 09:52:33 +0000 (UTC) From: Efraim Flashner Date: Tue, 10 Sep 2019 12:52:29 +0300 Message-Id: <20190910095231.24326-1-efraim@flashner.co.il> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190910095008.23860-1-efraim@flashner.co.il> References: <20190910095008.23860-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 (klavaro): New variable. --- gnu/packages/education.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 240fc4acd8..0ec1de7b75 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2017, 2018 Efraim Flashner +;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Nicolas Goaziou ;;; @@ -520,3 +520,30 @@ minutes. For simpler timetables, it may take a shorter time, under difficult timetables, it may take a longer time, a matter of hours.") (license license:agpl3+))) +(define-public klavaro + (package + (name "klavaro") + (version "3.09") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/klavaro/klavaro-" + version ".tar.bz2")) + (sha256 + (base32 + "12gml7h45b1w9s318h0d5wxw92h7pgajn2kh57j0ak9saq0yb0wr")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("curl" ,curl) + ("gtk+" ,gtk+) + ("pango" ,pango))) + (home-page "https://klavaro.sourceforge.io/en/index.html") + (synopsis "Touch typing tutor") + (description + "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+))) From patchwork Tue Sep 10 09:52:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 15339 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 7C66F173C1; Tue, 10 Sep 2019 10:53:12 +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 417671736D for ; Tue, 10 Sep 2019 10:53:12 +0100 (BST) Received: from localhost ([::1]:36936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cpj-00066D-Dl for patchwork@mira.cbaines.net; Tue, 10 Sep 2019 05:53:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50180) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cpb-00065w-Ko for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7cpa-0000s1-Fj for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7cpa-0000rx-Cm 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-0006kl-Bn for guix-patches@gnu.org; Tue, 10 Sep 2019 05:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37367] [PATCH 2/3] gnu: Add kqtquickcharts. 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.156810917025927 (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]:40961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i7cpN-0006jy-Ap for submit@debbugs.gnu.org; Tue, 10 Sep 2019 05:52:50 -0400 Received: from flashner.co.il ([178.62.234.194]:51224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i7cpG-0006jP-1P for 37367@debbugs.gnu.org; Tue, 10 Sep 2019 05:52:42 -0400 Received: from localhost (unknown [188.120.128.191]) by flashner.co.il (Postfix) with ESMTPSA id 399874025B; Tue, 10 Sep 2019 09:52:36 +0000 (UTC) From: Efraim Flashner Date: Tue, 10 Sep 2019 12:52:30 +0300 Message-Id: <20190910095231.24326-2-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/kde.scm (kqtquickcharts): New variable. --- gnu/packages/kde.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index f2261f7f98..c80da7d796 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -602,3 +602,27 @@ communicate with each other. Here's a few things KDE Connect can do: @end enumerate") (properties `((upstream-name . "kdeconnect-kde"))) (license (list license:gpl2 license:gpl3)))) ; dual licensed + +(define-public kqtquickcharts + (package + (name "kqtquickcharts") + (version "19.08.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" + version "/src/kqtquickcharts-" version ".tar.xz")) + (sha256 + (base32 + "1j3rivvh4sa94lsd0hi4xfvcikl05zrqd7634wxyaxs718ais6dg")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))) + (home-page "https://phabricator.kde.org/source/kqtquickcharts/") + (synopsis "Interactive charts for Qt Quick") + (description + "A QtQuick plugin to render beautiful and interactive charts.") + (license license:lgpl2.1+))) 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)))