Attachment 227500 Details for Bug 258110 – patch to fix build with new gpsd

[patch] patch to fix build with new gpsd

foxtrotgps-gpsd_fix-rev0.diff (text/plain), 1.58 KB, created by Steve Wills on 2021-08-28 00:52:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2021-08-28 00:52:56 UTC

Size: 1.58 KB

patch

obsolete

>diff --git astro/foxtrotgps/Makefile astro/foxtrotgps/Makefile
>index ae6275fb4298..124917a9eb15 100644
>--- astro/foxtrotgps/Makefile
>+++ astro/foxtrotgps/Makefile
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	foxtrotgps
> PORTVERSION=	1.2.2
>+PORTREVISION=	1
> CATEGORIES=	astro geography
> MASTER_SITES=	http://www.foxtrotgps.org/releases/
> 
>diff --git astro/foxtrotgps/files/patch-src_gps__functions.c astro/foxtrotgps/files/patch-src_gps__functions.c
>index 9b41464e09cc..0c2770a2f96e 100644
>--- astro/foxtrotgps/files/patch-src_gps__functions.c
>+++ astro/foxtrotgps/files/patch-src_gps__functions.c
>@@ -1,6 +1,6 @@
>---- src/gps_functions.c.orig	2020-03-05 17:21:38 UTC
>+--- src/gps_functions.c.orig	2021-08-19 16:12:58 UTC
> +++ src/gps_functions.c
>-@@ -735,6 +735,11 @@ cb_gpsd_io_error(GIOChannel *src, GIOCondition conditi
>+@@ -729,6 +729,11 @@ cb_gpsd_io_error(GIOChannel *src, GIOCondition conditi
>  }
>  
>  
>@@ -12,7 +12,7 @@
>  
>  static gboolean
>  cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)
>-@@ -755,7 +760,7 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, 
>+@@ -753,12 +758,16 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, 
>  	{
>  		gpsdata->satellites_used = libgps_gpsdata.satellites_used;
>  		gpsdata->hdop = libgps_gpsdata.dop.hdop;
>@@ -21,3 +21,12 @@
>  		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;

Actions: View | Diff

Attachments on bug 258110: 227500 | 227591