Attachment #227500 for bug #258110

View | Details | Raw Unified | Return to bug 258110
Collapse All | Expand All

Lines 2-7 Link Here

(-)astro/foxtrotgps/Makefile (+1 lines)
2		2
3	PORTNAME= foxtrotgps	3	PORTNAME= foxtrotgps
4	PORTVERSION= 1.2.2	4	PORTVERSION= 1.2.2
		5	PORTREVISION= 1
5	CATEGORIES= astro geography	6	CATEGORIES= astro geography
6	MASTER_SITES= http://www.foxtrotgps.org/releases/	7	MASTER_SITES= http://www.foxtrotgps.org/releases/
7		8




--- src/gps_functions.c.orig	2021-08-19 16:12:58 UTC
+++ src/gps_functions.c
@@ -729,6 +729,11 @@ cb_gpsd_io_error(GIOChannel *src, GIOCondition conditi
 }
 
 

 
 static gboolean
 cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)
@@ -753,12 +758,16 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, 
 	{
 		gpsdata->satellites_used = libgps_gpsdata.satellites_used;
 		gpsdata->hdop = libgps_gpsdata.dop.hdop;

 		if (isnan(gpsdata->fix.time))
 		{
 			gpsdata->fix.time = (time_t) 0;
 		}
+#if GPSD_API_MAJOR_VERSION >= 10
+		gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
+#else
 		gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
+#endif
 		if (gpsdata->valid)
 		{
 			gpsdata->seen_valid = TRUE;

Return to bug 258110

Lines 1-6 Link Here

(-)astro/foxtrotgps/files/patch-src_gps__functions.c (-3 / +12 lines)
1	--- src/gps_functions.c.orig 2020-03-05 17:21:38 UTC	1	--- src/gps_functions.c.orig 2021-08-19 16:12:58 UTC
2	+++ src/gps_functions.c	2	+++ src/gps_functions.c
3	@@ -735,6 +735,11 @@ cb_gpsd_io_error(GIOChannel *src, GIOCondition conditi	3	@@ -729,6 +729,11 @@ cb_gpsd_io_error(GIOChannel *src, GIOCondition conditi
4	}	4	}
5		5
6		6
Lines 12-18 Link Here
12		12
13	static gboolean	13	static gboolean
14	cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)	14	cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)
15	@@ -755,7 +760,7 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition,	15	@@ -753,12 +758,16 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition,
16	{	16	{
17	gpsdata->satellites_used = libgps_gpsdata.satellites_used;	17	gpsdata->satellites_used = libgps_gpsdata.satellites_used;
18	gpsdata->hdop = libgps_gpsdata.dop.hdop;	18	gpsdata->hdop = libgps_gpsdata.dop.hdop;
Lines 21-23 Link Here
21	if (isnan(gpsdata->fix.time))	21	if (isnan(gpsdata->fix.time))
22	{	22	{
23	gpsdata->fix.time = (time_t) 0;	23	gpsdata->fix.time = (time_t) 0;
		24	}
		25	+#if GPSD_API_MAJOR_VERSION >= 10
		26	+ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
		27	+#else
		28	gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
		29	+#endif
		30	if (gpsdata->valid)
		31	{
		32	gpsdata->seen_valid = TRUE;