Add condition to use new timespec_t on gpsd APIs >= 9
authorJerome Benoit <calculus@rezozer.net>
Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)
committerJerome Benoit <calculus@rezozer.net>
Wed, 11 Nov 2020 20:53:53 +0000 (20:53 +0000)
Forwarded: not-needed

Apply upstream fix (commit 13b358fa7899bb34e277b32a4c0d92833050f2c6).

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

src/GPS/qgpsdevice.cpp

index f8d1a0cf845fe0218916a4700034e7d1435d3989..cb727d2dba58e6b8d847920d7440cd5ba61782e5 100644 (file)
@@ -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,