1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From 55e8ec463b52a6eb867e6e56c296facf6624a208 Mon Sep 17 00:00:00 2001
From: Alexander Fasching <fasching.a91@gmail.com>
Date: Sat, 17 Nov 2018 19:32:46 +0100
Subject: [PATCH 1/1] Fix build error with latest gpsd
---
dwgpsd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dwgpsd.c b/dwgpsd.c
index 5709497..dab4fd1 100644
--- a/dwgpsd.c
+++ b/dwgpsd.c
@@ -57,9 +57,9 @@
// Debian bug report: direwolf (1.2-1) FTBFS with libgps22 as part of the gpsd transition (#803605):
// dwgps.c claims to only support GPSD_API_MAJOR_VERSION 5, but also builds successfully with
// GPSD_API_MAJOR_VERSION 6 provided by libgps22 when the attached patch is applied.
-#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 6
-#error libgps API version might be incompatible.
-#endif
+//#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 6
+//#error libgps API version might be incompatible.
+//#endif
/*
* Information for interface to gpsd daemon.
@@ -257,7 +257,7 @@ static void * read_gpsd_thread (void *arg)
/* Fall thru to read which should get error and bail out. */
}
- if (gps_read (&gpsdata) == -1) {
+ if (gps_read (&gpsdata, NULL, 0) == -1) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("------------------------------------------\n");
@@ -407,7 +407,7 @@ int main (int argc, char *argv[])
while (1) {
dwfix_t fix;
- fix = dwgps_read (&info)
;
+ fix = dwgps_read (&info, NULL, 0)
;
text_color_set (DW_COLOR_INFO);
switch (fix) {
case DWFIX_2D:
--
2.19.1
|