* [bug#52144] [PATCH core-updates-frozen 0/3] Update KDE Marble.
@ 2021-11-27 13:20 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:37 ` bug#52144: [PATCH core-updates-frozen 0/3] Update KDE Marble Mathieu Othacehe
0 siblings, 2 replies; 5+ messages in thread
From: Vinicius Monego @ 2021-11-27 13:20 UTC (permalink / raw)
To: 52144; +Cc: Vinicius Monego
Vinicius Monego (3):
gnu: marble-qt: Move to (gnu packages kde).
gnu: marble-qt: Update to 21.08.3.
gnu: marble-qt: Add optional dependencies.
gnu/packages/geo.scm | 40 -----------------------------
gnu/packages/kde.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 40 deletions(-)
base-commit: 612e38bd29a42409cd6030d745ead844509e8c6e
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#52144] [PATCH core-updates-frozen 1/3] gnu: marble-qt: Move to (gnu packages kde).
2021-11-27 13:20 [bug#52144] [PATCH core-updates-frozen 0/3] Update KDE Marble Vinicius Monego
@ 2021-11-27 13:21 ` 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 ` [bug#52144] [PATCH core-updates-frozen 3/3] gnu: marble-qt: Add optional dependencies Vinicius Monego
2021-11-27 13:37 ` bug#52144: [PATCH core-updates-frozen 0/3] Update KDE Marble Mathieu Othacehe
1 sibling, 2 replies; 5+ messages in thread
From: Vinicius Monego @ 2021-11-27 13:21 UTC (permalink / raw)
To: 52144; +Cc: Vinicius Monego
* gnu/packages/geo.scm (marble-qt): Move to (gnu packages kde).
---
gnu/packages/geo.scm | 40 ----------------------------------------
gnu/packages/kde.scm | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 6362300d6c..19618ab731 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2594,46 +2594,6 @@ coordinates of addresses, cities, countries, and landmarks across the globe
using third-party geocoders and other data sources.")
(license license:expat)))
-(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
-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))))
-
(define-public gplates
(package
(name "gplates")
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index b5c2357cb4..fa220c91f0 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -987,6 +987,46 @@ Python, PHP, and Perl.")
(description "Runtime library for kdegames")
(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
+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))))
+
(define-public okular
(package
(name "okular")
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#52144] [PATCH core-updates-frozen 2/3] gnu: marble-qt: Update to 21.08.3.
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 ` Vinicius Monego
2021-11-27 13:21 ` [bug#52144] [PATCH core-updates-frozen 3/3] gnu: marble-qt: Add optional dependencies Vinicius Monego
1 sibling, 0 replies; 5+ messages in thread
From: Vinicius Monego @ 2021-11-27 13:21 UTC (permalink / raw)
To: 52144; +Cc: Vinicius Monego
* 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+.
---
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 fa220c91f0..886d8f6025 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
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#52144] [PATCH core-updates-frozen 3/3] gnu: marble-qt: Add optional dependencies.
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
1 sibling, 0 replies; 5+ messages in thread
From: Vinicius Monego @ 2021-11-27 13:21 UTC (permalink / raw)
To: 52144; +Cc: Vinicius Monego
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#52144: [PATCH core-updates-frozen 0/3] Update KDE Marble.
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:37 ` Mathieu Othacehe
1 sibling, 0 replies; 5+ messages in thread
From: Mathieu Othacehe @ 2021-11-27 13:37 UTC (permalink / raw)
To: Vinicius Monego; +Cc: 52144-done
Hello,
> Vinicius Monego (3):
> gnu: marble-qt: Move to (gnu packages kde).
> gnu: marble-qt: Update to 21.08.3.
> gnu: marble-qt: Add optional dependencies.
Pushed on core-updates-frozen, thanks!
Mathieu
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-27 13:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [bug#52144] [PATCH core-updates-frozen 3/3] gnu: marble-qt: Add optional dependencies Vinicius Monego
2021-11-27 13:37 ` bug#52144: [PATCH core-updates-frozen 0/3] Update KDE Marble Mathieu Othacehe
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).