aboutsummaryrefslogtreecommitdiffstats
path: root/astro
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2017-01-25 00:38:22 +0800
committerjbeich <jbeich@FreeBSD.org>2017-01-25 00:38:22 +0800
commit59576a8c251f8a6a22b327e0cd093b31022de1b1 (patch)
treef04f12464d045cf87af45a02f7179d9371a0fe20 /astro
parent0153841609e98197bbc4d79cd18ced18bf61ce98 (diff)
downloadfreebsd-ports-gnome-59576a8c251f8a6a22b327e0cd093b31022de1b1.tar.gz
freebsd-ports-gnome-59576a8c251f8a6a22b327e0cd093b31022de1b1.tar.zst
freebsd-ports-gnome-59576a8c251f8a6a22b327e0cd093b31022de1b1.zip
astro/gpsbabel: unbreak with clang 4.0
bushnell.cc:138:36: error: ordered comparison between pointer and zero ('const char *' and 'int') for (t = bushnell_icons; t->icon > 0; t++) { ~~~~~~~ ^ ~ bushnell.cc:150:36: error: ordered comparison between pointer and zero ('const char *' and 'int') for (t = bushnell_icons; t->icon > 0; t++) { ~~~~~~~ ^ ~ PR: 216215 Submitted by: Oliver Heesakkers <dev2@heesakkers.info> (maintainer)
Diffstat (limited to 'astro')
-rw-r--r--astro/gpsbabel/files/patch-bushnell.cc22
1 files changed, 22 insertions, 0 deletions
diff --git a/astro/gpsbabel/files/patch-bushnell.cc b/astro/gpsbabel/files/patch-bushnell.cc
new file mode 100644
index 000000000000..4bb12c1f308a
--- /dev/null
+++ b/astro/gpsbabel/files/patch-bushnell.cc
@@ -0,0 +1,22 @@
+https://github.com/gpsbabel/gpsbabel/issues/62
+
+--- bushnell.cc.orig 2017-01-24 13:08:41 UTC
++++ bushnell.cc
+@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name
+ name = "Waypoint";
+ }
+
+- for (t = bushnell_icons; t->icon > 0; t++) {
++ for (t = bushnell_icons; t->icon != NULL; t++) {
+ if (0 == name.compare(t->icon, Qt::CaseInsensitive)) {
+ return t->symbol;
+ }
+@@ -147,7 +147,7 @@ static const char*
+ bushnell_get_name_from_symbol(signed int s)
+ {
+ icon_mapping_t* t;
+- for (t = bushnell_icons; t->icon > 0; t++) {
++ for (t = bushnell_icons; t->icon != NULL; t++) {
+ if (s == t->symbol) {
+ return t->icon;
+ }