Hello community, here is the log from the commit of package gpsbabel for openSUSE:Factory checked in at 2017-06-16 10:54:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpsbabel (Old) and /work/SRC/openSUSE:Factory/.gpsbabel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpsbabel" Fri Jun 16 10:54:41 2017 rev:33 rq:503934 version:1.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/gpsbabel/gpsbabel.changes 2017-04-18 13:50:34.688943175 +0200 +++ /work/SRC/openSUSE:Factory/.gpsbabel.new/gpsbabel.changes 2017-06-16 10:54:44.903794438 +0200 @@ -1,0 +2,8 @@ +Thu Jun 15 10:14:56 UTC 2017 - [email protected] + +- Add 0008-Fix-QString-casting-build-failures.patch from upstream + (at least, part of the upstream patch, since the original patch + included other unrelated changes) to build failures due to + implicit casting to QString. + +------------------------------------------------------------------- New: ---- 0008-Fix-QString-casting-build-failures.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpsbabel.spec ++++++ --- /var/tmp/diff_new_pack.tuq49W/_old 2017-06-16 10:54:45.867658751 +0200 +++ /var/tmp/diff_new_pack.tuq49W/_new 2017-06-16 10:54:45.871658188 +0200 @@ -38,6 +38,8 @@ Patch6: 0006-Use-system-zlib.patch # Use system minizip Patch7: 0007-Use-system-minizip.patch +# Fix build failures due to implicit QString casting +Patch8: 0008-Fix-QString-casting-build-failures.patch BuildRequires: autoconf BuildRequires: libqt5-qtbase-devel BuildRequires: libudev-devel @@ -92,6 +94,7 @@ %patch4 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # Get rid of bundled zlib # configure --with-zlib=system is not enough, ++++++ 0008-Fix-QString-casting-build-failures.patch ++++++ Part of the upstream patch: >From 604178aa8ad4d3c3ad218df24c1e9a6a1f683bb3 Mon Sep 17 00:00:00 2001 From: Harel Mazor <[email protected]> Date: Tue, 24 Jan 2017 00:35:04 +0200 Subject: [PATCH] Added geojson read capablity, moved magic strings to constants, fixed windows compilation issues. --- GPSBabel.pro | 4 +- geojson.cc | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- mtk_logger.cc | 5 ++ tef_xml.cc | 24 +++---- 4 files changed, 200 insertions(+), 41 deletions(-) diff --git a/tef_xml.cc b/tef_xml.cc index b32d69b3..37dd85ba 100644 --- 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 */ } }
