From 6cd4395bdfbe09f1d8ef52d7c2010c0180845f53 Mon Sep 17 00:00:00 2001
From: Dr. Tilmann Bubeck <tilmann@bubecks.de>
Date: Apr 28 2019 09:55:13 +0000
Subject: Updated patch gpsd-23.patch to the version from upstream

https://bazaar.launchpad.net/~foxtrotgps-team/foxtrotgps/trunk/revision/316

---

diff --git a/foxtrotgps.spec b/foxtrotgps.spec
index b318140..e633085 100644
--- a/foxtrotgps.spec
+++ b/foxtrotgps.spec
@@ -1,6 +1,6 @@
 Name:          foxtrotgps
 Version:       1.2.1
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       GTK+ mapping and GPS application
 License:       GPLv2
 URL:           http://www.foxtrotgps.org
@@ -44,7 +44,7 @@ additionally a variety of other repositories can easily be added.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 
 %build
 %configure
@@ -83,6 +83,9 @@ rm -rf %{buildroot}/usr/share/info/dir
 
 %changelog
 
+* Sun Apr 28 2019 Tilmann Bubeck <bubeck@fedoraproject.org> - 1.2.1-6
+- Updated patch to a better version from upstream.
+
 * Sun Apr 28 2019 Tilmann Bubeck <bubeck@fedoraproject.org> - 1.2.1-5
 - Patched for gpsd-3.18.
 
@@ -119,7 +122,7 @@ rm -rf %{buildroot}/usr/share/info/dir
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-* Thu Mar 27 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.0-2
+* Fri Mar 27 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.0-2
 - Rebuild (gpsd)
 
 * Mon Mar  2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.0-1
diff --git a/gpsd-23.patch b/gpsd-23.patch
index 4488568..e1fdef0 100644
--- a/gpsd-23.patch
+++ b/gpsd-23.patch
@@ -1,11 +1,27 @@
---- foxtrotgps-1.2.1.tar/foxtrotgps-1.2.1/src/gps_functions.c	2018-04-08 04:57:59.000000000 +0200
-+++ foxtrotgps-1.2.1/src/gps_functions.c	2019-04-28 09:22:45.211174216 +0200
-@@ -738,7 +738,7 @@
+Committer: Paul Wise
+Author(s): Charles Curley
+Date: 2019-02-27 01:45:28 UTC
+Revision ID: pabs3@bonedaddy.net-20190227014528-44mjwq25ls853nrx
+Update the interface to gps_read() for gpsd API version 7
+
+This change is available in gpsd version 3.18 and later.
+
+Kept deprecated code for users of older versions by using a version check.
+
+See-also: http://catb.org/gpsd/libgps.html
+=== modified file 'src/gps_functions.c'
+--- src/gps_functions.c	2019-02-26 00:59:58 +0000
++++ src/gps_functions.c	2019-02-27 01:45:28 +0000
+@@ -738,7 +738,11 @@
  	if (!libgps_initialized)
  		return FALSE;
  
--	ret = gps_read(&libgps_gpsdata);
++#if GPSD_API_MAJOR_VERSION >= 7 /* API change. gpsd version 3.18 and subsequent. */
 +	ret = gps_read(&libgps_gpsdata, NULL, 0);
++#else
+ 	ret = gps_read(&libgps_gpsdata);
++#endif
  	/* Note that gps_read() will never actually return 0
  	   (zero-length reads are converted internally to a -1 return,
  	    since they mean that the connection to the daemon has closed),
+