[FOSS-GPS] Patches to fix foxtrotgps 1.2.2 for gpsd-dev 3.21

[Miles Alan]

Hi list - foxtrotgps has stopped building against gpsd-dev as of gps-dev
3.21. I'm the maintainer for the Alpine package of foxtrotgps - a new
version of foxtrotgps that builds cleanly against the latest gpsd-dev
would be greately appreciated.  In order to fix the compatability,
there are two small patches I've applied which maybe could eventually
be upstreamed. Diffs below, thanks - Miles.

diff --git a/src/gps_functions.c b/src/gps_functions.c
index 9943b6b..c3d087a 100644
--- a/src/gps_functions.c
+++ b/src/gps_functions.c
@@ -762,7 +762,7 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)
                {
                        gpsdata->fix.time = (time_t) 0;
                }
-               gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
+               gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
                if (gpsdata->valid)
                {
                        gpsdata->seen_valid = TRUE;


diff --git a/src/gps_functions.c b/src/gps_functions.c
index 04f88e0..e3df086 100644
--- a/src/gps_functions.c
+++ b/src/gps_functions.c
@@ -752,7 +752,7 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)
        {
                gpsdata->satellites_used = libgps_gpsdata.satellites_used;
                gpsdata->hdop = libgps_gpsdata.dop.hdop;
-               gpsdata->fix.time = libgps_gpsdata.fix.time;
+               gpsdata->fix.time = libgps_gpsdata.fix.time.tv_nsec;
                if (isnan(gpsdata->fix.time))
                {
                        gpsdata->fix.time = (time_t) 0;