[arch-commits] Commit in gpsbabel/trunk (2 files)

[Balló György]

    Date: Saturday, April 7, 2018 @ 14:55:22
  Author: bgyorgy
Revision: 314856

upgpkg: gpsbabel 1.5.4-4

Correctly read diff and terr from geo format (FS#58115)

Added:
  gpsbabel/trunk/0008-Correctly-read-diff-and-terr-from-geo-format.patch
Modified:
  gpsbabel/trunk/PKGBUILD

---------------------------------------------------------+
 0008-Correctly-read-diff-and-terr-from-geo-format.patch |   29 ++++++++++++++
 PKGBUILD                                                |   11 +++--
 2 files changed, 37 insertions(+), 3 deletions(-)

Added: 0008-Correctly-read-diff-and-terr-from-geo-format.patch
===================================================================
--- 0008-Correctly-read-diff-and-terr-from-geo-format.patch	                        (rev 0)
+++ 0008-Correctly-read-diff-and-terr-from-geo-format.patch	2018-04-07 14:55:22 UTC (rev 314856)
@@ -0,0 +1,29 @@
+From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
+From: Robert Lipe <robertlipe at 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
+--- a/geo.cc
++++ b/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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-07 14:48:43 UTC (rev 314855)
+++ PKGBUILD	2018-04-07 14:55:22 UTC (rev 314856)
@@ -7,7 +7,7 @@
 pkgname=gpsbabel
 pkgver=1.5.4
 _pkgver=1_5_4
-pkgrel=3
+pkgrel=4
 pkgdesc="Read, write and manipulate GPS waypoints in a variety of formats"
 arch=('x86_64')
 url="https://www.gpsbabel.org/"
@@ -17,11 +17,13 @@
 source=(https://github.com/gpsbabel/$pkgname/archive/${pkgname}_$_pkgver.tar.gz
         build-fix.patch
         drop-map.patch
-        fix-map.patch)
+        fix-map.patch
+        0008-Correctly-read-diff-and-terr-from-geo-format.patch)
 sha256sums=('8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704'
             '537752bd5d097d836d4d5a77b4f7a5ea68d408d6a648511e4a98865d2742fb46'
             '69b4fad0bc5b33e332dc79c1c65482f942bf5a596b2d82b3d6a565cdd444b6ee'
-            'e00530f3b40a6c516cb45c59bbdfd5f4a801f7bb55e02205e7fc975c262db3a1')
+            'e00530f3b40a6c516cb45c59bbdfd5f4a801f7bb55e02205e7fc975c262db3a1'
+            '384e1603179be2d6cc0b2837da7eb11002e5aefd72c1dbc2ed2697ef4058289f')
 
 prepare() {
   cd $pkgname-${pkgname}_$_pkgver
@@ -35,6 +37,9 @@
   # Fix map
   # patch -Np1 -i ../fix-map.patch
 
+  # Correctly read diff and terr from geo format
+  patch -Np1 -i ../0008-Correctly-read-diff-and-terr-from-geo-format.patch
+
   # Fix path
   sed -i 's|langPath_ = QApplication::applicationDirPath();|langPath_ = "/usr/share/gpsbabel";|' gui/mainwindow.cc
   # sed -i 's|baseFile =  QApplication::applicationDirPath() + "/gmapbase.html";|baseFile = "/usr/share/gpsbabel/gmapbase.html";|' gui/map.cc