From 4e19ad0fde26266a5e3a9ec6d73ad3bf88fc189d Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Wed, 21 Jul 2021 13:02:09 +0200 Subject: gnu: gnome-maps: Update to 3.38.5. * gnu/packages/geo.scm (gnome-maps): Update to 3.38.5. --- gnu/packages/geo.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37be78edbf..8b71f5b03c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -210,7 +210,7 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "3.36.7") + (version "3.38.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -218,7 +218,7 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "09rgw8hq3ligap1zzjhx25q354ficpbiw1z9ramghhcqbpylsxdh")))) + "1llgzm2ni3iy31dznqkc81vadv0fpqgpz2l9zzrj5jshvyq0akgh")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -236,6 +236,15 @@ topology functions.") (("@pkgdatadir@/org.gnome.Maps") (string-append (assoc-ref outputs "out") "/bin/gnome-maps"))) #t)) + (add-after 'unpack 'fix-broken-tests + (lambda _ + ;; For some reason setting LC_ALL=C and LANG=C as done in the + ;; build system does not prevent these gratuitous commas from + ;; being inserted. + (substitute* "tests/utilsTest.js" + (("1001 m") "1,001 m") + (("1000 ft") "1,000 ft") + (("5282 ft") "5,282 ft")))) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 769326cf185c024c760931f35c6001c32c85b4a2 Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Wed, 14 Jul 2021 19:55:52 +0200 Subject: gnu: Add marble-qt. * gnu/packages/patches/marble-qt-add-qt-headers.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/geo.scm (marble-qt): New variable. Signed-off-by: Mathieu Othacehe --- gnu/local.mk | 1 + gnu/packages/geo.scm | 42 ++++- .../patches/marble-qt-add-qt-headers.patch | 189 +++++++++++++++++++++ 3 files changed, 231 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/marble-qt-add-qt-headers.patch (limited to 'gnu/packages/geo.scm') diff --git a/gnu/local.mk b/gnu/local.mk index a5ee3097de..b944c671af 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1420,6 +1420,7 @@ dist_patch_DATA = \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/mailutils-fix-uninitialized-variable.patch \ %D%/packages/patches/make-impure-dirs.patch \ + %D%/packages/patches/marble-qt-add-qt-headers.patch \ %D%/packages/patches/mariadb-CVE-2021-27928.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 8b71f5b03c..5419f27d9a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018, 2019, 2020 Julien Lepiller ;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2019 Wiktor Żelazny +;;; Copyright © 2019, 2021 Wiktor Żelazny ;;; Copyright © 2019, 2020 Hartmut Goebel ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Christopher Baines @@ -2423,3 +2423,43 @@ web services. @code{geopy} makes it easy for Python developers to locate the 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 "git://anongit.kde.org/marble") + (commit commit))) + (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)))) diff --git a/gnu/packages/patches/marble-qt-add-qt-headers.patch b/gnu/packages/patches/marble-qt-add-qt-headers.patch new file mode 100644 index 0000000000..77c58317ad --- /dev/null +++ b/gnu/packages/patches/marble-qt-add-qt-headers.patch @@ -0,0 +1,189 @@ +Adapted from Debian: https://salsa.debian.org/qt-kde-team/kde/marble/-/blob/debian/4%2517.08.3-3.1/debian/patches/qt5.11.patch +Upstream status: Probably irrelevant, as this is an old version of this software. + +diff --git a/src/lib/marble/MergedLayerDecorator.cpp b/src/lib/marble/MergedLayerDecorator.cpp +index 40f3ddb..bafff50 100644 +--- a/src/lib/marble/MergedLayerDecorator.cpp ++++ b/src/lib/marble/MergedLayerDecorator.cpp +@@ -36,6 +36,7 @@ + + #include + #include ++#include + + using namespace Marble; + +diff --git a/src/lib/marble/VisiblePlacemark.cpp b/src/lib/marble/VisiblePlacemark.cpp +index cfe08af..1a84006 100644 +--- a/src/lib/marble/VisiblePlacemark.cpp ++++ b/src/lib/marble/VisiblePlacemark.cpp +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/src/lib/marble/graphicsview/FrameGraphicsItem.cpp b/src/lib/marble/graphicsview/FrameGraphicsItem.cpp +index 8a90526..065f245 100644 +--- a/src/lib/marble/graphicsview/FrameGraphicsItem.cpp ++++ b/src/lib/marble/graphicsview/FrameGraphicsItem.cpp +@@ -18,6 +18,7 @@ + // Qt + #include + #include ++#include + #include + #include + #include +diff --git a/src/lib/marble/layers/GroundLayer.cpp b/src/lib/marble/layers/GroundLayer.cpp +index 58d409f..df6d226 100644 +--- a/src/lib/marble/layers/GroundLayer.cpp ++++ b/src/lib/marble/layers/GroundLayer.cpp +@@ -14,6 +14,9 @@ + #include "ViewportParams.h" + #include "RenderState.h" + ++#include ++#include ++ + namespace Marble + { + +diff --git a/src/plugins/render/compass/CompassFloatItem.cpp b/src/plugins/render/compass/CompassFloatItem.cpp +index d8dc021..66095cc 100644 +--- a/src/plugins/render/compass/CompassFloatItem.cpp ++++ b/src/plugins/render/compass/CompassFloatItem.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp +index a790c16..96f5bed 100644 +--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp ++++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/plugins/render/foursquare/FoursquareItem.cpp b/src/plugins/render/foursquare/FoursquareItem.cpp +index d9e1f57..ef80472 100644 +--- a/src/plugins/render/foursquare/FoursquareItem.cpp ++++ b/src/plugins/render/foursquare/FoursquareItem.cpp +@@ -13,6 +13,8 @@ + #include "ViewportParams.h" + + #include ++#include ++#include + + namespace Marble + { +diff --git a/src/plugins/render/gpsinfo/GpsInfo.cpp b/src/plugins/render/gpsinfo/GpsInfo.cpp +index 522e907..20fd75a 100644 +--- a/src/plugins/render/gpsinfo/GpsInfo.cpp ++++ b/src/plugins/render/gpsinfo/GpsInfo.cpp +@@ -21,6 +21,8 @@ + #include "ViewportParams.h" + #include "GeoDataAccuracy.h" + ++#include ++ + namespace Marble + { + +diff --git a/src/plugins/render/license/License.cpp b/src/plugins/render/license/License.cpp +index 511dfc0..9436083 100644 +--- a/src/plugins/render/license/License.cpp ++++ b/src/plugins/render/license/License.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/plugins/render/notes/NotesItem.cpp b/src/plugins/render/notes/NotesItem.cpp +index 9d0961f..0c9fe99 100644 +--- a/src/plugins/render/notes/NotesItem.cpp ++++ b/src/plugins/render/notes/NotesItem.cpp +@@ -9,6 +9,7 @@ + #include "MarbleDirs.h" + + #include ++#include + #include + + using namespace Marble; +diff --git a/src/plugins/render/postalcode/PostalCodeItem.cpp b/src/plugins/render/postalcode/PostalCodeItem.cpp +index 772c0b2..0ff7957 100644 +--- a/src/plugins/render/postalcode/PostalCodeItem.cpp ++++ b/src/plugins/render/postalcode/PostalCodeItem.cpp +@@ -17,6 +17,7 @@ + // Qt + #include + #include ++#include + + using namespace Marble; + +diff --git a/src/plugins/render/progress/ProgressFloatItem.cpp b/src/plugins/render/progress/ProgressFloatItem.cpp +index a465857..6e2452c 100644 +--- a/src/plugins/render/progress/ProgressFloatItem.cpp ++++ b/src/plugins/render/progress/ProgressFloatItem.cpp +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + namespace Marble + { +diff --git a/src/plugins/render/satellites/SatellitesPlugin.cpp b/src/plugins/render/satellites/SatellitesPlugin.cpp +index 04d8321..0a43d24 100644 +--- a/src/plugins/render/satellites/SatellitesPlugin.cpp ++++ b/src/plugins/render/satellites/SatellitesPlugin.cpp +@@ -25,6 +25,7 @@ + + #include "ui_SatellitesConfigDialog.h" + ++#include + #include + #include + +diff --git a/src/plugins/render/speedometer/Speedometer.cpp b/src/plugins/render/speedometer/Speedometer.cpp +index 6e9c532..f40a174 100644 +--- a/src/plugins/render/speedometer/Speedometer.cpp ++++ b/src/plugins/render/speedometer/Speedometer.cpp +@@ -19,6 +19,8 @@ + #include "MarbleGraphicsGridLayout.h" + #include "ViewportParams.h" + ++#include ++ + namespace Marble + { + +diff --git a/src/plugins/render/stars/StarsPlugin.cpp b/src/plugins/render/stars/StarsPlugin.cpp +index 6599545..482680f 100644 +--- a/src/plugins/render/stars/StarsPlugin.cpp ++++ b/src/plugins/render/stars/StarsPlugin.cpp +@@ -19,6 +19,8 @@ + #include + #include + #include ++#include ++#include + #include + + #include "MarbleClock.h" -- cgit v1.2.3 From 199f9e91708884ccf16e6e5448102820f18b11f6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Jul 2021 19:49:12 +0200 Subject: gnu: marble-qt: Fix Git source URL. The package failed to build with: fatal: remote error: Please use the https: protocol to connect to anongit Fix the protocol & follow the subsequent HTTP redirection. * gnu/packages/geo.scm (marble-qt)[source]: Fix upstream URL. --- gnu/packages/geo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5419f27d9a..ebcce5d71a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2435,7 +2435,7 @@ using third-party geocoders and other data sources.") (origin (method git-fetch) (uri (git-reference - (url "git://anongit.kde.org/marble") + (url "https://invent.kde.org/education/marble.git/") (commit commit))) (sha256 (base32 -- cgit v1.2.3 From cbeafb35e8d29fe876cfc78df0d22ecd49e8f39a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Jul 2021 19:52:47 +0200 Subject: gnu: marble-qt: Fix source file name. * gnu/packages/geo.scm (marble-qt)[source]: Add a FILE-NAME field. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ebcce5d71a..1be6d14974 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2437,9 +2437,9 @@ using third-party geocoders and other data sources.") (uri (git-reference (url "https://invent.kde.org/education/marble.git/") (commit commit))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0m0sf3sddaib7vc5lhbmh7ziw07p1hahg02f65sgfylyl5f5kj92")) + (base32 "0m0sf3sddaib7vc5lhbmh7ziw07p1hahg02f65sgfylyl5f5kj92")) (patches (search-patches "marble-qt-add-qt-headers.patch")))) (build-system cmake-build-system) -- cgit v1.2.3