[packages/qlandkartegt] - fix building with gpsd 3.19 - rel 6

baggins baggins at pld-linux.org
Sun Nov 3 16:30:05 CET 2019


commit 7e2bd46127de5c78d3a995213ee83007dc58a76e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Nov 3 16:28:28 2019 +0100

    - fix building with gpsd 3.19
    - rel 6

 gpsd-3.19.patch   | 13 +++++++++++++
 qlandkartegt.spec |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/qlandkartegt.spec b/qlandkartegt.spec
index aa9a46e..b78f4af 100644
--- 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
diff --git a/gpsd-3.19.patch b/gpsd-3.19.patch
new file mode 100644
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 );
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qlandkartegt.git/commitdiff/7e2bd46127de5c78d3a995213ee83007dc58a76e



More information about the pld-cvs-commit mailing list