diff options
| author | David Spencer <baildon.research@googlemail.com> | 2018-10-20 23:34:53 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-10-21 06:47:03 +0700 |
| commit | 6b71a363e9e85bf83596ddc6e69bfe8956ae4046 (patch) | |
| tree | defc885de4a28b7b4252f09ca81de200222202f7 /gis/viking/viking-1.6.2-gpsd-3.18-fix.patch | |
| parent | 8bffeb7a3c9ea9e7069a43491b96f6e0cdb65475 (diff) | |
gis/viking: Fix build with gpsd-3.18.1.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'gis/viking/viking-1.6.2-gpsd-3.18-fix.patch')
| -rw-r--r-- | gis/viking/viking-1.6.2-gpsd-3.18-fix.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gis/viking/viking-1.6.2-gpsd-3.18-fix.patch b/gis/viking/viking-1.6.2-gpsd-3.18-fix.patch new file mode 100644 index 0000000000000..11aa34423705a --- /dev/null +++ b/gis/viking/viking-1.6.2-gpsd-3.18-fix.patch @@ -0,0 +1,25 @@ +--- orig/vikgpslayer.c 2015-12-15 00:34:43.000000000 +0100 ++++ src/vikgpslayer.c 2018-10-09 20:32:19.001703665 +0200 +@@ -1681,2 +1681,4 @@ + if (gps_read(&vgl->vgpsd->gpsd) > -1) { ++#elif GPSD_API_MAJOR_VERSION >= 7 ++ if (gps_read(&vgl->vgpsd->gpsd, NULL, 0) > -1) { + // Reuse old function to perform operations on the new GPS data +@@ -1713,2 +1715,12 @@ + ++/** ++ * rt_gpsd_try_connect: ++ * ++ * ATM Known to work up to at least GPSD_API_MAJOR_VERSION 7 ++ * ++ * Support for the old/very old GPSD API versions is increasingly subject ++ * to bitrot due to difficulty of creating/maintaining a test environment ++ * of old software versions ++ * ++ */ + static gboolean rt_gpsd_try_connect(gpointer *data) +@@ -1724,3 +1736,3 @@ + if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) { +-#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6 ++#elif GPSD_API_MAJOR_VERSION >= 5 + vgl->vgpsd = g_malloc(sizeof(VglGpsd)); |