Attachment #216262 for bug #237733





PORTNAME=	gpsbabel
DISTVERSIONPREFIX=	${PORTNAME}_
DISTVERSION=	1_6_0
PORTREVISION=	4
CATEGORIES=	astro geography

MAINTAINER=	dev2@heesakkers.info

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

# Unbundle libminizip
LIB_DEPENDS=	libminizip.so:archivers/minizip

USE_GITHUB=	yes

CONFLICTS=	gpsbabel14-[0-9]*

USES=		compiler:c++11-lang gmake localbase qt:5
USE_QT=		core
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-zlib=system


OPTIONS_SUB=	yes

GUI_ALL_TARGET=	gui
GUI_USE=	QT=qmake_build,gui,xml,network,webkit
GUI_USE+=	QT=linguisttools_build,webengine,buildtools
GUI_VARS=	MAKE_JOBS_UNSAFE=yes
GUI_QMAKE_SOURCE_PATH= ${WRKSRC}/gui

do-build:
	(cd ${WRKSRC}; ${CONFIGURE_CMD} --with-zlib-system; ${GMAKE})
do-build-GUI-on:
	(cd ${WRKSRC}/gui; ${QMAKE} USE_GUI=qt5; ${LRELEASE} *.ts; ${GMAKE})

post-patch:
	@${REINPLACE_CMD} '/langPath_ = / \
		s|QApplication::applicationDirPath()|"${DATADIR}"|' \

	${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/

do-install-GUI-on:
	${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe \
		${STAGEDIR}${PREFIX}/bin/
	${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \
		${STAGEDIR}${PREFIX}/share/applications/

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1523450580	1	TIMESTAMP = 1559490562
2	SHA256 (gpsbabel-gpsbabel-gpsbabel_1_5_4_GH0.tar.gz) = 8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704	2	SHA256 (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090
3	SIZE (gpsbabel-gpsbabel-gpsbabel_1_5_4_GH0.tar.gz) = 9121510	3	SIZE (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = 14098867




--- Makefile.in.orig	2016-01-03 02:09:17 UTC
+++ Makefile.in
@@ -148,10 +148,10 @@ toolinfo
 all: gpsbabel$(EXEEXT)
 
 gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ 
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -lminizip @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
 
 gpsbabel-debug: $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -lminizip @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
 
 Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
 	  gbversion.h.in gui/setup.iss.in




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;
     }

Lines 1-11 Link Here

(-)files/patch-garmin__device__xml.cc (-11 lines)
1	--- garmin_device_xml.cc.orig 2018-04-11 18:10:39 UTC
2	+++ garmin_device_xml.cc
3	@@ -41,7 +41,7 @@ jmp_buf gdx_jmp_buf;
4
5	void type_s(xg_string args, const QXmlStreamAttributes*)
6	{
7	- type = args.compare("GPSData");
8	+ type = args.compare(QLatin1String("GPSData"));
9	}
10
11	void device_s(xg_string args, const QXmlStreamAttributes*)




--- gpx.cc.orig	2018-04-11 18:10:39 UTC
+++ gpx.cc
@@ -494,7 +494,7 @@
 {
   cache_descr_is_html = 0;
   if (attr.hasAttribute("html")) {
-    if (attr.value("html").toString().compare("True") == 0) {
+    if (attr.value("html").compare(QLatin1String("True")) == 0) {
       cache_descr_is_html = 1;
     }
   }
@@ -509,16 +509,16 @@
     gc_data->id = attr.value("id").toString().toInt();
   }
   if (attr.hasAttribute("available")) {
-    if (attr.value("available").toString().compare("True", Qt::CaseInsensitive) == 0) {
+    if (attr.value("available").compare(QLatin1String("True"), Qt::CaseInsensitive) == 0) {
       gc_data->is_available = status_true;
-    } else if (attr.value("available").toString().compare("False", Qt::CaseInsensitive) == 0) {
+    } else if (attr.value("available").compare(QLatin1String("False"), Qt::CaseInsensitive) == 0) {
       gc_data->is_available = status_false;
     }
   }
   if (attr.hasAttribute("archived")) {
-    if (attr.value("archived").toString().compare("True", Qt::CaseInsensitive) == 0) {
+    if (attr.value("archived").compare(QLatin1String("True"), Qt::CaseInsensitive) == 0) {
       gc_data->is_archived = status_true;
-    } else if (attr.value("archived").toString().compare("False", Qt::CaseInsensitive) == 0) {
+    } else if (attr.value("archived").compare(QLatin1String("False"), Qt::CaseInsensitive) == 0) {
       gc_data->is_archived = status_false;
     }
   }
@@ -972,7 +972,7 @@
      * last date we saw in this log.
      */
   case tt_cache_log_type:
-    if ((cdatastr.compare("Found it") == 0) &&
+    if ((cdatastr.compare(QLatin1String("Found it")) == 0) &&
         (0 == wpt_tmp->gc_data->last_found.toTime_t())) {
       wpt_tmp->AllocGCData()->last_found = gc_log_date;
     }
@@ -1423,7 +1423,7 @@
         fprint_xml_chain(tag->child, wpt);
       }
       if (wpt && wpt->gc_data->exported.isValid() &&
-          tag->tagname.compare("groundspeak:cache") == 0) {
+          tag->tagname.compare(QLatin1String("groundspeak:cache")) == 0) {
         writer->writeTextElement("time",
                                  wpt->gc_data->exported.toPrettyString());
       }

Line 0 Link Here

(-)files/patch-gui_gpsbabel.desktop (+10 lines)
	1	--- gui/gpsbabel.desktop.orig 2020-07-06 17:33:15 UTC
	2	+++ gui/gpsbabel.desktop
	3	@@ -4,6 +4,6 @@ Name=GPSBabel
	4	Comment=Qt GUI interface for GPSBabel
	5	GenericName=GPSBabel
	6	Icon=gpsbabel
	7	-Exec=gpsbabelfe-bin
	8	+Exec=gpsbabelfe
	9	Terminal=false
	10	Categories=Geography;Education;Utility;




--- jeeps/gpslibusb.cc.orig	2016-01-03 02:09:17 UTC
+++ jeeps/gpslibusb.cc
@@ -20,8 +20,8 @@
  */
 
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <ctype.h>
 #if HAVE_CONFIG_H
 #include "config.h"

Lines 1-11 Link Here

(-)files/patch-lowranceusr.cc (-11 lines)
1	--- lowranceusr.cc.orig 2018-04-11 18:16:00 UTC
2	+++ lowranceusr.cc
3	@@ -767,7 +767,7 @@ lowranceusr_waypt_disp(const Waypoint* w
4
5	gbfputint32(Time, file_out);
6
7	- if (get_cache_icon(wpt) && wpt->icon_descr.compare("Geocache Found") == 0) {
8	+ if (get_cache_icon(wpt) && wpt->icon_descr.compare(QLatin1String("Geocache Found")) == 0) {
9	SymbolId = lowranceusr_find_icon_number_from_desc(get_cache_icon(wpt));
10	} else {
11	SymbolId = lowranceusr_find_icon_number_from_desc(wpt->icon_descr);




--- magproto.cc.orig	2018-04-11 18:16:46 UTC
+++ magproto.cc
@@ -819,11 +819,11 @@ mag_rd_init_common(const QString& portna
    */
   QString exten = QFileInfo(curfname).suffix();
   if (exten.length() > 0) {
-    if (0 == exten.compare("upt", Qt::CaseInsensitive)) {
+    if (0 == exten.compare(QLatin1String("upt"), Qt::CaseInsensitive)) {
       extension_hint = WPTDATAMASK;
-    } else if (0 == exten.compare("log", Qt::CaseInsensitive)) {
+    } else if (0 == exten.compare(QLatin1String("log"), Qt::CaseInsensitive)) {
       extension_hint = TRKDATAMASK;
-    } else if (0 == exten.compare("rte", Qt::CaseInsensitive)) {
+    } else if (0 == exten.compare(QLatin1String("rte"), Qt::CaseInsensitive)) {
       extension_hint = RTEDATAMASK;
     }
   }

Lines 1-11 Link Here

(-)files/patch-psitrex.cc (-11 lines)
1	--- psitrex.cc.orig 2018-04-11 18:17:53 UTC
2	+++ psitrex.cc
3	@@ -363,7 +363,7 @@ psit_waypoint_w(gbfile* psit_file, const
4
5	icon = gt_find_icon_number_from_desc(wpt->icon_descr, PCX);
6
7	- if (get_cache_icon(wpt) && wpt->icon_descr.compare("Geocache Found") != 0) {
8	+ if (get_cache_icon(wpt) && wpt->icon_descr.compare(QLatin1String("Geocache Found")) != 0) {
9	icon = gt_find_icon_number_from_desc(get_cache_icon(wpt), PCX);
10	}
11

Lines 1-11 Link Here

(-)files/patch-src_core_ziparchive.cc (-11 lines)
1	--- src/core/ziparchive.cc.orig 2016-01-03 02:09:17 UTC
2	+++ src/core/ziparchive.cc
3	@@ -23,7 +23,7 @@
4
5	#include "defs.h"
6	#include "src/core/logging.h"
7	-#include "zlib/contrib/minizip/zip.h"
8	+#include <minizip/zip.h>
9
10	#include <QtCore/QFile>
11	#include <QtCore/QDebug>

Lines 1-11 Link Here

(-)files/patch-src_core_ziparchive.h (-11 lines)
1	--- src/core/ziparchive.h.orig 2016-01-03 02:09:17 UTC
2	+++ src/core/ziparchive.h
3	@@ -21,7 +21,7 @@
4
5	#include <QtCore/QString>
6	#include <QtCore/QStringList>
7	-#include "zlib/contrib/minizip/zip.h"
8	+#include <minizip/zip.h>
9
10	class ZipArchive
11	{




--- tef_xml.cc.orig	2018-04-11 18:10:39 UTC
+++ tef_xml.cc
@@ -72,11 +72,11 @@
   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(QLatin1String("Comment"), Qt::CaseInsensitive) == 0) {
+      if (attr.value().compare(QLatin1String("TourExchangeFormat"), Qt::CaseInsensitive) == 0) {
         valid = true;
       }
-    } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("Version"), Qt::CaseInsensitive) == 0) {
       version = attr.value().toString().toDouble();
     }
   }
@@ -95,9 +95,9 @@
 {
   route = route_head_alloc();
   foreach(QXmlStreamAttribute attr, *attrv) {
-    if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) {
+    if (attr.name().compare(QLatin1String("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(QLatin1String("Software"), Qt::CaseInsensitive) == 0) {
       route->rte_desc = attr.value().toString().trimmed();
     }
   }
@@ -248,20 +248,20 @@
     QString attrstr = attr.value().toString();
     QByteArray attrtext = attrstr.toUtf8();
 
-    if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) {
+    if (attr.name().compare(QLatin1String("SegDescription"), Qt::CaseInsensitive) == 0) {
       wpt_tmp->shortname = attrstr.trimmed();
-    } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("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(QLatin1String("ViaStation"), Qt::CaseInsensitive) == 0 &&
+               attr.value().compare(QLatin1String("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(QLatin1String("Instruction"), Qt::CaseInsensitive) == 0) {
       wpt_tmp->description = attrstr.trimmed();
-    } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("Altitude"), Qt::CaseInsensitive) == 0) {
       wpt_tmp->altitude = attrstr.toDouble();
-    } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) {
+    } else if (attr.name().compare(QLatin1String("TimeStamp"), Qt::CaseInsensitive) == 0) {
       /* nothing for the moment */
     }
   }




--- unicsv.cc.orig	2018-04-11 18:21:19 UTC
+++ unicsv.cc
@@ -430,13 +430,13 @@ unicsv_parse_time(const QString& str, in
 static status_type
 unicsv_parse_status(const QString& str)
 {
-  if (str.compare("true", Qt::CaseInsensitive) == 0 ||
-      str.compare("yes", Qt::CaseInsensitive) == 0 ||
+  if (str.compare(QLatin1String("true"), Qt::CaseInsensitive) == 0 ||
+      str.compare(QLatin1String("yes"), Qt::CaseInsensitive) == 0 ||
       str == "1") {
     return status_true;
   }
-  if (str.compare("false", Qt::CaseInsensitive) == 0 ||
-      str.compare("no", Qt::CaseInsensitive) == 0 ||
+  if (str.compare(QLatin1String("false"), Qt::CaseInsensitive) == 0 ||
+      str.compare(QLatin1String("no"), Qt::CaseInsensitive) == 0 ||
       str == "0") {
     return status_false;
   }

Lines 1-8 Link Here

(-)pkg-plist (-3 / +1 lines)
1	bin/gpsbabel	1	bin/gpsbabel
2	%%GUI%%bin/gpsbabelfe-bin	2	%%GUI%%bin/gpsbabelfe
3	%%GUI%%share/applications/gpsbabel.desktop	3	%%GUI%%share/applications/gpsbabel.desktop
4	%%GUI%%%%DATADIR%%/translations/gpsbabel.qm
5	%%GUI%%%%DATADIR%%/translations/gpsbabelfe.qm
6	%%GUI%%%%DATADIR%%/translations/gpsbabelfe_de.qm	4	%%GUI%%%%DATADIR%%/translations/gpsbabelfe_de.qm
7	%%GUI%%%%DATADIR%%/translations/gpsbabelfe_es.qm	5	%%GUI%%%%DATADIR%%/translations/gpsbabelfe_es.qm
8	%%GUI%%%%DATADIR%%/translations/gpsbabelfe_fr.qm	6	%%GUI%%%%DATADIR%%/translations/gpsbabelfe_fr.qm

Return to bug 237733

Lines 3-10 Link Here

(-)Makefile (-9 / +11 lines)
3		3
4	PORTNAME= gpsbabel	4	PORTNAME= gpsbabel
5	DISTVERSIONPREFIX= ${PORTNAME}_	5	DISTVERSIONPREFIX= ${PORTNAME}_
6	DISTVERSION= 1_5_4	6	DISTVERSION= 1_6_0
7	PORTREVISION= 4
8	CATEGORIES= astro geography	7	CATEGORIES= astro geography
9		8
10	MAINTAINER= dev2@heesakkers.info	9	MAINTAINER= dev2@heesakkers.info
Lines 13-27 Link Here
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	# Unbundle libminizip
17	LIB_DEPENDS= libminizip.so:archivers/minizip
18
19	USE_GITHUB= yes	15	USE_GITHUB= yes
20		16
21	CONFLICTS= gpsbabel14-[0-9]*	17	CONFLICTS= gpsbabel14-[0-9]*
22		18
23	USES= compiler:c++11-lang localbase qt:5	19	USES= compiler:c++11-lang gmake localbase qt:5
24	USE_QT= core qmake_build	20	USE_QT= core
25	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
26	CONFIGURE_ARGS= --with-zlib=system	22	CONFIGURE_ARGS= --with-zlib=system
27		23
Lines 29-38 Link Here
29	OPTIONS_SUB= yes	25	OPTIONS_SUB= yes
30		26
31	GUI_ALL_TARGET= gui	27	GUI_ALL_TARGET= gui
32	GUI_USE= QT=gui,xml,network,webkit	28	GUI_USE= QT=qmake_build,gui,xml,network,webkit
33	GUI_USE+= QT=linguisttools_build,webengine,buildtools	29	GUI_USE+= QT=linguisttools_build,webengine,buildtools
34	GUI_VARS= MAKE_JOBS_UNSAFE=yes	30	GUI_VARS= MAKE_JOBS_UNSAFE=yes
		31	GUI_QMAKE_SOURCE_PATH= ${WRKSRC}/gui
35		32
		33	do-build:
		34	(cd ${WRKSRC}; ${CONFIGURE_CMD} --with-zlib-system; ${GMAKE})
		35	do-build-GUI-on:
		36	(cd ${WRKSRC}/gui; ${QMAKE} USE_GUI=qt5; ${LRELEASE} *.ts; ${GMAKE})
		37
36	post-patch:	38	post-patch:
37	@${REINPLACE_CMD} '/langPath_ = / \	39	@${REINPLACE_CMD} '/langPath_ = / \
38	s\|QApplication::applicationDirPath()\|"${DATADIR}"\|' \	40	s\|QApplication::applicationDirPath()\|"${DATADIR}"\|' \
Lines 43-49 Link Here
43	${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/	45	${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/
44		46
45	do-install-GUI-on:	47	do-install-GUI-on:
46	${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe-bin \	48	${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe \
47	${STAGEDIR}${PREFIX}/bin/	49	${STAGEDIR}${PREFIX}/bin/
48	${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \	50	${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \
49	${STAGEDIR}${PREFIX}/share/applications/	51	${STAGEDIR}${PREFIX}/share/applications/

Lines 1-15 Link Here

(-)files/patch-Makefile.in (-15 lines)
1	--- Makefile.in.orig 2016-01-03 02:09:17 UTC
2	+++ Makefile.in
3	@@ -148,10 +148,10 @@ toolinfo
4	all: gpsbabel$(EXEEXT)
5
6	gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
7	- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
8	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -lminizip @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
9
10	gpsbabel-debug: $(OBJS)
11	- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
12	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -lminizip @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
13
14	Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
15	gbversion.h.in gui/setup.iss.in

Lines 1-22 Link Here

(-)files/patch-bushnell.cc (-22 lines)
1	https://github.com/gpsbabel/gpsbabel/issues/62
2
3	--- bushnell.cc.orig 2017-01-24 13:08:41 UTC
4	+++ bushnell.cc
5	@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name
6	name = "Waypoint";
7	}
8
9	- for (t = bushnell_icons; t->icon > 0; t++) {
10	+ for (t = bushnell_icons; t->icon != NULL; t++) {
11	if (0 == name.compare(t->icon, Qt::CaseInsensitive)) {
12	return t->symbol;
13	}
14	@@ -147,7 +147,7 @@ static const char*
15	bushnell_get_name_from_symbol(signed int s)
16	{
17	icon_mapping_t* t;
18	- for (t = bushnell_icons; t->icon > 0; t++) {
19	+ for (t = bushnell_icons; t->icon != NULL; t++) {
20	if (s == t->symbol) {
21	return t->icon;
22	}

Lines 1-50 Link Here

(-)files/patch-gpx.cc (-50 lines)
1	--- gpx.cc.orig 2018-04-11 18:10:39 UTC
2	+++ gpx.cc
3	@@ -494,7 +494,7 @@
4	{
5	cache_descr_is_html = 0;
6	if (attr.hasAttribute("html")) {
7	- if (attr.value("html").toString().compare("True") == 0) {
8	+ if (attr.value("html").compare(QLatin1String("True")) == 0) {
9	cache_descr_is_html = 1;
10	}
11	}
12	@@ -509,16 +509,16 @@
13	gc_data->id = attr.value("id").toString().toInt();
14	}
15	if (attr.hasAttribute("available")) {
16	- if (attr.value("available").toString().compare("True", Qt::CaseInsensitive) == 0) {
17	+ if (attr.value("available").compare(QLatin1String("True"), Qt::CaseInsensitive) == 0) {
18	gc_data->is_available = status_true;
19	- } else if (attr.value("available").toString().compare("False", Qt::CaseInsensitive) == 0) {
20	+ } else if (attr.value("available").compare(QLatin1String("False"), Qt::CaseInsensitive) == 0) {
21	gc_data->is_available = status_false;
22	}
23	}
24	if (attr.hasAttribute("archived")) {
25	- if (attr.value("archived").toString().compare("True", Qt::CaseInsensitive) == 0) {
26	+ if (attr.value("archived").compare(QLatin1String("True"), Qt::CaseInsensitive) == 0) {
27	gc_data->is_archived = status_true;
28	- } else if (attr.value("archived").toString().compare("False", Qt::CaseInsensitive) == 0) {
29	+ } else if (attr.value("archived").compare(QLatin1String("False"), Qt::CaseInsensitive) == 0) {
30	gc_data->is_archived = status_false;
31	}
32	}
33	@@ -972,7 +972,7 @@
34	* last date we saw in this log.
35	*/
36	case tt_cache_log_type:
37	- if ((cdatastr.compare("Found it") == 0) &&
38	+ if ((cdatastr.compare(QLatin1String("Found it")) == 0) &&
39	(0 == wpt_tmp->gc_data->last_found.toTime_t())) {
40	wpt_tmp->AllocGCData()->last_found = gc_log_date;
41	}
42	@@ -1423,7 +1423,7 @@
43	fprint_xml_chain(tag->child, wpt);
44	}
45	if (wpt && wpt->gc_data->exported.isValid() &&
46	- tag->tagname.compare("groundspeak:cache") == 0) {
47	+ tag->tagname.compare(QLatin1String("groundspeak:cache")) == 0) {
48	writer->writeTextElement("time",
49	wpt->gc_data->exported.toPrettyString());
50	}

Lines 1-13 Link Here

(-)files/patch-jeeps_gpslibusb.cc (-13 lines)
1	--- jeeps/gpslibusb.cc.orig 2016-01-03 02:09:17 UTC
2	+++ jeeps/gpslibusb.cc
3	@@ -20,8 +20,8 @@
4	*/
5
6
7	-#include <stdio.h>
8	-#include <stdlib.h>
9	+#include <cstdio>
10	+#include <cstdlib>
11	#include <ctype.h>
12	#if HAVE_CONFIG_H
13	#include "config.h"

Lines 1-17 Link Here

(-)files/patch-magproto.cc (-17 lines)
1	--- magproto.cc.orig 2018-04-11 18:16:46 UTC
2	+++ magproto.cc
3	@@ -819,11 +819,11 @@ mag_rd_init_common(const QString& portna
4	*/
5	QString exten = QFileInfo(curfname).suffix();
6	if (exten.length() > 0) {
7	- if (0 == exten.compare("upt", Qt::CaseInsensitive)) {
8	+ if (0 == exten.compare(QLatin1String("upt"), Qt::CaseInsensitive)) {
9	extension_hint = WPTDATAMASK;
10	- } else if (0 == exten.compare("log", Qt::CaseInsensitive)) {
11	+ } else if (0 == exten.compare(QLatin1String("log"), Qt::CaseInsensitive)) {
12	extension_hint = TRKDATAMASK;
13	- } else if (0 == exten.compare("rte", Qt::CaseInsensitive)) {
14	+ } else if (0 == exten.compare(QLatin1String("rte"), Qt::CaseInsensitive)) {
15	extension_hint = RTEDATAMASK;
16	}
17	}

Lines 1-57 Link Here

(-)files/patch-tef_xml.cc (-57 lines)
1	--- tef_xml.cc.orig 2018-04-11 18:10:39 UTC
2	+++ tef_xml.cc
3	@@ -72,11 +72,11 @@
4	bool valid = false;
5
6	foreach(QXmlStreamAttribute attr, *attrv) {
7	- if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) {
8	- if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) {
9	+ if (attr.name().compare(QLatin1String("Comment"), Qt::CaseInsensitive) == 0) {
10	+ if (attr.value().compare(QLatin1String("TourExchangeFormat"), Qt::CaseInsensitive) == 0) {
11	valid = true;
12	}
13	- } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) {
14	+ } else if (attr.name().compare(QLatin1String("Version"), Qt::CaseInsensitive) == 0) {
15	version = attr.value().toString().toDouble();
16	}
17	}
18	@@ -95,9 +95,9 @@
19	{
20	route = route_head_alloc();
21	foreach(QXmlStreamAttribute attr, *attrv) {
22	- if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) {
23	+ if (attr.name().compare(QLatin1String("Name"), Qt::CaseInsensitive) == 0) {
24	route->rte_name = attr.value().toString().trimmed();
25	- } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) {
26	+ } else if (attr.name().compare(QLatin1String("Software"), Qt::CaseInsensitive) == 0) {
27	route->rte_desc = attr.value().toString().trimmed();
28	}
29	}
30	@@ -248,20 +248,20 @@
31	QString attrstr = attr.value().toString();
32	QByteArray attrtext = attrstr.toUtf8();
33
34	- if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) {
35	+ if (attr.name().compare(QLatin1String("SegDescription"), Qt::CaseInsensitive) == 0) {
36	wpt_tmp->shortname = attrstr.trimmed();
37	- } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) {
38	+ } else if (attr.name().compare(QLatin1String("PointDescription"), Qt::CaseInsensitive) == 0) {
39	wpt_tmp->description = attrstr.trimmed();
40	- } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 &&
41	- attr.value().compare("true", Qt::CaseInsensitive) == 0) {
42	+ } else if (attr.name().compare(QLatin1String("ViaStation"), Qt::CaseInsensitive) == 0 &&
43	+ attr.value().compare(QLatin1String("true"), Qt::CaseInsensitive) == 0) {
44	wpt_tmp->wpt_flags.fmt_use = 1; /* only a flag */
45
46	/* new in TEF V2 */
47	- } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) {
48	+ } else if (attr.name().compare(QLatin1String("Instruction"), Qt::CaseInsensitive) == 0) {
49	wpt_tmp->description = attrstr.trimmed();
50	- } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) {
51	+ } else if (attr.name().compare(QLatin1String("Altitude"), Qt::CaseInsensitive) == 0) {
52	wpt_tmp->altitude = attrstr.toDouble();
53	- } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) {
54	+ } else if (attr.name().compare(QLatin1String("TimeStamp"), Qt::CaseInsensitive) == 0) {
55	/* nothing for the moment */
56	}
57	}

Lines 1-20 Link Here

(-)files/patch-unicsv.cc (-20 lines)
1	--- unicsv.cc.orig 2018-04-11 18:21:19 UTC
2	+++ unicsv.cc
3	@@ -430,13 +430,13 @@ unicsv_parse_time(const QString& str, in
4	static status_type
5	unicsv_parse_status(const QString& str)
6	{
7	- if (str.compare("true", Qt::CaseInsensitive) == 0 \|\|
8	- str.compare("yes", Qt::CaseInsensitive) == 0 \|\|
9	+ if (str.compare(QLatin1String("true"), Qt::CaseInsensitive) == 0 \|\|
10	+ str.compare(QLatin1String("yes"), Qt::CaseInsensitive) == 0 \|\|
11	str == "1") {
12	return status_true;
13	}
14	- if (str.compare("false", Qt::CaseInsensitive) == 0 \|\|
15	- str.compare("no", Qt::CaseInsensitive) == 0 \|\|
16	+ if (str.compare(QLatin1String("false"), Qt::CaseInsensitive) == 0 \|\|
17	+ str.compare(QLatin1String("no"), Qt::CaseInsensitive) == 0 \|\|
18	str == "0") {
19	return status_false;
20	}