From e5aee50a22190fd373255022e34ee8de4669aaf2 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Tue, 7 Oct 2025 04:03:38 +0530 Subject: [PATCH] gnu: marble-qt: Move to kde-education.scm. * gnu/packages/kde.scm (marble-qt): Remove variable. * gnu/packages/kde-education.scm (marble-qt): New variable. * gnu/packages/image-viewers.scm: Use (gnu packages kde-education) module. Change-Id: I6527cd8bc577a6d8653437ffb87f6c10c57fe906 --- gnu/packages/image-viewers.scm | 1 + gnu/packages/kde-education.scm | 68 ++++++++++++++++++++++++++++++++++ gnu/packages/kde.scm | 66 --------------------------------- 3 files changed, 69 insertions(+), 66 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 846ac902579..020f3e5e4d3 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -102,6 +102,7 @@ #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) #:use-module (gnu packages kde) + #:use-module (gnu packages kde-education) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-graphics) #:use-module (gnu packages kde-pim) diff --git a/gnu/packages/kde-education.scm b/gnu/packages/kde-education.scm index 961bdf9a01a..629e4575889 100644 --- a/gnu/packages/kde-education.scm +++ b/gnu/packages/kde-education.scm @@ -29,7 +29,10 @@ #:use-module (gnu packages astronomy) #:use-module (gnu packages bison) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages geo) + #:use-module (gnu packages gps) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-plasma) #:use-module (gnu packages libreoffice) @@ -37,6 +40,8 @@ #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages pdf) + #:use-module (gnu packages perl) + #:use-module (gnu packages protobuf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages qt) @@ -211,3 +216,66 @@ scientific data. It provides an easy way to create, manage and edit plots and to perform data analysis.") (license (list license:gpl2+ ;labplot license:gpl3+)))) ;liborigin + +(define-public marble-qt + (package + (name "marble-qt") + (version "25.08.1") + (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 "04x6i7k1c09xn74rcx3vr4m8wpqb6bb24pwiyw6n65z1vf3qm3y5")))) + (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") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'alter-osmctools-lookup + (lambda _ + (substitute* "tools/vectorosm-tilecreator/autotests/CMakeLists.txt" + (("\\$") + (which "osmconvert")))))))) + (native-inputs (list abseil-cpp extra-cmake-modules kdoctools osmctools + qttools)) + ;; One optional dependency missing: libwlocate. + (inputs (list gpsd + kcoreaddons + kcrash + ki18n + kio + knewstuff + kparts + krunner + kwallet + perl + phonon + protobuf + qt5compat + qtdeclarative + qtlocation + qtpositioning + qtserialport + qtsvg + qtwebchannel + qtwebengine + shapelib + shared-mime-info + zlib)) + (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:lgpl2.1+))) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 3309d58a2ce..3299030c91d 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -54,7 +54,6 @@ #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) - #:use-module (gnu packages cpp) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) @@ -67,7 +66,6 @@ #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) - #:use-module (gnu packages gps) #:use-module (gnu packages graphics) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) @@ -79,7 +77,6 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages qt) @@ -395,69 +392,6 @@ Using a plugin system it is possible to create notifications with many different notification systems.") (license license:lgpl3))) -(define-public marble-qt - (package - (name "marble-qt") - (version "25.08.1") - (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 "04x6i7k1c09xn74rcx3vr4m8wpqb6bb24pwiyw6n65z1vf3qm3y5")))) - (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") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'alter-osmctools-lookup - (lambda _ - (substitute* "tools/vectorosm-tilecreator/autotests/CMakeLists.txt" - (("\\$") - (which "osmconvert")))))))) - (native-inputs (list abseil-cpp extra-cmake-modules kdoctools osmctools - qttools)) - ;; One optional dependency missing: libwlocate. - (inputs (list gpsd - kcoreaddons - kcrash - ki18n - kio - knewstuff - kparts - krunner - kwallet - perl - phonon - protobuf - qt5compat - qtdeclarative - qtlocation - qtpositioning - qtserialport - qtsvg - qtwebchannel - qtwebengine - shapelib - shared-mime-info - zlib)) - (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:lgpl2.1+))) - (define-public poxml (package (name "poxml")