z572 pushed a commit to branch kde-team
in repository guix.

commit 9b159c78acac0415ccb7ca93e046cbb0003154da
Author: Zheng Junjie <[email protected]>
AuthorDate: Fri Jan 10 11:52:08 2025 +0800

    gnu: marble-qt: Update to 24.12.1.
    
    * gnu/packages/kde.scm (marble-qt): Update to 24.12.1.
    [arguments]: Set #:qtbase to qtbase.
    <#:configure-flags>: Adjust flags.
    [inputs]: Remove kcoreaddons-5, kcrash-5, ki18n-5, kio-5, knewstuff-5,
    kparts-5, krunner-5, kwallet-5, qtbase-5, qtdeclarative-5,
    qtlocation-5, qtserialport, qtsvg-5, qtwebchannel-5, and
    qtwebengine-5; add abseil-cpp, kcoreaddons, kcrash, ki18n, kio,
    knewstuff, kparts, krunner, kwallet, qtdeclarative, qtlocation,
    qtsvg, qt5compat, qtwebchannel, and qtwebengine.
    [native-inputs]: Remove kdoctools-5 and qttools-5; add kdoctools and 
qttools.
    
    Change-Id: Ib3b1a5ccaec42c8118dd5295147e9b242494f35d
---
 gnu/packages/kde.scm | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index a5d63a2f26..2844257790 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1743,7 +1743,7 @@ Python, PHP, and Perl.")
 (define-public marble-qt
   (package
     (name "marble-qt")
-    (version "24.05.2")
+    (version "24.12.1")
     (source
      (origin
        (method git-fetch)
@@ -1753,40 +1753,41 @@ Python, PHP, and Perl.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "126zm2r637zd8xg0mrqh3g0phlph440ayyzrx8hfvb03drx6y70z"))))
+         "06nsfmwc6536v8hgnk1lk7lb8jiy15ay3qqfs2fmxiir0msny3vm"))))
     (build-system qt-build-system)
     (arguments
      ;; FIXME: libmarblewidget-qt5.so.28 not found.  Also enable the
      ;; corresponding configure flag to build tests.
      (list #:tests? #f
+           #:qtbase qtbase
            #:configure-flags
            #~(list "-DBUILD_MARBLE_TOOLS=YES" ; file conversion tools
                    "-DBUILD_TOUCH=YES"
-                   "-DBUILD_MARBLE_TESTS=FALSE")))
+                   "-DBUILD_TESTING=OFF")))
     (native-inputs
-     (list extra-cmake-modules kdoctools-5 qttools-5
+     (list extra-cmake-modules kdoctools qttools
            osmctools))
     ;; One optional dependency missing: libwlocate.
     (inputs
-     (list gpsd
-           kcoreaddons-5
-           kcrash-5
-           ki18n-5
-           kio-5
-           knewstuff-5
-           kparts-5
-           krunner-5
-           kwallet-5
+     (list abseil-cpp
+           gpsd
+           kcoreaddons
+           kcrash
+           ki18n
+           kio
+           knewstuff
+           kparts
+           krunner
+           kwallet
            perl
            phonon
            protobuf
-           qtbase-5
-           qtdeclarative-5
-           qtlocation-5
-           qtserialport
-           qtsvg-5
-           qtwebchannel-5
-           qtwebengine-5
+           qtdeclarative
+           qtlocation
+           qtsvg
+           qt5compat
+           qtwebchannel
+           qtwebengine
            shapelib
            shared-mime-info
            zlib))

Reply via email to