From 41199f595b6639b8812a728afc6f8a28949cff88 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Sun, 23 Feb 2020 03:17:09 -0500 Subject: [PATCH] navit: update to 0.5.4. --- srcpkgs/navit/patches/gpsd-api-7.patch | 25 ------------------------- srcpkgs/navit/template | 6 +++--- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/navit/patches/gpsd-api-7.patch diff --git a/srcpkgs/navit/patches/gpsd-api-7.patch b/srcpkgs/navit/patches/gpsd-api-7.patch deleted file mode 100644 index cfcd4a308d..0000000000 --- a/srcpkgs/navit/patches/gpsd-api-7.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1543af6c08bfca4ae5832b870503fe7fdc5f8b49 Mon Sep 17 00:00:00 2001 -From: Joop Boonen -Date: Thu, 24 Jan 2019 22:07:13 +0100 -Subject: [PATCH] Fix:Core:Fixed Added fix for gpsd >= 1.7 - ---- - navit/vehicle/gpsd/vehicle_gpsd.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/navit/vehicle/gpsd/vehicle_gpsd.c b/navit/vehicle/gpsd/vehicle_gpsd.c -index 95324f324..99a4b4ffc 100644 ---- navit/vehicle/gpsd/vehicle_gpsd.c -+++ navit/vehicle/gpsd/vehicle_gpsd.c -@@ -325,7 +325,11 @@ static void vehicle_gpsd_io(struct vehicle_priv *priv) { - int read_result; - /* Read until EOF, in case we are lagging behind. - * No point in processing old GPS reports. */ -+#if GPSD_API_MAJOR_VERSION >= 7 -+ while((read_result=gps_read(priv->gps, NULL, 0))>0); -+#else - while((read_result=gps_read(priv->gps))>0); -+#endif - if(read_result==-1) { - dbg(lvl_error,"gps_poll failed"); - vehicle_gpsd_close(priv); diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template index 24cd151c64..3482110564 100644 --- a/srcpkgs/navit/template +++ b/srcpkgs/navit/template @@ -1,7 +1,7 @@ # Template file for 'navit' pkgname=navit -version=0.5.3 -revision=3 +version=0.5.4 +revision=1 build_style=cmake configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev" hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -15,7 +15,7 @@ maintainer="Toyam Cox " license="GPL-2.0-only, LGPL-2.0-only" homepage="http://www.navit-project.org/" distfiles="https://github.com/navit-gps/navit/archive/v${version}.tar.gz" -checksum=5dd3c1292cad6d85dfba2d23770bdff70e981937a7c271a54c75395e6dd6019d +checksum=728d9dcad00e97769f6cd85bfad5518b0edf62ef75d60543fa4c48c1c3ab1243 pre_configure() { sed -i -e 's/\(GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR}\) NAME/\1 DIRECTORY/' CMakeLists.txt