Archived
1
0
Fork 0

gnu: gcompris-qt: Update to 2.0.

* gnu/packages/education.scm (gcompris-qt): Update to 2.0.
[arguments]: Remove trailing #T.
[native-inputs, inputs]: Remove labels.
[license]: Change license from gpl3+ to agpl3+.
This commit is contained in:
Nicolas Goaziou 2021-12-18 16:16:49 +01:00
parent d4ecdc3328
commit f80b5c3d2f
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D

View file

@ -140,7 +140,7 @@ of categories with some of the activities available in that category.
(define-public gcompris-qt (define-public gcompris-qt
(package (package
(name "gcompris-qt") (name "gcompris-qt")
(version "1.1") (version "2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -148,7 +148,7 @@ of categories with some of the activities available in that category.
"https://gcompris.net/download/qt/src/gcompris-qt-" "https://gcompris.net/download/qt/src/gcompris-qt-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "1bpjwrv83rhikbycpyfpf6dbqr0xfq6amgdpqfgfph6nzr3zka7h")))) (base32 "1ix8wf0mpcwg0bd0fbx594ywhf0r0g0xhkbnjpm2ags8ixh4ddcs"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -159,28 +159,27 @@ of categories with some of the activities available in that category.
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
;; The test suite wants to write to /homeless-shelter ;; The test suite wants to write to /homeless-shelter
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd)))))
#t)))
#:configure-flags (list "-DQML_BOX2D_MODULE=disabled" #:configure-flags (list "-DQML_BOX2D_MODULE=disabled"
"-DBUILD_TESTING=TRUE"))) "-DBUILD_TESTING=TRUE")))
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) (list extra-cmake-modules
("gettext" ,gettext-minimal) gettext-minimal
("kdoctools" ,kdoctools) kdoctools
("perl" ,perl) perl
("qttools" ,qttools) qttools
("xorg-server" ,xorg-server-for-tests))) xorg-server-for-tests))
(inputs (inputs
`(("openssl" ,openssl) (list openssl
("python" ,python-wrapper) python-wrapper
("qtbase" ,qtbase-5) qtbase-5
("qtdeclarative" ,qtdeclarative) qtdeclarative
("qtgraphicaleffects" ,qtgraphicaleffects) qtgraphicaleffects
("qtmultimedia" ,qtmultimedia) qtmultimedia
("qtquickcontrols" ,qtquickcontrols) qtquickcontrols
("qtsensors" ,qtsensors) qtsensors
("qtsvg" ,qtsvg) qtsvg
("qtxmlpatterns" ,qtxmlpatterns))) qtxmlpatterns))
(home-page "https://gcompris.net/index-en.html") (home-page "https://gcompris.net/index-en.html")
(synopsis "Educational games for small children") (synopsis "Educational games for small children")
(description (description
@ -196,9 +195,9 @@ Currently available boards include:
@item recognize letters after hearing their names @item recognize letters after hearing their names
@item reading practice @item reading practice
@item small games (memory games, jigsaw puzzles, ...) @item small games (memory games, jigsaw puzzles, ...)
@end enumerate\n") @end enumerate")
(license (list license:silofl1.1 ; bundled fonts (license (list license:silofl1.1 ; bundled fonts
license:gpl3+)))) license:agpl3+))))
(define-public gotypist (define-public gotypist
(let ((revision "0") (let ((revision "0")