[arch-commits] Commit in navit/trunk (PKGBUILD navit-gpsd-3.18.patch)

[Antonio Rojas]

    Date: Thursday, October 11, 2018 @ 11:33:42
  Author: arojas
Revision: 392453

gpsd 3.18 rebuild

Added:
  navit/trunk/navit-gpsd-3.18.patch
Modified:
  navit/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    9 ++++++---
 navit-gpsd-3.18.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-11 11:32:38 UTC (rev 392452)
+++ PKGBUILD	2018-10-11 11:33:42 UTC (rev 392453)
@@ -6,7 +6,7 @@
 
 pkgname=navit
 pkgver=0.5.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Modular turn-by-turn car navigation system"
 arch=('x86_64')
 url="http://www.navit-project.org/"
@@ -14,12 +14,15 @@
 depends=('dbus-glib' 'gpsd' 'gtk2' 'imlib2' 'sdl_image')
 makedepends=('cmake' 'libxslt')
 install=$pkgname.install
-source=($pkgname-$pkgver.tar.gz::https://github.com/navit-gps/navit/archive/v$pkgver.tar.gz)
-sha256sums=('5dd3c1292cad6d85dfba2d23770bdff70e981937a7c271a54c75395e6dd6019d')
+source=($pkgname-$pkgver.tar.gz::https://github.com/navit-gps/navit/archive/v$pkgver.tar.gz
+        navit-gpsd-3.18.patch)
+sha256sums=('5dd3c1292cad6d85dfba2d23770bdff70e981937a7c271a54c75395e6dd6019d'
+            '5902fa83324d72210d284750eccf7fd56479ceeb5cfc4aab678cc978a40fafd1')
 
 prepare() {
   cd $pkgname-$pkgver
   sed -i 's/lib64/lib/' CMakeLists.txt 
+  patch -p1 -i ../navit-gpsd-3.18.patch # Fix build with gpsd 3.18
 }
 
 build() {

Added: navit-gpsd-3.18.patch
===================================================================
--- navit-gpsd-3.18.patch	                        (rev 0)
+++ navit-gpsd-3.18.patch	2018-10-11 11:33:42 UTC (rev 392453)
@@ -0,0 +1,11 @@
+--- navit-0.5.3/navit/vehicle/gpsd/vehicle_gpsd.c.orig	2018-10-11 11:15:18.019205542 +0000
++++ navit-0.5.3/navit/vehicle/gpsd/vehicle_gpsd.c	2018-10-11 11:15:36.329237820 +0000
+@@ -325,7 +325,7 @@
+         int read_result;
+         /* Read until EOF, in case we are lagging behind.
+          * No point in processing old GPS reports. */
+-        while((read_result=gps_read(priv->gps))>0);
++        while((read_result=gps_read(priv->gps, NULL, 0))>0);
+         if(read_result==-1) {
+             dbg(lvl_error,"gps_poll failed");
+             vehicle_gpsd_close(priv);