From 5e8c2c29cbac4cdd952f00476028f9f26b52847d Mon Sep 17 00:00:00 2001 From: Sughosha Date: Tue, 7 Oct 2025 07:42:06 +0530 Subject: [PATCH] gnu: gcompris-qt: Move to kde-education.scm. * gnu/packages/education.scm (gcompris-qt): Remove variable. * gnu/packages/kde-education.scm (gcompris-qt): New variable. Change-Id: I21d626330b8f90ef2ff636426acf34e75e834da9 --- gnu/packages/education.scm | 61 --------------------------------- gnu/packages/kde-education.scm | 62 ++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index e61ab33e49bb6e76434f8e7dce5d1749183a699e..df4b188519cdbe4ecaacec8bac3a0b26dd8ff774 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -56,7 +56,6 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages image) #:use-module (gnu packages javascript) - #:use-module (gnu packages kde-frameworks) ; extra-cmake-modules #:use-module (gnu packages linux) #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) @@ -217,66 +216,6 @@ of categories with some of the activities available in that category. ") (license license:gpl3+))) -(define-public gcompris-qt - (package - (name "gcompris-qt") - (version "25.0.12") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/gcompris/qt/src/gcompris-qt-" - version ".tar.xz")) - (sha256 - (base32 "1my67r7x6j7snidnj47v3ndhf3i5sxn0zqj4d8apaw6mbqms96vj")))) - (build-system qt-build-system) - (arguments - (list #:qtbase qtbase - #:phases - #~(modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - ;; The test suite wants to write to /homeless-shelter - (setenv "HOME" (getcwd))))) - #:configure-flags #~(list "-DQML_BOX2D_MODULE=disabled"))) - (native-inputs - (list extra-cmake-modules - gettext-minimal - kdoctools - perl - pkg-config - qttools - xorg-server-for-tests)) - (inputs - (list openssl - python-wrapper - qtcharts - qtdeclarative - qtmultimedia - qtsensors - qtsvg)) - (home-page "https://gcompris.net/index-en.html") - (synopsis "Educational games for small children") - (description - "Gcompris offers a large collection of educational games for small -children, designed to be a unified interface to integrate more educational -games. Language-oriented games contain vocabulary, sounds, and voices for -many different languages. -Currently available boards include: -@enumerate -@item learning how to use a mouse and keyboard -@item learning simple arithmetic -@item learning how to read an analog clock -@item recognize letters after hearing their names -@item reading practice -@item small games (memory games, jigsaw puzzles, ...) -@end enumerate") - (license (list license:silofl1.1 ; bundled fonts - license:agpl3+)))) - (define-public gotypist (let ((revision "0") (commit "03f8618f8e23acdaa94cda3bcf197da520db8dd4")) diff --git a/gnu/packages/kde-education.scm b/gnu/packages/kde-education.scm index 2115065c7ecb01c3a9c848d31691632e3245cf5f..5d8b8dbe6b2b86dbf9609469e94239427e8c000b 100644 --- a/gnu/packages/kde-education.scm +++ b/gnu/packages/kde-education.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages cpp) #:use-module (gnu packages freedesktop) #:use-module (gnu packages geo) + #:use-module (gnu packages gettext) #:use-module (gnu packages gps) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) @@ -47,6 +48,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages tls) #:use-module (gnu packages xorg)) (define-public kqtquickcharts @@ -97,6 +99,66 @@ and some numerical methods; for instance the library can parse mathematical expressions and let you evaluate and draw them.") (license license:gpl2+))) +(define-public gcompris-qt + (package + (name "gcompris-qt") + (version "25.0.12") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/gcompris/qt/src/gcompris-qt-" + version ".tar.xz")) + (sha256 + (base32 "1my67r7x6j7snidnj47v3ndhf3i5sxn0zqj4d8apaw6mbqms96vj")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + ;; The test suite wants to write to /homeless-shelter + (setenv "HOME" (getcwd))))) + #:configure-flags #~(list "-DQML_BOX2D_MODULE=disabled"))) + (native-inputs + (list extra-cmake-modules + gettext-minimal + kdoctools + perl + pkg-config + qttools + xorg-server-for-tests)) + (inputs + (list openssl + python-wrapper + qtcharts + qtdeclarative + qtmultimedia + qtsensors + qtsvg)) + (home-page "https://gcompris.net/index-en.html") + (synopsis "Educational games for small children") + (description + "Gcompris offers a large collection of educational games for small +children, designed to be a unified interface to integrate more educational +games. Language-oriented games contain vocabulary, sounds, and voices for +many different languages. +Currently available boards include: +@enumerate +@item learning how to use a mouse and keyboard +@item learning simple arithmetic +@item learning how to read an analog clock +@item recognize letters after hearing their names +@item reading practice +@item small games (memory games, jigsaw puzzles, ...) +@end enumerate") + (license (list license:silofl1.1 ; bundled fonts + license:agpl3+)))) + (define-public kalgebra (package (name "kalgebra")