GNU bug report logs -
#52144
[PATCH core-updates-frozen 0/3] Update KDE Marble.
Previous Next
Reported by: Vinicius Monego <monego <at> posteo.net>
Date: Sat, 27 Nov 2021 13:21:01 UTC
Severity: normal
Tags: patch
Done: Mathieu Othacehe <othacehe <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 52144 in the body.
You can then email your comments to 52144 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#52144
; Package
guix-patches
.
(Sat, 27 Nov 2021 13:21:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Vinicius Monego <monego <at> posteo.net>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Sat, 27 Nov 2021 13:21:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
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
Information forwarded
to
guix-patches <at> gnu.org
:
bug#52144
; Package
guix-patches
.
(Sat, 27 Nov 2021 13:23:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 52144 <at> debbugs.gnu.org (full text, mbox):
* 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
Information forwarded
to
guix-patches <at> gnu.org
:
bug#52144
; Package
guix-patches
.
(Sat, 27 Nov 2021 13:23:03 GMT)
Full text and
rfc822 format available.
Message #11 received at 52144 <at> debbugs.gnu.org (full text, mbox):
* 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
Information forwarded
to
guix-patches <at> gnu.org
:
bug#52144
; Package
guix-patches
.
(Sat, 27 Nov 2021 13:23:03 GMT)
Full text and
rfc822 format available.
Message #14 received at 52144 <at> debbugs.gnu.org (full text, mbox):
* 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
Reply sent
to
Mathieu Othacehe <othacehe <at> gnu.org>
:
You have taken responsibility.
(Sat, 27 Nov 2021 13:39:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Vinicius Monego <monego <at> posteo.net>
:
bug acknowledged by developer.
(Sat, 27 Nov 2021 13:39:02 GMT)
Full text and
rfc822 format available.
Message #19 received at 52144-done <at> debbugs.gnu.org (full text, mbox):
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
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Sun, 26 Dec 2021 12:24:06 GMT)
Full text and
rfc822 format available.
This bug report was last modified 2 years and 83 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.