From: Vinicius Monego <monego@posteo.net>
To: 52144@debbugs.gnu.org
Cc: Vinicius Monego <monego@posteo.net>
Subject: [bug#52144] [PATCH core-updates-frozen 3/3] gnu: marble-qt: Add optional dependencies.
Date: Sat, 27 Nov 2021 13:21:53 +0000 [thread overview]
Message-ID: <20211127132153.210724-3-monego@posteo.net> (raw)
In-Reply-To: <20211127132153.210724-1-monego@posteo.net>
* gnu/packages/kde.scm (marble-qt)[arguments]<#:configure-flags>: Remove
"-DCMAKE_BUILD_TYPE=Release" and "-DWITH_KF5=FALSE". Add
"-DBUILD_MARBLE_TOOLS=YES" and "-DBUILD_TOUCH=YES".
[native-inputs]: Add extra-cmake-modules.
[inputs]: Sort alphabetically. Add gpsd, kcoreaddons, kcrash, kdoctools,
ki18n, kio, knewstuff, kparts, krunner, kwallet, perl, phonon, protobuf,
qtserialport, qtsvg, shapelib, shared-mime-info, zlib. Remove qtwebkit.
---
gnu/packages/kde.scm | 38 ++++++++++++++++++++++++++++++--------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 886d8f6025..20916cf164 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -57,10 +57,12 @@
#:use-module (gnu packages ebook)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages geo)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#: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)
@@ -74,6 +76,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
#: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 tls)
@@ -1006,17 +1009,36 @@ Python, PHP, and Perl.")
;; corresponding configure flag to build tests.
`(#:tests? #f
#:configure-flags
- '("-DCMAKE_BUILD_TYPE=Release"
- "-DWITH_KF5=FALSE"
- "-DBUILD_MARBLE_TESTS=FALSE")))
+ (list "-DBUILD_MARBLE_TOOLS=YES" ; file conversion tools
+ "-DBUILD_TOUCH=YES"
+ "-DBUILD_MARBLE_TESTS=FALSE")))
(native-inputs
- `(("qttools" ,qttools)))
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("qttools" ,qttools)))
+ ;; One optional dependency missing: libwlocate.
(inputs
- `(("qtbase" ,qtbase-5)
- ("qtsvg" ,qtsvg)
+ `(("gpsd" ,gpsd)
+ ("kcoreaddons" ,kcoreaddons)
+ ("kcrash" ,kcrash)
+ ("kdoctools" ,kdoctools)
+ ("ki18n" ,ki18n)
+ ("kio" ,kio)
+ ("knewstuff" ,knewstuff)
+ ("kparts" ,kparts)
+ ("krunner" ,krunner)
+ ("kwallet" ,kwallet)
+ ("perl" ,perl)
+ ("phonon" ,phonon)
+ ("protobuf" ,protobuf)
+ ("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
- ("qtwebkit" ,qtwebkit)
- ("qtlocation" ,qtlocation)))
+ ("qtlocation" ,qtlocation)
+ ("qtserialport" ,qtserialport)
+ ("qtsvg" ,qtsvg)
+ ;; ("qtwebengine" ,qtwebengine) ; FIXME: not found by CMake
+ ("shapelib" ,shapelib)
+ ("shared-mime-info" ,shared-mime-info)
+ ("zlib" ,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
--
2.30.2
next prev parent reply other threads:[~2021-11-27 13:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-27 13:20 [bug#52144] [PATCH core-updates-frozen 0/3] Update KDE Marble Vinicius Monego
2021-11-27 13:21 ` [bug#52144] [PATCH core-updates-frozen 1/3] gnu: marble-qt: Move to (gnu packages kde) Vinicius Monego
2021-11-27 13:21 ` [bug#52144] [PATCH core-updates-frozen 2/3] gnu: marble-qt: Update to 21.08.3 Vinicius Monego
2021-11-27 13:21 ` Vinicius Monego [this message]
2021-11-27 13:37 ` bug#52144: [PATCH core-updates-frozen 0/3] Update KDE Marble Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211127132153.210724-3-monego@posteo.net \
--to=monego@posteo.net \
--cc=52144@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.