02/03: gnu: marble-qt: Update to 21.08.3.

[guix-commits]

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit 4fbc19e2c004430af36e1595398ae958f62f1e24
Author: Vinicius Monego <monego@posteo.net>
AuthorDate: Sat Nov 27 13:21:52 2021 +0000

    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>
---
 gnu/packages/kde.scm | 68 +++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 35 deletions(-)

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