Index: astro/gpsbabel/Makefile =================================================================== --- astro/gpsbabel/Makefile (révision 540826) +++ astro/gpsbabel/Makefile (copie de travail) @@ -3,8 +3,7 @@ PORTNAME= gpsbabel DISTVERSIONPREFIX= ${PORTNAME}_ -DISTVERSION= 1_5_4 -PORTREVISION= 4 +DISTVERSION= 1_6_0 CATEGORIES= astro geography MAINTAINER= dev2@heesakkers.info @@ -13,15 +12,12 @@ 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 localbase qt:5 -USE_QT= core qmake_build +USES= compiler:c++11-lang gmake localbase qt:5 +USE_QT= core GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-zlib=system @@ -29,10 +25,16 @@ OPTIONS_SUB= yes GUI_ALL_TARGET= gui -GUI_USE= QT=gui,xml,network,webkit +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}"|' \ @@ -43,7 +45,7 @@ ${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/ do-install-GUI-on: - ${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe-bin \ + ${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe \ ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ Index: astro/gpsbabel/distinfo =================================================================== --- astro/gpsbabel/distinfo (révision 540826) +++ astro/gpsbabel/distinfo (copie de travail) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523450580 -SHA256 (gpsbabel-gpsbabel-gpsbabel_1_5_4_GH0.tar.gz) = 8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704 -SIZE (gpsbabel-gpsbabel-gpsbabel_1_5_4_GH0.tar.gz) = 9121510 +TIMESTAMP = 1593459765 +SHA256 (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090 +SIZE (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = 14098867 Index: astro/gpsbabel/files/patch-Makefile.in =================================================================== --- astro/gpsbabel/files/patch-Makefile.in (révision 540826) +++ astro/gpsbabel/files/patch-Makefile.in (nonexistent) @@ -1,15 +0,0 @@ ---- 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 Property changes on: astro/gpsbabel/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-bushnell.cc =================================================================== --- astro/gpsbabel/files/patch-bushnell.cc (révision 540826) +++ astro/gpsbabel/files/patch-bushnell.cc (nonexistent) @@ -1,22 +0,0 @@ -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; - } Property changes on: astro/gpsbabel/files/patch-bushnell.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-garmin__device__xml.cc =================================================================== --- astro/gpsbabel/files/patch-garmin__device__xml.cc (révision 540826) +++ astro/gpsbabel/files/patch-garmin__device__xml.cc (nonexistent) @@ -1,11 +0,0 @@ ---- garmin_device_xml.cc.orig 2018-04-11 18:10:39 UTC -+++ garmin_device_xml.cc -@@ -41,7 +41,7 @@ jmp_buf gdx_jmp_buf; - - void type_s(xg_string args, const QXmlStreamAttributes*) - { -- type = args.compare("GPSData"); -+ type = args.compare(QLatin1String("GPSData")); - } - - void device_s(xg_string args, const QXmlStreamAttributes*) Property changes on: astro/gpsbabel/files/patch-garmin__device__xml.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-gpx.cc =================================================================== --- astro/gpsbabel/files/patch-gpx.cc (révision 540826) +++ astro/gpsbabel/files/patch-gpx.cc (nonexistent) @@ -1,50 +0,0 @@ ---- 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()); - } Property changes on: astro/gpsbabel/files/patch-gpx.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-jeeps_gpslibusb.cc =================================================================== --- astro/gpsbabel/files/patch-jeeps_gpslibusb.cc (révision 540826) +++ astro/gpsbabel/files/patch-jeeps_gpslibusb.cc (nonexistent) @@ -1,13 +0,0 @@ ---- jeeps/gpslibusb.cc.orig 2016-01-03 02:09:17 UTC -+++ jeeps/gpslibusb.cc -@@ -20,8 +20,8 @@ - */ - - --#include --#include -+#include -+#include - #include - #if HAVE_CONFIG_H - #include "config.h" Property changes on: astro/gpsbabel/files/patch-jeeps_gpslibusb.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-lowranceusr.cc =================================================================== --- astro/gpsbabel/files/patch-lowranceusr.cc (révision 540826) +++ astro/gpsbabel/files/patch-lowranceusr.cc (nonexistent) @@ -1,11 +0,0 @@ ---- lowranceusr.cc.orig 2018-04-11 18:16:00 UTC -+++ lowranceusr.cc -@@ -767,7 +767,7 @@ lowranceusr_waypt_disp(const Waypoint* w - - gbfputint32(Time, file_out); - -- if (get_cache_icon(wpt) && wpt->icon_descr.compare("Geocache Found") == 0) { -+ if (get_cache_icon(wpt) && wpt->icon_descr.compare(QLatin1String("Geocache Found")) == 0) { - SymbolId = lowranceusr_find_icon_number_from_desc(get_cache_icon(wpt)); - } else { - SymbolId = lowranceusr_find_icon_number_from_desc(wpt->icon_descr); Property changes on: astro/gpsbabel/files/patch-lowranceusr.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-magproto.cc =================================================================== --- astro/gpsbabel/files/patch-magproto.cc (révision 540826) +++ astro/gpsbabel/files/patch-magproto.cc (nonexistent) @@ -1,17 +0,0 @@ ---- 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; - } - } Property changes on: astro/gpsbabel/files/patch-magproto.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-psitrex.cc =================================================================== --- astro/gpsbabel/files/patch-psitrex.cc (révision 540826) +++ astro/gpsbabel/files/patch-psitrex.cc (nonexistent) @@ -1,11 +0,0 @@ ---- psitrex.cc.orig 2018-04-11 18:17:53 UTC -+++ psitrex.cc -@@ -363,7 +363,7 @@ psit_waypoint_w(gbfile* psit_file, const - - icon = gt_find_icon_number_from_desc(wpt->icon_descr, PCX); - -- if (get_cache_icon(wpt) && wpt->icon_descr.compare("Geocache Found") != 0) { -+ if (get_cache_icon(wpt) && wpt->icon_descr.compare(QLatin1String("Geocache Found")) != 0) { - icon = gt_find_icon_number_from_desc(get_cache_icon(wpt), PCX); - } - Property changes on: astro/gpsbabel/files/patch-psitrex.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-src_core_ziparchive.cc =================================================================== --- astro/gpsbabel/files/patch-src_core_ziparchive.cc (révision 540826) +++ astro/gpsbabel/files/patch-src_core_ziparchive.cc (nonexistent) @@ -1,11 +0,0 @@ ---- src/core/ziparchive.cc.orig 2016-01-03 02:09:17 UTC -+++ src/core/ziparchive.cc -@@ -23,7 +23,7 @@ - - #include "defs.h" - #include "src/core/logging.h" --#include "zlib/contrib/minizip/zip.h" -+#include - - #include - #include Property changes on: astro/gpsbabel/files/patch-src_core_ziparchive.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-src_core_ziparchive.h =================================================================== --- astro/gpsbabel/files/patch-src_core_ziparchive.h (révision 540826) +++ astro/gpsbabel/files/patch-src_core_ziparchive.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/core/ziparchive.h.orig 2016-01-03 02:09:17 UTC -+++ src/core/ziparchive.h -@@ -21,7 +21,7 @@ - - #include - #include --#include "zlib/contrib/minizip/zip.h" -+#include - - class ZipArchive - { Property changes on: astro/gpsbabel/files/patch-src_core_ziparchive.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-tef_xml.cc =================================================================== --- astro/gpsbabel/files/patch-tef_xml.cc (révision 540826) +++ astro/gpsbabel/files/patch-tef_xml.cc (nonexistent) @@ -1,57 +0,0 @@ ---- 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 */ - } - } Property changes on: astro/gpsbabel/files/patch-tef_xml.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/files/patch-unicsv.cc =================================================================== --- astro/gpsbabel/files/patch-unicsv.cc (révision 540826) +++ astro/gpsbabel/files/patch-unicsv.cc (nonexistent) @@ -1,20 +0,0 @@ ---- 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; - } Property changes on: astro/gpsbabel/files/patch-unicsv.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: astro/gpsbabel/pkg-plist =================================================================== --- astro/gpsbabel/pkg-plist (révision 540826) +++ astro/gpsbabel/pkg-plist (copie de travail) @@ -1,8 +1,6 @@ bin/gpsbabel -%%GUI%%bin/gpsbabelfe-bin +%%GUI%%bin/gpsbabelfe %%GUI%%share/applications/gpsbabel.desktop -%%GUI%%%%DATADIR%%/translations/gpsbabel.qm -%%GUI%%%%DATADIR%%/translations/gpsbabelfe.qm %%GUI%%%%DATADIR%%/translations/gpsbabelfe_de.qm %%GUI%%%%DATADIR%%/translations/gpsbabelfe_es.qm %%GUI%%%%DATADIR%%/translations/gpsbabelfe_fr.qm