commit: 52f7b74352b325b3980c4922e980701066c79a18 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Sep 25 11:15:08 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Sep 25 11:18:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f7b743
sci-geosciences/gpsbabel: Fix build with Qt-5.9 again Tested-by: Markus <M4rkusXXL <AT> web.de> Gentoo-bug: 629560 Package-Manager: Portage-2.3.10, Repoman-2.3.3 ...-qt-5.9.patch => gpsbabel-1.5.4-qt-5.9-1.patch} | 0 .../gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch | 70 ++++++++++++++++++++++ sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 16 ++--- 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch similarity index 100% rename from sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9.patch rename to sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch new file mode 100644 index 00000000000..ce1b0489146 --- /dev/null +++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch @@ -0,0 +1,70 @@ +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. + +--- + tef_xml.cc | 24 +++---- + +* Removed any unrelated changes except for s/windows/Qt-5.9/ compilation issues. + +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 */ + } + } diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild index 992aea9a44c..14286808591 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild @@ -43,14 +43,14 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} ) PATCHES=( - "${FILESDIR}/${PN}-1.4.3-fix_binary_name.patch" - "${FILESDIR}/${P}-disable_statistic_uploading.patch" - "${FILESDIR}/${P}-disable_update_check.patch" - "${FILESDIR}/${P}-disable_version_check.patch" - "${FILESDIR}/${P}-use_system_shapelib.patch" - "${FILESDIR}/${P}-use_system_zlib.patch" - "${FILESDIR}/${P}-xmldoc.patch" - "${FILESDIR}/${P}-qt-5.9.patch" + "${FILESDIR}"/${PN}-1.4.3-fix_binary_name.patch + "${FILESDIR}"/${P}-disable_statistic_uploading.patch + "${FILESDIR}"/${P}-disable_update_check.patch + "${FILESDIR}"/${P}-disable_version_check.patch + "${FILESDIR}"/${P}-use_system_shapelib.patch + "${FILESDIR}"/${P}-use_system_zlib.patch + "${FILESDIR}"/${P}-xmldoc.patch + "${FILESDIR}"/${P}-qt-5.9-{1,2}.patch ) RESTRICT="test" # bug 421699
