From 8855dc7dafdbd0a75d228c447d2542576d6e3133 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 29 Dec 2020 02:26:35 +0300 Subject: [PATCH] GPXSee: bump to 8.0 --- .../gpxsee/additional-files/gpxsee.rdef.in | 20 ++++++++++++++----- .../{gpxsee-7.37.recipe => gpxsee-8.0.recipe} | 4 ++-- ...xsee-7.37.patchset => gpxsee-8.0.patchset} | 20 +++++++++---------- 3 files changed, 27 insertions(+), 17 deletions(-) rename sci-geosciences/gpxsee/{gpxsee-7.37.recipe => gpxsee-8.0.recipe} (95%) rename sci-geosciences/gpxsee/patches/{gpxsee-7.37.patchset => gpxsee-8.0.patchset} (82%) diff --git a/sci-geosciences/gpxsee/additional-files/gpxsee.rdef.in b/sci-geosciences/gpxsee/additional-files/gpxsee.rdef.in index e02b731f1..407a8d8da 100644 --- a/sci-geosciences/gpxsee/additional-files/gpxsee.rdef.in +++ b/sci-geosciences/gpxsee/additional-files/gpxsee.rdef.in @@ -17,10 +17,10 @@ resource app_signature "@APP_SIGNATURE@"; resource file_types message { "types" = "application/gpx+xml", - "types" = "application/tcx+xml", - "types" = "application/kml+xml", - "types" = "application/loc+xml", - "types" = "application/slf+xml", + "types" = "application/vnd.garmin.tcx+xml", + "types" = "application/vnd.google-earth.kml+xml", + "types" = "application/vnd.groundspeak.loc+xml", + "types" = "application/vnd.sigma.slf+xml", "types" = "application/vnd.ant.fit", "types" = "application/vnd.fai.igc", "types" = "application/vnd.nmea.nmea", @@ -30,7 +30,17 @@ resource file_types message { "types" = "application/geo+json", "types" = "application/vnd.naviter.seeyou.cup", "types" = "application/vnd.garmin.gpi", - "types" = "application/sml+xml" + "types" = "application/vnd.suunto.sml+xml", + "types" = "application/vnd.garmin.img", + "types" = "application/vnd.garmin.jnx", + "types" = "application/vnd.garmin.gmap+xml", + "types" = "image/vnd.maptech.kap", + "types" = "application/vnd.oziexplorer.map", + "types" = "application/vnd.mapbox.mbtiles", + "types" = "application/vnd.twonav.rmap", + "types" = "application/vnd.trekbuddy.tba", + "types" = "application/vnd.gpxsee.map+xml", + "types" = "application/vnd.google-earth.kmz" }; resource vector_icon { diff --git a/sci-geosciences/gpxsee/gpxsee-7.37.recipe b/sci-geosciences/gpxsee/gpxsee-8.0.recipe similarity index 95% rename from sci-geosciences/gpxsee/gpxsee-7.37.recipe rename to sci-geosciences/gpxsee/gpxsee-8.0.recipe index dce65ee4c..340cba8e5 100644 --- a/sci-geosciences/gpxsee/gpxsee-7.37.recipe +++ b/sci-geosciences/gpxsee/gpxsee-8.0.recipe @@ -9,7 +9,7 @@ OziExplorer (PLT, RTE, WPT), Garmin GPI & CSV and geotagged JPEG files * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, \ QuadTiles) * Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG/GMAP \ -& JNX maps, TwoNav RMaps, GeoTIFF images) +& JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts, KMZ maps) * Elevation, speed, heart rate, cadence, power, temperature and gear \ ratio/shifts graphs * Support for DEM files (SRTM HGT) @@ -23,7 +23,7 @@ COPYRIGHT="2015-2020 Martin Tůma" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/tumic0/gpxsee/archive/$portVersion/GPXSee-$portVersion.tar.gz" -CHECKSUM_SHA256="117333b2791628a1dc47ecac180c1ecedff504a623aeb93d44202c040b868ab4" +CHECKSUM_SHA256="eee67b5b15c0c48877a5004a2f0bc6ac430e4ee83144632da24ad427cc013d87" SOURCE_DIR="GPXSee-$portVersion" PATCHES="gpxsee-$portVersion.patchset" ADDITIONAL_FILES=" diff --git a/sci-geosciences/gpxsee/patches/gpxsee-7.37.patchset b/sci-geosciences/gpxsee/patches/gpxsee-8.0.patchset similarity index 82% rename from sci-geosciences/gpxsee/patches/gpxsee-7.37.patchset rename to sci-geosciences/gpxsee/patches/gpxsee-8.0.patchset index 276578ee7..45024ebbf 100644 --- a/sci-geosciences/gpxsee/patches/gpxsee-7.37.patchset +++ b/sci-geosciences/gpxsee/patches/gpxsee-8.0.patchset @@ -5,10 +5,10 @@ Subject: Fix APP_NAME diff --git a/src/GUI/app.cpp b/src/GUI/app.cpp -index 6f62d88..a642ca1 100644 +index 37e9d3f..479f4b3 100644 --- a/src/GUI/app.cpp +++ b/src/GUI/app.cpp -@@ -21,7 +21,7 @@ +@@ -22,7 +22,7 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) { @@ -18,7 +18,7 @@ index 6f62d88..a642ca1 100644 #else setApplicationName(QString(APP_NAME).toLower()); -- -2.19.1 +2.19.2 From 15b7e94410b3e5e6707e8e252c3ad56df63e80c6 Mon Sep 17 00:00:00 2001 @@ -28,11 +28,11 @@ Subject: Dirty hack for fix crash on exit diff --git a/src/GUI/app.cpp b/src/GUI/app.cpp -index a642ca1..250855a 100644 +index 479f4b3..f1a1d89 100644 --- a/src/GUI/app.cpp +++ b/src/GUI/app.cpp -@@ -18,6 +18,9 @@ - #include "settings.h" +@@ -19,6 +19,9 @@ + #include "mapaction.h" #include "app.h" +#include @@ -41,9 +41,9 @@ index a642ca1..250855a 100644 App::App(int &argc, char **argv) : QApplication(argc, argv) { -@@ -82,7 +85,9 @@ int App::run() - for (int i = 1; i < args.count(); i++) - _gui->openFile(args.at(i)); +@@ -98,7 +101,9 @@ int App::run() + if (lastReady) + lastReady->trigger(); - return exec(); + exec(); @@ -53,5 +53,5 @@ index a642ca1..250855a 100644 bool App::event(QEvent *event) -- -2.19.1 +2.29.2