qlandkartegt-1.8.1-11: adapt to API change in gpsd 3.18

3 files changed, 35 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2b9810077fd..9336c4139d05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qlandkartegt
 	pkgdesc = Use your GPS with Linux
 	pkgver = 1.8.1
-	pkgrel = 10
+	pkgrel = 11
 	url = http://www.qlandkarte.org/
 	arch = i686
 	arch = x86_64
@@ -29,6 +29,7 @@ pkgbase = qlandkartegt
 	source = fix-qt5-build.patch
 	source = fix-ver_str.patch
 	source = fix-qtgui-include.patch
+	source = fix-gps_read.patch
 	source = improve-gpx-creator.patch
 	source = improve-gpx-name.patch
 	sha256sums = 9e0605ab8f4cbd27741b507f252f08370e9ccca4e05ec35878256c59b22a9be7
@@ -36,6 +37,7 @@ pkgbase = qlandkartegt
 	sha256sums = e71d843289f8f1099388a431bf488281232344b9ce6c0a28d1a60f68b6ec3e4b
 	sha256sums = 143a79f7ff17850faf571f65f719db0d68de6e8d2943790431d21776e7b67458
 	sha256sums = 44da55424a616a74114882a7b4f1bad81d2d9d506b747b7984a5faf493362d17
+	sha256sums = 84447833e68fa0d79c0cbeeb5ce67bc4d5c331b0661badcbc1883afbe05ff242
 	sha256sums = c6af42ba9d1958d45c0b0e2acc3a41cb4372a299b7b06bfbb6c05cf778c45e7f
 	sha256sums = 26efbc57123a81c6ced6809f48c3a8ea1bca36f1098a5226a5052f7ad6bb613b
 
diff --git a/PKGBUILD b/PKGBUILD
index 3952b8acf213..bf7d0ddbe614 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=qlandkartegt
 pkgver=1.8.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Use your GPS with Linux"
 arch=('i686' 'x86_64')
 url="http://www.qlandkarte.org/"
@@ -20,6 +20,7 @@ source=(https://bitbucket.org/maproom/qlandkarte-gt/downloads/$pkgname-$pkgver.t
         fix-qt5-build.patch
         fix-ver_str.patch
         fix-qtgui-include.patch
+        fix-gps_read.patch
         improve-gpx-creator.patch
         improve-gpx-name.patch)
 sha256sums=('9e0605ab8f4cbd27741b507f252f08370e9ccca4e05ec35878256c59b22a9be7'
@@ -27,6 +28,7 @@ sha256sums=('9e0605ab8f4cbd27741b507f252f08370e9ccca4e05ec35878256c59b22a9be7'
             'e71d843289f8f1099388a431bf488281232344b9ce6c0a28d1a60f68b6ec3e4b'
             '143a79f7ff17850faf571f65f719db0d68de6e8d2943790431d21776e7b67458'
 	    '44da55424a616a74114882a7b4f1bad81d2d9d506b747b7984a5faf493362d17'
+	    '84447833e68fa0d79c0cbeeb5ce67bc4d5c331b0661badcbc1883afbe05ff242'
             'c6af42ba9d1958d45c0b0e2acc3a41cb4372a299b7b06bfbb6c05cf778c45e7f'
 	    '26efbc57123a81c6ced6809f48c3a8ea1bca36f1098a5226a5052f7ad6bb613b')
 
@@ -35,6 +37,7 @@ prepare() {
   patch -Np1 -i ../fix-qt5-build.patch
   patch -Np1 -i ../fix-ver_str.patch
   patch -Np1 -i ../fix-qtgui-include.patch
+  patch -Np1 -i ../fix-gps_read.patch
   patch -Np1 -i ../improve-gpx-creator.patch
   patch -Np1 -i ../improve-gpx-name.patch
 
diff --git a/fix-gps_read.patch b/fix-gps_read.patch
new file mode 100644
index 000000000000..5bd7f379da2a
--- /dev/null
+++ b/fix-gps_read.patch
@@ -0,0 +1,28 @@
+From 51745e234506a93c6e0ab3c3d72dff22306f5c2e Mon Sep 17 00:00:00 2001
+From: Markus Heidelberg <markus.heidelberg@web.de>
+Date: Thu, 25 Oct 2018 08:51:50 +0200
+Subject: [PATCH] Adapt gps_read() invocation to changed API
+
+Since gpsd 3.18 this function contains two more parameters.
+---
+ src/CDeviceGPSD.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/CDeviceGPSD.cpp b/src/CDeviceGPSD.cpp
+index f5be09c..41678d1 100644
+--- a/src/CDeviceGPSD.cpp
++++ b/src/CDeviceGPSD.cpp
+@@ -212,7 +212,9 @@ void CGPSDThread::run()
+             }                    // if
+             else if( FD_ISSET( gpsdata->gps_fd, &fds ) )
+             {
+-#if GPSD_API_MAJOR_VERSION >= 5
++#if GPSD_API_MAJOR_VERSION >= 7
++                gps_read( gpsdata, NULL, 0 );
++#elif GPSD_API_MAJOR_VERSION >= 5
+                 gps_read( gpsdata );
+ #else
+                 gps_poll( gpsdata );
+-- 
+2.19.1
+