me
/
guix
Archived
1
0
Fork 0
Code

gnu: marble-qt: Update to 21.08.3. 

* 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>
master
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

22
gnu/packages/kde.scm
View File

@ -988,29 +988,27 @@ 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")
(commit "fc7166eeef784732033c999ba605364f9c82d21c")
(revision "1"))
(package (package
(name "marble-qt") (name "marble-qt")
(version (git-version release revision commit)) (version "21.08.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://invent.kde.org/education/marble.git/") (url "https://invent.kde.org/education/marble.git/")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0m0sf3sddaib7vc5lhbmh7ziw07p1hahg02f65sgfylyl5f5kj92")) (base32 "15gqym45z0gjzdc4ypfj0fki96c3dad4ygsi6lfr8yvwsx8swrb6"))))
(patches (search-patches (build-system qt-build-system)
"marble-qt-add-qt-headers.patch"))))
(build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; libmarblewidget-qt5.so.28 not found ;; FIXME: libmarblewidget-qt5.so.28 not found. Also enable the
;; corresponding configure flag to build tests.
`(#:tests? #f
#:configure-flags #:configure-flags
'("-DCMAKE_BUILD_TYPE=Release" '("-DCMAKE_BUILD_TYPE=Release"
"-DWITH_KF5=FALSE"))) "-DWITH_KF5=FALSE"
"-DBUILD_MARBLE_TESTS=FALSE")))
(native-inputs (native-inputs
`(("qttools" ,qttools))) `(("qttools" ,qttools)))
(inputs (inputs
@ -1025,7 +1023,7 @@ Python, PHP, and Perl.")
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