From: Jerome Benoit <calculus@rezozer.net>
Date: Wed, 11 Nov 2020 20:53:53 +0000 (+0000)
Subject: Add condition to use new timespec_t on gpsd APIs >= 9
X-Git-Tag: archive/raspbian/0.19.0+ds-5+rpi1~1^2^2^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=38103bad2989c89e07d8d31383afe6f7432ac692;p=merkaartor.git

Add condition to use new timespec_t on gpsd APIs >= 9

Forwarded: not-needed

Apply upstream fix (commit 13b358fa7899bb34e277b32a4c0d92833050f2c6).

Gbp-Pq: Name upstream-gpsd-9+-fix_time.patch
---

diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp
index f8d1a0c..cb727d2 100644
--- a/src/GPS/qgpsdevice.cpp
+++ b/src/GPS/qgpsdevice.cpp
@@ -1052,8 +1052,13 @@ void QGPSDDevice::onDataAvailable()
     qreal Heading = gpsdata->fix.track;
     if (!__isnan(Heading))
         setHeading(Heading);
-    if (gpsdata->fix.time)
-        cur_datetime = QDateTime::fromTime_t(gpsdata->fix.time);
+#if GPSD_API_MAJOR_VERSION >= 9
+#define FIX_TIME fix.time.tv_sec
+#else
+#define FIX_TIME fix.time
+#endif
+    if (gpsdata->FIX_TIME)
+        cur_datetime = QDateTime::fromTime_t(gpsdata->FIX_TIME);
     emit updatePosition(gpsdata->fix.latitude,
                         gpsdata->fix.longitude,
                         cur_datetime,