mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
924b96db0a
* gnu/packages/patches/gpsbabel-minizip.patch: New file. * gnu/packages/patches/gpsbabel-qstring.patch: New file. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/gps.scm (gpsbabel): Update to 1.5.4, [source]: add two previous patches to fix build, [snippet]: remove "gpsbabel" directory excursion, [arguments]: ditto.
69 lines
3.4 KiB
Diff
69 lines
3.4 KiB
Diff
Extracted from following patch of gpsbabel:
|
|
https://github.com/gpsbabel/gpsbabel/commit/604178aa8ad4d3c3ad218df24c1e9a6a1f683bb3
|
|
|
|
From 604178aa8ad4d3c3ad218df24c1e9a6a1f683bb3 Mon Sep 17 00:00:00 2001
|
|
From: Harel Mazor <harel.mazor@gmail.com>
|
|
Date: Tue, 24 Jan 2017 00:35:04 +0200
|
|
Subject: [PATCH] Added geojson read capablity, moved magic strings to
|
|
constants, fixed windows compilation issues.
|
|
|
|
--- a/tef_xml.cc
|
|
+++ b/tef_xml.cc
|
|
@@ -72,11 +72,11 @@ tef_start(xg_string args, const QXmlStreamAttributes* attrv)
|
|
bool valid = false;
|
|
|
|
foreach(QXmlStreamAttribute attr, *attrv) {
|
|
- if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) {
|
|
- if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) {
|
|
+ if (attr.name().compare(QString("Comment"), Qt::CaseInsensitive) == 0) {
|
|
+ if (attr.value().compare(QString("TourExchangeFormat"), Qt::CaseInsensitive) == 0) {
|
|
valid = true;
|
|
}
|
|
- } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) {
|
|
+ } else if (attr.name().compare(QString("Version"), Qt::CaseInsensitive) == 0) {
|
|
version = attr.value().toString().toDouble();
|
|
}
|
|
}
|
|
@@ -95,9 +95,9 @@ tef_header(xg_string args, const QXmlStreamAttributes* attrv)
|
|
{
|
|
route = route_head_alloc();
|
|
foreach(QXmlStreamAttribute attr, *attrv) {
|
|
- if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) {
|
|
+ if (attr.name().compare(QString("Name"), Qt::CaseInsensitive) == 0) {
|
|
route->rte_name = attr.value().toString().trimmed();
|
|
- } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) {
|
|
+ } else if (attr.name().compare(QString("Software"), Qt::CaseInsensitive) == 0) {
|
|
route->rte_desc = attr.value().toString().trimmed();
|
|
}
|
|
}
|
|
@@ -248,20 +248,20 @@ tef_item_start(xg_string args, const QXmlStreamAttributes* attrv)
|
|
QString attrstr = attr.value().toString();
|
|
QByteArray attrtext = attrstr.toUtf8();
|
|
|
|
- if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) {
|
|
+ if (attr.name().compare(QString("SegDescription"), Qt::CaseInsensitive) == 0) {
|
|
wpt_tmp->shortname = attrstr.trimmed();
|
|
- } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) {
|
|
+ } else if (attr.name().compare(QString("PointDescription"), Qt::CaseInsensitive) == 0) {
|
|
wpt_tmp->description = attrstr.trimmed();
|
|
- } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 &&
|
|
- attr.value().compare("true", Qt::CaseInsensitive) == 0) {
|
|
+ } else if (attr.name().compare(QString("ViaStation"), Qt::CaseInsensitive) == 0 &&
|
|
+ attr.value().compare(QString("true"), Qt::CaseInsensitive) == 0) {
|
|
wpt_tmp->wpt_flags.fmt_use = 1; /* only a flag */
|
|
|
|
/* new in TEF V2 */
|
|
- } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) {
|
|
+ } else if (attr.name().compare(QString("Instruction"), Qt::CaseInsensitive) == 0) {
|
|
wpt_tmp->description = attrstr.trimmed();
|
|
- } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) {
|
|
+ } else if (attr.name().compare(QString("Altitude"), Qt::CaseInsensitive) == 0) {
|
|
wpt_tmp->altitude = attrstr.toDouble();
|
|
- } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) {
|
|
+ } else if (attr.name().compare(QString("TimeStamp"), Qt::CaseInsensitive) == 0) {
|
|
/* nothing for the moment */
|
|
}
|
|
}
|
|
--
|
|
2.16.1
|
|
|