[PR PATCH] gpsbabel: update to 1.6.0.

[PR PATCH] gpsbabel: update to 1.6.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

There is a new pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

gpsbabel: update to 1.6.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 12894 bytes --]

From ec078818a4e63f62fa40b95a7397da2a775f5357 Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.6.0.

---
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 138 +++++-------------
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |   6 +-
 4 files changed, 41 insertions(+), 192 deletions(-)
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
index 936962b9a5b..e1c4a74d6f4 100644
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ b/srcpkgs/gpsbabel/patches/drop-map.patch
@@ -1,29 +1,14 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_6_0/gui/advdlg.cc
+--- gui/advdlg.cc	2020-05-04 23:39:03.738105312 +0200
++++ gui/advdlg.cc	2020-05-04 23:44:04.766164086 +0200
+@@ -40 +39,0 @@ AdvDlg::AdvDlg(QWidget* parent,
 -  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
+@@ -53 +51,0 @@ void AdvDlg::acceptClicked()
 -  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/advui.ui gpsbabel-gpsbabel_1_6_0/gui/advui.ui
+--- gui/advui.ui	2020-05-04 23:39:03.775106180 +0200
++++ gui/advui.ui	2020-05-04 23:47:11.582544723 +0200
+@@ -41,7 +40,0 @@
 -    <widget class="QCheckBox" name="previewGmap">
 -     <property name="text">
 -      <string>Preview in Google Maps</string>
@@ -31,79 +16,36 @@ diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui
 -    </widget>
 -   </item>
 -   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/app.pro gpsbabel-gpsbabel_1_6_0/gui/app.pro
+--- gui/app.pro	2020-05-04 23:39:03.789106508 +0200
++++ gui/app.pro	2020-05-06 00:23:30.656766820 +0200
+@@ -14,8 +14,2 @@ QT += core \
+-      xml
 -
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
+-qtHaveModule(webenginewidgets) {
+-  QT += webenginewidgets webchannel
 -  DEFINES += HAVE_WEBENGINE
 -} else {
 -  QT += webkit webkitwidgets 
 -}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
++      xml \
++      widgets 
+@@ -75 +68,0 @@ SOURCES += formatload.cc
 -SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
+@@ -81 +73,0 @@ SOURCES += mainwindow.cc
 -SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
+@@ -101 +92,0 @@ HEADERS += formatload.h
 -HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
+@@ -105 +95,0 @@ HEADERS += mainwindow.h
 -HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
+@@ -135 +124,0 @@ macx|linux{
+-
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_6_0/gui/mainwindow.cc
+--- gui/mainwindow.cc	2020-05-04 23:39:04.890132326 +0200
++++ gui/mainwindow.cc	2020-05-04 23:56:17.126337120 +0200
+@@ -65 +64,0 @@
+-#include "gmapdlg.h"                   // for GMapDialog
+@@ -1030,18 +1028,0 @@ void MainWindow::applyActionX()
 -  // Now output for preview in google maps
 -  QString tempName;
 -  if (babelData_.previewGmap_) {
@@ -122,22 +64,18 @@ diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_
 -    args << "-F" << tempName;
 -  }
 -
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
+@@ -1059,8 +1039,0 @@ void MainWindow::applyActionX()
 -    if (babelData_.previewGmap_) {
 -      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
+-      GMapDialog dlg(nullptr, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : nullptr);
 -      dlg.show();
 -      dlg.exec();
 -      QFile(tempName).remove();
 -      this->show();
 -    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/gpsbabel.desktop gpsbabel-gpsbabel_1_6_0/gui/gpsbabel.desktop
+--- gui/gpsbabel.desktop	2020-05-04 23:39:04.417121234 +0200
++++ gui/gpsbabel.desktop	2020-05-06 01:24:41.000713345 +0200
+@@ -7 +7 @@ Icon=gpsbabel
+-Exec=gpsbabelfe-bin
++Exec=gpsbabelfe
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..6103e671975 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,6 +1,6 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.6.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090
 
 replaces="gpsbabel-gui>=0"
 
@@ -38,7 +38,7 @@ do_build() {
 do_install() {
 	make install DESTDIR=${DESTDIR}
 	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: gpsbabel: update to 1.6.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-624916518

Comment:
How can I fix this cross compile error?

Re: [PR PATCH] [Updated] gpsbabel: update to 1.6.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

There is an updated pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

gpsbabel: update to 1.6.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 12894 bytes --]

From ec078818a4e63f62fa40b95a7397da2a775f5357 Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.6.0.

---
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 138 +++++-------------
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |   6 +-
 4 files changed, 41 insertions(+), 192 deletions(-)
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
index 936962b9a5b..e1c4a74d6f4 100644
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ b/srcpkgs/gpsbabel/patches/drop-map.patch
@@ -1,29 +1,14 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_6_0/gui/advdlg.cc
+--- gui/advdlg.cc	2020-05-04 23:39:03.738105312 +0200
++++ gui/advdlg.cc	2020-05-04 23:44:04.766164086 +0200
+@@ -40 +39,0 @@ AdvDlg::AdvDlg(QWidget* parent,
 -  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
+@@ -53 +51,0 @@ void AdvDlg::acceptClicked()
 -  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/advui.ui gpsbabel-gpsbabel_1_6_0/gui/advui.ui
+--- gui/advui.ui	2020-05-04 23:39:03.775106180 +0200
++++ gui/advui.ui	2020-05-04 23:47:11.582544723 +0200
+@@ -41,7 +40,0 @@
 -    <widget class="QCheckBox" name="previewGmap">
 -     <property name="text">
 -      <string>Preview in Google Maps</string>
@@ -31,79 +16,36 @@ diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui
 -    </widget>
 -   </item>
 -   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/app.pro gpsbabel-gpsbabel_1_6_0/gui/app.pro
+--- gui/app.pro	2020-05-04 23:39:03.789106508 +0200
++++ gui/app.pro	2020-05-06 00:23:30.656766820 +0200
+@@ -14,8 +14,2 @@ QT += core \
+-      xml
 -
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
+-qtHaveModule(webenginewidgets) {
+-  QT += webenginewidgets webchannel
 -  DEFINES += HAVE_WEBENGINE
 -} else {
 -  QT += webkit webkitwidgets 
 -}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
++      xml \
++      widgets 
+@@ -75 +68,0 @@ SOURCES += formatload.cc
 -SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
+@@ -81 +73,0 @@ SOURCES += mainwindow.cc
 -SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
+@@ -101 +92,0 @@ HEADERS += formatload.h
 -HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
+@@ -105 +95,0 @@ HEADERS += mainwindow.h
 -HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
+@@ -135 +124,0 @@ macx|linux{
+-
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_6_0/gui/mainwindow.cc
+--- gui/mainwindow.cc	2020-05-04 23:39:04.890132326 +0200
++++ gui/mainwindow.cc	2020-05-04 23:56:17.126337120 +0200
+@@ -65 +64,0 @@
+-#include "gmapdlg.h"                   // for GMapDialog
+@@ -1030,18 +1028,0 @@ void MainWindow::applyActionX()
 -  // Now output for preview in google maps
 -  QString tempName;
 -  if (babelData_.previewGmap_) {
@@ -122,22 +64,18 @@ diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_
 -    args << "-F" << tempName;
 -  }
 -
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
+@@ -1059,8 +1039,0 @@ void MainWindow::applyActionX()
 -    if (babelData_.previewGmap_) {
 -      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
+-      GMapDialog dlg(nullptr, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : nullptr);
 -      dlg.show();
 -      dlg.exec();
 -      QFile(tempName).remove();
 -      this->show();
 -    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/gpsbabel.desktop gpsbabel-gpsbabel_1_6_0/gui/gpsbabel.desktop
+--- gui/gpsbabel.desktop	2020-05-04 23:39:04.417121234 +0200
++++ gui/gpsbabel.desktop	2020-05-06 01:24:41.000713345 +0200
+@@ -7 +7 @@ Icon=gpsbabel
+-Exec=gpsbabelfe-bin
++Exec=gpsbabelfe
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..6103e671975 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,6 +1,6 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.6.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090
 
 replaces="gpsbabel-gui>=0"
 
@@ -38,7 +38,7 @@ do_build() {
 do_install() {
 	make install DESTDIR=${DESTDIR}
 	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: gpsbabel: update to 1.6.0.

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-625159503

Comment:
You need to identify what binary `checking loader paths for Qt libs` in `configure` actually tries to run.

Then you can either patch configure to get this information in some way which does not require running a target binary, or you can add `build_helper="qemu"` and try to patch configure to run that `somebinary` with `qemu-${XBPS_TARGET_QEMU_MACHINE}-static somebinary ...`.

Re: gpsbabel: update to 1.6.0.

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-625162664

Comment:
BTW always update your branches with `git pull upstream --rebase --autostash` to avoid the `Merge branch master ..` kind of commits.

If you did not yet set `upstream` for your fork do it like `git remote add upstream https://github.com/void-linux/void-packages.git`

Re: gpsbabel: update to 1.6.0.

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-625162664

Comment:
BTW always update your branches with `git pull --rebase --autostash upstream master` to avoid the `Merge branch master ..` kind of commits.

If you did not yet set `upstream` for your fork do it like `git remote add upstream https://github.com/void-linux/void-packages.git`

Re: gpsbabel: update to 1.6.0.

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-625159503

Comment:
You need to identify the message `checking loader paths for Qt libs` and which binary `configure` actually tries to run there.

Then you can either patch configure to get this information in some way which does not require running a target binary, or you can add `build_helper="qemu"` and try to patch configure to run that `somebinary` with `qemu-${XBPS_TARGET_QEMU_MACHINE}-static somebinary ...`.

Re: gpsbabel: update to 1.6.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-769496355

Comment:
@manfredu ping?

Re: gpsbabel: update to 1.6.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

New comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-769647965

Comment:
I hope I have some time soon to have a look at it again...

Re: [PR PATCH] [Updated] gpsbabel: update to 1.6.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

There is an updated pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

gpsbabel: update to 1.6.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 12894 bytes --]

From 2dabb88d3e99202737bc9a914f64e1b834cba18f Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.6.0.

---
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 138 +++++-------------
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |   6 +-
 4 files changed, 41 insertions(+), 192 deletions(-)
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
index 936962b9a5b..e1c4a74d6f4 100644
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ b/srcpkgs/gpsbabel/patches/drop-map.patch
@@ -1,29 +1,14 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_6_0/gui/advdlg.cc
+--- gui/advdlg.cc	2020-05-04 23:39:03.738105312 +0200
++++ gui/advdlg.cc	2020-05-04 23:44:04.766164086 +0200
+@@ -40 +39,0 @@ AdvDlg::AdvDlg(QWidget* parent,
 -  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
+@@ -53 +51,0 @@ void AdvDlg::acceptClicked()
 -  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/advui.ui gpsbabel-gpsbabel_1_6_0/gui/advui.ui
+--- gui/advui.ui	2020-05-04 23:39:03.775106180 +0200
++++ gui/advui.ui	2020-05-04 23:47:11.582544723 +0200
+@@ -41,7 +40,0 @@
 -    <widget class="QCheckBox" name="previewGmap">
 -     <property name="text">
 -      <string>Preview in Google Maps</string>
@@ -31,79 +16,36 @@ diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui
 -    </widget>
 -   </item>
 -   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/app.pro gpsbabel-gpsbabel_1_6_0/gui/app.pro
+--- gui/app.pro	2020-05-04 23:39:03.789106508 +0200
++++ gui/app.pro	2020-05-06 00:23:30.656766820 +0200
+@@ -14,8 +14,2 @@ QT += core \
+-      xml
 -
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
+-qtHaveModule(webenginewidgets) {
+-  QT += webenginewidgets webchannel
 -  DEFINES += HAVE_WEBENGINE
 -} else {
 -  QT += webkit webkitwidgets 
 -}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
++      xml \
++      widgets 
+@@ -75 +68,0 @@ SOURCES += formatload.cc
 -SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
+@@ -81 +73,0 @@ SOURCES += mainwindow.cc
 -SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
+@@ -101 +92,0 @@ HEADERS += formatload.h
 -HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
+@@ -105 +95,0 @@ HEADERS += mainwindow.h
 -HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
+@@ -135 +124,0 @@ macx|linux{
+-
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_6_0/gui/mainwindow.cc
+--- gui/mainwindow.cc	2020-05-04 23:39:04.890132326 +0200
++++ gui/mainwindow.cc	2020-05-04 23:56:17.126337120 +0200
+@@ -65 +64,0 @@
+-#include "gmapdlg.h"                   // for GMapDialog
+@@ -1030,18 +1028,0 @@ void MainWindow::applyActionX()
 -  // Now output for preview in google maps
 -  QString tempName;
 -  if (babelData_.previewGmap_) {
@@ -122,22 +64,18 @@ diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_
 -    args << "-F" << tempName;
 -  }
 -
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
+@@ -1059,8 +1039,0 @@ void MainWindow::applyActionX()
 -    if (babelData_.previewGmap_) {
 -      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
+-      GMapDialog dlg(nullptr, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : nullptr);
 -      dlg.show();
 -      dlg.exec();
 -      QFile(tempName).remove();
 -      this->show();
 -    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
+diff -Naurp0 gpsbabel-gpsbabel_1_6_0.orig/gui/gpsbabel.desktop gpsbabel-gpsbabel_1_6_0/gui/gpsbabel.desktop
+--- gui/gpsbabel.desktop	2020-05-04 23:39:04.417121234 +0200
++++ gui/gpsbabel.desktop	2020-05-06 01:24:41.000713345 +0200
+@@ -7 +7 @@ Icon=gpsbabel
+-Exec=gpsbabelfe-bin
++Exec=gpsbabelfe
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..6103e671975 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,6 +1,6 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.6.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090
 
 replaces="gpsbabel-gui>=0"
 
@@ -38,7 +38,7 @@ do_build() {
 do_install() {
 	make install DESTDIR=${DESTDIR}
 	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: [PR PATCH] [Updated] [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

[WIP] gpsbabel: update to 1.7.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 11260 bytes --]

From 1370a711e6a909e96f60ccc1d414f07f2b373052 Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.7.0.

---
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 143 ------------------
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |   7 +-
 4 files changed, 3 insertions(+), 236 deletions(-)
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/drop-map.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
deleted file mode 100644
index 936962b9a5b..00000000000
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
--  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
--  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
--    <widget class="QCheckBox" name="previewGmap">
--     <property name="text">
--      <string>Preview in Google Maps</string>
--     </property>
--    </widget>
--   </item>
--   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
--
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
--  DEFINES += HAVE_WEBENGINE
--} else {
--  QT += webkit webkitwidgets 
--}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
--SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
--SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
--HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
--HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
--  // Now output for preview in google maps
--  QString tempName;
--  if (babelData_.previewGmap_) {
--    QTemporaryFile ftemp;
--    ftemp.open();
--    tempName = ftemp.fileName();
--    ftemp.close();
--
--    // Ideally, expost this in the UI.  For now, just split the track
--    // if we've no recorded fixes for > 5 mins and we've moved > 300 meters.
--    //args << "-x";
--    //args << "track,pack,sdistance=0.3k,split=5m";
--
--    args << "-o";
--    args << "gpx";
--    args << "-F" << tempName;
--  }
--
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
--    if (babelData_.previewGmap_) {
--      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
--      dlg.show();
--      dlg.exec();
--      QFile(tempName).remove();
--      this->show();
--    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..43f1248e85b 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,6 +1,6 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.7.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
 
 replaces="gpsbabel-gui>=0"
 
@@ -37,8 +37,7 @@ do_build() {
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
-	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: [PR PATCH] [Updated] [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

[WIP] gpsbabel: update to 1.7.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 11483 bytes --]

From e64a9f53729b34323dba1ed9fd1833823342731b Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.7.0.

---
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 143 ------------------
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |   9 +-
 4 files changed, 4 insertions(+), 237 deletions(-)
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/drop-map.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
deleted file mode 100644
index 936962b9a5b..00000000000
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
--  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
--  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
--    <widget class="QCheckBox" name="previewGmap">
--     <property name="text">
--      <string>Preview in Google Maps</string>
--     </property>
--    </widget>
--   </item>
--   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
--
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
--  DEFINES += HAVE_WEBENGINE
--} else {
--  QT += webkit webkitwidgets 
--}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
--SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
--SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
--HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
--HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
--  // Now output for preview in google maps
--  QString tempName;
--  if (babelData_.previewGmap_) {
--    QTemporaryFile ftemp;
--    ftemp.open();
--    tempName = ftemp.fileName();
--    ftemp.close();
--
--    // Ideally, expost this in the UI.  For now, just split the track
--    // if we've no recorded fixes for > 5 mins and we've moved > 300 meters.
--    //args << "-x";
--    //args << "track,pack,sdistance=0.3k,split=5m";
--
--    args << "-o";
--    args << "gpx";
--    args << "-F" << tempName;
--  }
--
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
--    if (babelData_.previewGmap_) {
--      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
--      dlg.show();
--      dlg.exec();
--      QFile(tempName).remove();
--      this->show();
--    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..de1e4531169 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,18 +1,18 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.7.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
 build_helper=qmake
-makedepends="qt5-devel libusb-compat-devel"
+makedepends="qt5-devel libusb-compat-devel qt5-webkit-devel"
 depends="desktop-file-utils"
 short_desc="Converts waypoints, tracks, and routes between popular GPS formats"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
 
 replaces="gpsbabel-gui>=0"
 
@@ -37,8 +37,7 @@ do_build() {
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
-	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: [PR PATCH] [Updated] [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

[WIP] gpsbabel: update to 1.7.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 13524 bytes --]

From 6cd7970e4b6e29fa394a079d1353f36302b30e48 Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.7.0.

---
 srcpkgs/gpsbabel/patches/configure.patch      |  34 +++++
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 143 ------------------
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |  11 +-
 5 files changed, 39 insertions(+), 238 deletions(-)
 create mode 100644 srcpkgs/gpsbabel/patches/configure.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/drop-map.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/configure.patch b/srcpkgs/gpsbabel/patches/configure.patch
new file mode 100644
index 00000000000..d0a00419254
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/configure.patch
@@ -0,0 +1,34 @@
+--- configure	2020-07-06 14:38:58.000000000 +0200
++++ configure	2021-02-11 23:50:52.831982152 +0100
+@@ -6400,6 +6400,6 @@ $as_echo_n "checking loader paths for Qt
+-	if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
++#	if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
+@@ -6421,6 +6421,6 @@ else
+-		if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
++#		if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
+@@ -6449 +6449 @@ rm -f core *.core core.conftest.* gmon.o
+-fi
++#fi
+@@ -6455 +6455 @@ rm -f core *.core core.conftest.* gmon.o
+-fi
++#fi
diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
deleted file mode 100644
index 936962b9a5b..00000000000
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
--  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
--  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
--    <widget class="QCheckBox" name="previewGmap">
--     <property name="text">
--      <string>Preview in Google Maps</string>
--     </property>
--    </widget>
--   </item>
--   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
--
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
--  DEFINES += HAVE_WEBENGINE
--} else {
--  QT += webkit webkitwidgets 
--}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
--SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
--SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
--HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
--HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
--  // Now output for preview in google maps
--  QString tempName;
--  if (babelData_.previewGmap_) {
--    QTemporaryFile ftemp;
--    ftemp.open();
--    tempName = ftemp.fileName();
--    ftemp.close();
--
--    // Ideally, expost this in the UI.  For now, just split the track
--    // if we've no recorded fixes for > 5 mins and we've moved > 300 meters.
--    //args << "-x";
--    //args << "track,pack,sdistance=0.3k,split=5m";
--
--    args << "-o";
--    args << "gpx";
--    args << "-F" << tempName;
--  }
--
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
--    if (babelData_.previewGmap_) {
--      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
--      dlg.show();
--      dlg.exec();
--      QFile(tempName).remove();
--      this->show();
--    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..24c0a420e09 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,23 +1,23 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.7.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
 build_helper=qmake
-makedepends="qt5-devel libusb-compat-devel"
+makedepends="qt5-devel qt5-webkit-devel libusb-compat-devel"
 depends="desktop-file-utils"
 short_desc="Converts waypoints, tracks, and routes between popular GPS formats"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
 
 replaces="gpsbabel-gui>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
+	hostmakedepends+=" qt5-devel qt5-webkit-devel"
 	configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
 fi
 
@@ -37,8 +37,7 @@ do_build() {
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
-	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: [PR PATCH] [Updated] [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

[WIP] gpsbabel: update to 1.7.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 13524 bytes --]

From db36a2b356ebfd8780f68d7967ae2891d128912a Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.7.0.

---
 srcpkgs/gpsbabel/patches/configure.patch      |  34 +++++
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 143 ------------------
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |  11 +-
 5 files changed, 39 insertions(+), 238 deletions(-)
 create mode 100644 srcpkgs/gpsbabel/patches/configure.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/drop-map.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/configure.patch b/srcpkgs/gpsbabel/patches/configure.patch
new file mode 100644
index 00000000000..d0a00419254
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/configure.patch
@@ -0,0 +1,34 @@
+--- configure	2020-07-06 14:38:58.000000000 +0200
++++ configure	2021-02-11 23:50:52.831982152 +0100
+@@ -6400,6 +6400,6 @@ $as_echo_n "checking loader paths for Qt
+-	if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
++#	if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
+@@ -6421,6 +6421,6 @@ else
+-		if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
++#		if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
+@@ -6449 +6449 @@ rm -f core *.core core.conftest.* gmon.o
+-fi
++#fi
+@@ -6455 +6455 @@ rm -f core *.core core.conftest.* gmon.o
+-fi
++#fi
diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
deleted file mode 100644
index 936962b9a5b..00000000000
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
--  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
--  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
--    <widget class="QCheckBox" name="previewGmap">
--     <property name="text">
--      <string>Preview in Google Maps</string>
--     </property>
--    </widget>
--   </item>
--   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
--
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
--  DEFINES += HAVE_WEBENGINE
--} else {
--  QT += webkit webkitwidgets 
--}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
--SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
--SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
--HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
--HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
--  // Now output for preview in google maps
--  QString tempName;
--  if (babelData_.previewGmap_) {
--    QTemporaryFile ftemp;
--    ftemp.open();
--    tempName = ftemp.fileName();
--    ftemp.close();
--
--    // Ideally, expost this in the UI.  For now, just split the track
--    // if we've no recorded fixes for > 5 mins and we've moved > 300 meters.
--    //args << "-x";
--    //args << "track,pack,sdistance=0.3k,split=5m";
--
--    args << "-o";
--    args << "gpx";
--    args << "-F" << tempName;
--  }
--
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
--    if (babelData_.previewGmap_) {
--      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
--      dlg.show();
--      dlg.exec();
--      QFile(tempName).remove();
--      this->show();
--    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..24c0a420e09 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,23 +1,23 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.7.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
 build_helper=qmake
-makedepends="qt5-devel libusb-compat-devel"
+makedepends="qt5-devel qt5-webkit-devel libusb-compat-devel"
 depends="desktop-file-utils"
 short_desc="Converts waypoints, tracks, and routes between popular GPS formats"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
 
 replaces="gpsbabel-gui>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
+	hostmakedepends+=" qt5-devel qt5-webkit-devel"
 	configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
 fi
 
@@ -37,8 +37,7 @@ do_build() {
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
-	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: [PR PATCH] [Updated] [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

[WIP] gpsbabel: update to 1.7.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 13571 bytes --]

From 878e544c9f0ec9a2e78a198fb0a3e56cacc9adef Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.7.0.

---
 srcpkgs/gpsbabel/patches/configure.patch      |  34 +++++
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 143 ------------------
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |  13 +-
 5 files changed, 41 insertions(+), 238 deletions(-)
 create mode 100644 srcpkgs/gpsbabel/patches/configure.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/drop-map.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/configure.patch b/srcpkgs/gpsbabel/patches/configure.patch
new file mode 100644
index 00000000000..d0a00419254
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/configure.patch
@@ -0,0 +1,34 @@
+--- configure	2020-07-06 14:38:58.000000000 +0200
++++ configure	2021-02-11 23:50:52.831982152 +0100
+@@ -6400,6 +6400,6 @@ $as_echo_n "checking loader paths for Qt
+-	if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
++#	if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
+@@ -6421,6 +6421,6 @@ else
+-		if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
++#		if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
+@@ -6449 +6449 @@ rm -f core *.core core.conftest.* gmon.o
+-fi
++#fi
+@@ -6455 +6455 @@ rm -f core *.core core.conftest.* gmon.o
+-fi
++#fi
diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
deleted file mode 100644
index 936962b9a5b..00000000000
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
--  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
--  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
--    <widget class="QCheckBox" name="previewGmap">
--     <property name="text">
--      <string>Preview in Google Maps</string>
--     </property>
--    </widget>
--   </item>
--   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
--
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
--  DEFINES += HAVE_WEBENGINE
--} else {
--  QT += webkit webkitwidgets 
--}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
--SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
--SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
--HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
--HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
--  // Now output for preview in google maps
--  QString tempName;
--  if (babelData_.previewGmap_) {
--    QTemporaryFile ftemp;
--    ftemp.open();
--    tempName = ftemp.fileName();
--    ftemp.close();
--
--    // Ideally, expost this in the UI.  For now, just split the track
--    // if we've no recorded fixes for > 5 mins and we've moved > 300 meters.
--    //args << "-x";
--    //args << "track,pack,sdistance=0.3k,split=5m";
--
--    args << "-o";
--    args << "gpx";
--    args << "-F" << tempName;
--  }
--
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
--    if (babelData_.previewGmap_) {
--      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
--      dlg.show();
--      dlg.exec();
--      QFile(tempName).remove();
--      this->show();
--    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..8276f07915e 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,23 +1,25 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.7.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
 build_helper=qmake
-makedepends="qt5-devel libusb-compat-devel"
+makedepends="qt5-devel qt5-webkit-devel libusb-compat-devel"
 depends="desktop-file-utils"
 short_desc="Converts waypoints, tracks, and routes between popular GPS formats"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
 
 replaces="gpsbabel-gui>=0"
 
+nocross="Configure cannot find Qt library."
+
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
+	hostmakedepends+=" qt5-devel qt5-webkit-devel"
 	configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
 fi
 
@@ -37,8 +39,7 @@ do_build() {
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
-	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: [PR REVIEW] [WIP] gpsbabel: update to 1.7.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#discussion_r574973676

Comment:
Adding nocross to a previously cross package is kinda bad :/

Re: [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 1502 bytes --]

New comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-778036712

Comment:
> You need to identify the message `checking loader paths for Qt libs` and which binary `configure` actually tries to run there.
> 
> Then you can either patch configure to get this information in some way which does not require running a target binary, or you can add `build_helper="qemu"` and try to patch configure to run that `somebinary` with `qemu-${XBPS_TARGET_QEMU_MACHINE}-static somebinary ...`.

It fails with "loader cannot find Qt library" when cross-compiling in the following part of configure:

```
OCPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$QT_INC"
OLIBS="$LIBS"
LIBS="$LIBS $QT_LIBS"

OLDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -Wl,-rpath,$($QMAKE -query QT_INSTALL_LIBS)"


 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h.  */

		#include <QtCore/QtGlobal>
		#include <cstring>
		int main () {
		return strcmp(QT_VERSION_STR, qVersion()) != 0;
		}
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
...
else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "loader cannot find Qt library
See \`config.log' for more details" "$LINENO" 5; }
			LDFLAGS="$OLDFLAGS"

fi
```

For the time being I have disabled cross-compiling. Any other suggestion?

I'm still checking why one test is failing with i686 only...

Re: [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 1516 bytes --]

New comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-778036712

Comment:
> You need to identify the message `checking loader paths for Qt libs` and which binary `configure` actually tries to run there.
> 
> Then you can either patch configure to get this information in some way which does not require running a target binary, or you can add `build_helper="qemu"` and try to patch configure to run that `somebinary` with `qemu-${XBPS_TARGET_QEMU_MACHINE}-static somebinary ...`.

@pullmoll 

It fails with "loader cannot find Qt library" when cross-compiling in the following part of configure:

```
OCPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$QT_INC"
OLIBS="$LIBS"
LIBS="$LIBS $QT_LIBS"

OLDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -Wl,-rpath,$($QMAKE -query QT_INSTALL_LIBS)"


 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h.  */

		#include <QtCore/QtGlobal>
		#include <cstring>
		int main () {
		return strcmp(QT_VERSION_STR, qVersion()) != 0;
		}
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
...
else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "loader cannot find Qt library
See \`config.log' for more details" "$LINENO" 5; }
			LDFLAGS="$OLDFLAGS"

fi
```

For the time being I have disabled cross-compiling. Any other suggestion?

I'm still checking why one test is failing with i686 only...

Re: [PR REVIEW] [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

New review comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#discussion_r575049561

Comment:
Sure, but I was not able to make it work. Not sure if it really did work before or the error was just ignored. I assume the later. If someone can help that would be great. 

Re: [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-778096841

Comment:
See also https://github.com/GPSBabel/gpsbabel/issues/690

Re: [WIP] gpsbabel: update to 1.7.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 221 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-778259865

Comment:
Can you try building with qmake? If that doesn't work, maybe adding #28575 helps

Re: [PR PATCH] [Updated] [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

[WIP] gpsbabel: update to 1.7.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 14736 bytes --]

From ce5904f897d7a7f061335fa96bab64b64326d7e3 Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.7.0.

---
 srcpkgs/gpsbabel/patches/configure.patch      |  25 +++
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 143 ------------------
 srcpkgs/gpsbabel/patches/engima.patch         |  30 ++++
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |  13 +-
 6 files changed, 62 insertions(+), 238 deletions(-)
 create mode 100644 srcpkgs/gpsbabel/patches/configure.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/drop-map.patch
 create mode 100644 srcpkgs/gpsbabel/patches/engima.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/configure.patch b/srcpkgs/gpsbabel/patches/configure.patch
new file mode 100644
index 00000000000..0fed4d2ed9a
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/configure.patch
@@ -0,0 +1,25 @@
+--- configure	2020-07-06 14:38:58.000000000 +0200
++++ configure	2021-02-11 23:50:52.831982152 +0100
+@@ -6401,4 +6401,2 @@ $as_echo_n "checking loader paths for Qt
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: cross compiling: assuming rpath not needed" >&5
++$as_echo "cross compiling: assuming rpath not needed" >&6; }
+@@ -6421,6 +6421,6 @@ else
+-		if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
++#		if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
+@@ -6449 +6449 @@ rm -f core *.core core.conftest.* gmon.o
+-fi
++#fi
\ No newline at end of file
diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
deleted file mode 100644
index 936962b9a5b..00000000000
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
--  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
--  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
--    <widget class="QCheckBox" name="previewGmap">
--     <property name="text">
--      <string>Preview in Google Maps</string>
--     </property>
--    </widget>
--   </item>
--   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
--
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
--  DEFINES += HAVE_WEBENGINE
--} else {
--  QT += webkit webkitwidgets 
--}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
--SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
--SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
--HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
--HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
--  // Now output for preview in google maps
--  QString tempName;
--  if (babelData_.previewGmap_) {
--    QTemporaryFile ftemp;
--    ftemp.open();
--    tempName = ftemp.fileName();
--    ftemp.close();
--
--    // Ideally, expost this in the UI.  For now, just split the track
--    // if we've no recorded fixes for > 5 mins and we've moved > 300 meters.
--    //args << "-x";
--    //args << "track,pack,sdistance=0.3k,split=5m";
--
--    args << "-o";
--    args << "gpx";
--    args << "-F" << tempName;
--  }
--
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
--    if (babelData_.previewGmap_) {
--      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
--      dlg.show();
--      dlg.exec();
--      QFile(tempName).remove();
--      this->show();
--    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
diff --git a/srcpkgs/gpsbabel/patches/engima.patch b/srcpkgs/gpsbabel/patches/engima.patch
new file mode 100644
index 00000000000..cf5e0d5a9b2
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/engima.patch
@@ -0,0 +1,30 @@
+--- enigma.cc
++++ enigma.cc
+@@ -21,9 +21,16 @@
+ 
+  */
+ 
++#include <cmath>           // for fabs, lround
++#include <cstdint>         // for int32_t, uint8_t, uint32_t
++#include <cstdlib>         // for abs
++#include <cstring>         // for strlen, memcpy, memset
++
++#include <QtCore/QString>  // for QString
++
+ #include "defs.h"
+-#include <cmath>
+-#include <cstdlib>
++#include "gbfile.h"        // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile
++
+ 
+ #define MYNAME "Enigma binary route and waypoint file format"
+ 
+@@ -177,7 +184,7 @@ enigma_waypt_disp(const Waypoint* wpt)
+   le_write32(&ewpt.longitude, decToEnigmaPosition(wpt->longitude));
+   ewpt.waypoint_type = WTYPE_WAYPOINT;
+   if (wpt->altitude != unknown_alt) {
+-    le_write32(&ewpt.data.wp_altitude, METERS_TO_FEET(wpt->altitude) + 1000);
++    le_write32(&ewpt.data.wp_altitude, lround(METERS_TO_FEET(wpt->altitude)) + 1000);
+   }
+   if (wpt->shortname != nullptr) {
+     ewpt.shortname_len = (uint8_t) min(6, strlen(CSTRc(wpt->shortname)));
\ No newline at end of file
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..7d444e88082 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,23 +1,25 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.7.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
 build_helper=qmake
-makedepends="qt5-devel libusb-compat-devel"
+makedepends="qt5-devel qt5-webkit-devel libusb-compat-devel"
 depends="desktop-file-utils"
 short_desc="Converts waypoints, tracks, and routes between popular GPS formats"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
 
 replaces="gpsbabel-gui>=0"
 
+# nocross="Configure cannot find Qt library."
+
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
+	hostmakedepends+=" qt5-devel qt5-webkit-devel"
 	configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
 fi
 
@@ -37,8 +39,7 @@ do_build() {
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
-	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: [PR PATCH] [Updated] [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

[WIP] gpsbabel: update to 1.7.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 14249 bytes --]

From 75f99c5d0d406fee87f24ea4f422c0cf61a6de8e Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.7.0.

---
 srcpkgs/gpsbabel/patches/configure.patch      |  25 +++
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 143 ------------------
 srcpkgs/gpsbabel/patches/enigma.patch         |  17 +++
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |  13 +-
 6 files changed, 49 insertions(+), 238 deletions(-)
 create mode 100644 srcpkgs/gpsbabel/patches/configure.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/drop-map.patch
 create mode 100644 srcpkgs/gpsbabel/patches/enigma.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/configure.patch b/srcpkgs/gpsbabel/patches/configure.patch
new file mode 100644
index 00000000000..ddfa5b73c0d
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/configure.patch
@@ -0,0 +1,25 @@
+--- configure	
++++ configure	
+@@ -6401,4 +6401,2 @@ $as_echo_n "checking loader paths for Qt
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: cross compiling: assuming rpath not needed" >&5
++$as_echo "cross compiling: assuming rpath not needed" >&6; }
+@@ -6421,6 +6419,6 @@ else
+-		if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
++#		if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
+@@ -6449 +6447 @@ rm -f core *.core core.conftest.* gmon.o
+-fi
++#fi
diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
deleted file mode 100644
index 936962b9a5b..00000000000
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
--  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
--  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
--    <widget class="QCheckBox" name="previewGmap">
--     <property name="text">
--      <string>Preview in Google Maps</string>
--     </property>
--    </widget>
--   </item>
--   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
--
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
--  DEFINES += HAVE_WEBENGINE
--} else {
--  QT += webkit webkitwidgets 
--}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
--SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
--SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
--HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
--HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
--  // Now output for preview in google maps
--  QString tempName;
--  if (babelData_.previewGmap_) {
--    QTemporaryFile ftemp;
--    ftemp.open();
--    tempName = ftemp.fileName();
--    ftemp.close();
--
--    // Ideally, expost this in the UI.  For now, just split the track
--    // if we've no recorded fixes for > 5 mins and we've moved > 300 meters.
--    //args << "-x";
--    //args << "track,pack,sdistance=0.3k,split=5m";
--
--    args << "-o";
--    args << "gpx";
--    args << "-F" << tempName;
--  }
--
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
--    if (babelData_.previewGmap_) {
--      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
--      dlg.show();
--      dlg.exec();
--      QFile(tempName).remove();
--      this->show();
--    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
diff --git a/srcpkgs/gpsbabel/patches/enigma.patch b/srcpkgs/gpsbabel/patches/enigma.patch
new file mode 100644
index 00000000000..dabb7220af5
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/enigma.patch
@@ -0,0 +1,17 @@
+--- enigma.cc	
++++ enigma.cc	
+@@ -23,0 +24,7 @@
++#include <cmath>           // for fabs, lround
++#include <cstdint>         // for int32_t, uint8_t, uint32_t
++#include <cstdlib>         // for abs
++#include <cstring>         // for strlen, memcpy, memset
++
++#include <QtCore/QString>  // for QString
++
+@@ -25,2 +32 @@
+-#include <cmath>
+-#include <cstdlib>
++#include "gbfile.h"        // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile
+@@ -180 +186 @@ enigma_waypt_disp(const Waypoint* wpt)
+-    le_write32(&ewpt.data.wp_altitude, METERS_TO_FEET(wpt->altitude) + 1000);
++    le_write32(&ewpt.data.wp_altitude, lround(METERS_TO_FEET(wpt->altitude)) + 1000);	
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..7d444e88082 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,23 +1,25 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.7.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
 build_helper=qmake
-makedepends="qt5-devel libusb-compat-devel"
+makedepends="qt5-devel qt5-webkit-devel libusb-compat-devel"
 depends="desktop-file-utils"
 short_desc="Converts waypoints, tracks, and routes between popular GPS formats"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
 
 replaces="gpsbabel-gui>=0"
 
+# nocross="Configure cannot find Qt library."
+
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
+	hostmakedepends+=" qt5-devel qt5-webkit-devel"
 	configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
 fi
 
@@ -37,8 +39,7 @@ do_build() {
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
-	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: [PR PATCH] [Updated] [WIP] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by manfredu against master on the void-packages repository

https://github.com/manfredu/void-packages gpsbabel
https://github.com/void-linux/void-packages/pull/21674

[WIP] gpsbabel: update to 1.7.0.


A patch file from https://github.com/void-linux/void-packages/pull/21674.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpsbabel-21674.patch --]
[-- Type: text/x-diff, Size: 14200 bytes --]

From ea884dc37d9eb454ca9935c1a9662aac30406b0e Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH] gpsbabel: update to 1.7.0.

---
 srcpkgs/gpsbabel/patches/configure.patch      |  25 +++
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 143 ------------------
 srcpkgs/gpsbabel/patches/enigma.patch         |  17 +++
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |  11 +-
 6 files changed, 47 insertions(+), 238 deletions(-)
 create mode 100644 srcpkgs/gpsbabel/patches/configure.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/drop-map.patch
 create mode 100644 srcpkgs/gpsbabel/patches/enigma.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/configure.patch b/srcpkgs/gpsbabel/patches/configure.patch
new file mode 100644
index 00000000000..ddfa5b73c0d
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/configure.patch
@@ -0,0 +1,25 @@
+--- configure	
++++ configure	
+@@ -6401,4 +6401,2 @@ $as_echo_n "checking loader paths for Qt
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: cross compiling: assuming rpath not needed" >&5
++$as_echo "cross compiling: assuming rpath not needed" >&6; }
+@@ -6421,6 +6419,6 @@ else
+-		if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
++#		if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
+@@ -6449 +6447 @@ rm -f core *.core core.conftest.* gmon.o
+-fi
++#fi
diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2c..00000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
deleted file mode 100644
index 936962b9a5b..00000000000
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
--  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
--  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
--    <widget class="QCheckBox" name="previewGmap">
--     <property name="text">
--      <string>Preview in Google Maps</string>
--     </property>
--    </widget>
--   </item>
--   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
--
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
--  DEFINES += HAVE_WEBENGINE
--} else {
--  QT += webkit webkitwidgets 
--}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
--SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
--SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
--HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
--HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
--  // Now output for preview in google maps
--  QString tempName;
--  if (babelData_.previewGmap_) {
--    QTemporaryFile ftemp;
--    ftemp.open();
--    tempName = ftemp.fileName();
--    ftemp.close();
--
--    // Ideally, expost this in the UI.  For now, just split the track
--    // if we've no recorded fixes for > 5 mins and we've moved > 300 meters.
--    //args << "-x";
--    //args << "track,pack,sdistance=0.3k,split=5m";
--
--    args << "-o";
--    args << "gpx";
--    args << "-F" << tempName;
--  }
--
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
--    if (babelData_.previewGmap_) {
--      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
--      dlg.show();
--      dlg.exec();
--      QFile(tempName).remove();
--      this->show();
--    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
diff --git a/srcpkgs/gpsbabel/patches/enigma.patch b/srcpkgs/gpsbabel/patches/enigma.patch
new file mode 100644
index 00000000000..dabb7220af5
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/enigma.patch
@@ -0,0 +1,17 @@
+--- enigma.cc	
++++ enigma.cc	
+@@ -23,0 +24,7 @@
++#include <cmath>           // for fabs, lround
++#include <cstdint>         // for int32_t, uint8_t, uint32_t
++#include <cstdlib>         // for abs
++#include <cstring>         // for strlen, memcpy, memset
++
++#include <QtCore/QString>  // for QString
++
+@@ -25,2 +32 @@
+-#include <cmath>
+-#include <cstdlib>
++#include "gbfile.h"        // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile
+@@ -180 +186 @@ enigma_waypt_disp(const Waypoint* wpt)
+-    le_write32(&ewpt.data.wp_altitude, METERS_TO_FEET(wpt->altitude) + 1000);
++    le_write32(&ewpt.data.wp_altitude, lround(METERS_TO_FEET(wpt->altitude)) + 1000);	
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759..00000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -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((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 @@
- {
-   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 @@
-     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/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..24c0a420e09 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,23 +1,23 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.7.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
 build_helper=qmake
-makedepends="qt5-devel libusb-compat-devel"
+makedepends="qt5-devel qt5-webkit-devel libusb-compat-devel"
 depends="desktop-file-utils"
 short_desc="Converts waypoints, tracks, and routes between popular GPS formats"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
 
 replaces="gpsbabel-gui>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
+	hostmakedepends+=" qt5-devel qt5-webkit-devel"
 	configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
 fi
 
@@ -37,8 +37,7 @@ do_build() {
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
-	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

Re: gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 778 bytes --]

New comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-778036712

Comment:
> > You need to identify the message `checking loader paths for Qt libs` and which binary `configure` actually tries to run there.
> > 
>> Then you can either patch configure to get this information in some way which does not require running a target binary, or you can add `build_helper="qemu"` and try to patch configure to run that `somebinary` with `qemu-${XBPS_TARGET_QEMU_MACHINE}-static somebinary ...`.
>
> For the time being I have disabled cross-compiling. Any other suggestion?
>
> I'm still checking why one test is failing with i686 only...

Cross-compiling is working now and the failing test on i686 is fixed.

Re: gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

New comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#issuecomment-778633028

Comment:
> Can you try building with qmake? If that doesn't work, maybe adding #28575 helps

It's working now, still with configure. Switch to qmake is necessary with the next release. IMHO it is ready to be merged. 

Re: [PR REVIEW] gpsbabel: update to 1.7.0.

[manfredu]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New review comment by manfredu on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#discussion_r575678231

Comment:
Fixed

Re: [PR REVIEW] gpsbabel: update to 1.7.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21674#discussion_r575716274

Comment:
Ah, nice workaround!

Re: [PR PATCH] [Merged]: gpsbabel: update to 1.7.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

There's a merged pull request on the void-packages repository

gpsbabel: update to 1.7.0.
https://github.com/void-linux/void-packages/pull/21674

Description: