- fix building with gpsd 3.19

- rel 6

diff --git a/gpsd-3.19.patch b/gpsd-3.19.patch
new file mode 100644 (file)
index 0000000..9bef8fd
--- /dev/null
+++ b/gpsd-3.19.patch
@@ -0,0 +1,13 @@
+--- qlandkartegt-1.8.1/src/CDeviceGPSD.cpp~    2014-08-08 11:53:27.000000000 +0200
++++ qlandkartegt-1.8.1/src/CDeviceGPSD.cpp     2019-11-03 16:25:35.889558025 +0100
+@@ -212,7 +212,9 @@
+             }                    // if
+             else if( FD_ISSET( gpsdata->gps_fd, &fds ) )
+             {
+-#if GPSD_API_MAJOR_VERSION >= 5
++#if GPSD_API_MAJOR_VERSION >= 6
++                gps_read( gpsdata, NULL, 0 );
++#elif GPSD_API_MAJOR_VERSION >= 5
+                 gps_read( gpsdata );
+ #else
+                 gps_poll( gpsdata );

diff --git a/qlandkartegt.spec b/qlandkartegt.spec
index aa9a46e01c97cb2685acde386a0892757f76e897..b78f4affb28bcf9eb9c1f0891d890a2e7532f2a5 100644 (file)
--- a/qlandkartegt.spec
+++ b/qlandkartegt.spec
@@ -6,12 +6,13 @@ Summary:      Garmin's MapSource clone for Linux
 Summary(pl.UTF-8):     Klon MapSource pod Linuksa
 Name:          qlandkartegt
 Version:       1.8.1
-Release:       5
+Release:       6
 License:       GPLv2
 Group:         X11/Applications
 Source0:       http://downloads.sourceforge.net/qlandkartegt/%{name}-%{version}.tar.gz
 # Source0-md5: 2bfe90aff7e21b19572b7b250d76a540
 Patch0:                gcc8.patch
+Patch1:                gpsd-3.19.patch
 URL:           http://qlandkarte.org
 BuildRequires: QtCore-devel >= 4.6.0
 BuildRequires: QtDBus-devel >= 4.6.0
@@ -41,6 +42,7 @@ Klon MapSource pod Linuksa.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build