me/guix
Archived
1
0
Fork 0
Code Activity

gnu: marble-qt: Update to 21.08.3.

Browse source 
* gnu/packages/kde.scm (marble-qt): Update to 21.08.3.
[build-system]: Use qt-build-system.
[arguments]<#:configure-flags>: Pass "-DBUILD_MARBLE_TESTS=FALSE".
[license]: Change to lgpl2.1+.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Vinicius Monego 2021-11-27 13:21:52 +00:00 • committed by Mathieu Othacehe
parent e2f01318af
commit 4fbc19e2c0
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
gnu/packages/kde.scm
View file

@ -988,44 +988,42 @@ Python, PHP, and Perl.")
(license (list license:gpl2+ license:fdl1.2+)))) (license (list license:gpl2+ license:fdl1.2+))))
(define-public marble-qt (define-public marble-qt
(let ((release "17.08") (package
(commit "fc7166eeef784732033c999ba605364f9c82d21c") (name "marble-qt")
(revision "1")) (version "21.08.3")
(package (source
(name "marble-qt") (origin
(version (git-version release revision commit)) (method git-fetch)
(source (uri (git-reference
(origin (url "https://invent.kde.org/education/marble.git/")
(method git-fetch) (commit (string-append "v" version))))
(uri (git-reference (file-name (git-file-name name version))
(url "https://invent.kde.org/education/marble.git/") (sha256
(commit commit))) (base32 "15gqym45z0gjzdc4ypfj0fki96c3dad4ygsi6lfr8yvwsx8swrb6"))))
(file-name (git-file-name name version)) (build-system qt-build-system)
(sha256 (arguments
(base32 "0m0sf3sddaib7vc5lhbmh7ziw07p1hahg02f65sgfylyl5f5kj92")) ;; FIXME: libmarblewidget-qt5.so.28 not found. Also enable the
(patches (search-patches ;; corresponding configure flag to build tests.
"marble-qt-add-qt-headers.patch")))) `(#:tests? #f
(build-system cmake-build-system) #:configure-flags
(arguments '("-DCMAKE_BUILD_TYPE=Release"
`(#:tests? #f ; libmarblewidget-qt5.so.28 not found "-DWITH_KF5=FALSE"
#:configure-flags "-DBUILD_MARBLE_TESTS=FALSE")))
'("-DCMAKE_BUILD_TYPE=Release" (native-inputs
"-DWITH_KF5=FALSE"))) `(("qttools" ,qttools)))
(native-inputs (inputs
`(("qttools" ,qttools))) `(("qtbase" ,qtbase-5)
(inputs ("qtsvg" ,qtsvg)
`(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg) ("qtwebkit" ,qtwebkit)
("qtdeclarative" ,qtdeclarative) ("qtlocation" ,qtlocation)))
("qtwebkit" ,qtwebkit) (home-page "https://marble.kde.org/")
("qtlocation" ,qtlocation))) (synopsis "Virtual globe and world atlas")
(home-page "https://marble.kde.org/") (description "Marble is similar to a desktop globe. At closer scale it
(synopsis "Virtual globe and world atlas")
(description "Marble is similar to a desktop globe. At closer scale it
becomes a world atlas, while OpenStreetMap takes the user to street level. It becomes a world atlas, while OpenStreetMap takes the user to street level. It
supports searching for places of interest, viewing Wikipedia articles, supports searching for places of interest, viewing Wikipedia articles,
creating routes by drag and drop and more.") creating routes by drag and drop and more.")
(license license:gpl3)))) (license license:lgpl2.1+)))
(define-public okular (define-public okular
(package (package