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

[Antonio Rojas]

    Date: Wednesday, September 30, 2020 @ 16:45:37
  Author: arojas
Revision: 714094

Update to 0.5.5

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

-----------------------+
 PKGBUILD              |   11 ++++-------
 navit-gpsd-3.18.patch |   11 -----------
 2 files changed, 4 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-30 16:36:11 UTC (rev 714093)
+++ PKGBUILD	2020-09-30 16:45:37 UTC (rev 714094)
@@ -5,20 +5,18 @@
 # Contributor: Thermionix <thermionix at gmail dot com>
 
 pkgname=navit
-pkgver=0.5.4
-pkgrel=2
+pkgver=0.5.5
+pkgrel=1
 pkgdesc="Modular turn-by-turn car navigation system"
 arch=('x86_64')
 url="https://www.navit-project.org/"
 license=('GPL')
 depends=('dbus-glib' 'gpsd' 'gtk2' 'imlib2' 'sdl_image')
-makedepends=('cmake' 'libxslt' 'git')
+makedepends=('cmake' 'libxslt')
 install=$pkgname.install
 source=($pkgname-$pkgver.tar.gz::https://github.com/navit-gps/navit/archive/v$pkgver.tar.gz
-        navit-librsvg-2.47.patch::"https://github.com/navit-gps/navit/commit/a66b662f.patch"
         navit-gpsd-3.21.patch::"https://github.com/navit-gps/navit/commit/06c5969f.patch")
-sha256sums=('728d9dcad00e97769f6cd85bfad5518b0edf62ef75d60543fa4c48c1c3ab1243'
-            '041c6db298d67f40799882498052741807be5540f7e139b318bc9927b90c8ef2'
+sha256sums=('e1630cd0bce875f34475f01d74be4638c26ee9023e80d79082fc2d1811f514b1'
             '697a269cbac7ca426bceb53f45885b5db7216fbfb20b20e72f350035fad0c27c')
 
 prepare() {
@@ -25,7 +23,6 @@
   cd $pkgname-$pkgver
   sed -i 's/lib64/lib/' CMakeLists.txt 
 
-  git apply ../navit-librsvg-2.47.patch # Fix build with librsvg 2.47
   patch -p1 -i ../navit-gpsd-3.21.patch # Fix build with gpsd 3.21
 }
 

Deleted: navit-gpsd-3.18.patch
===================================================================
--- navit-gpsd-3.18.patch	2020-09-30 16:36:11 UTC (rev 714093)
+++ navit-gpsd-3.18.patch	2020-09-30 16:45:37 UTC (rev 714094)
@@ -1,11 +0,0 @@
---- 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);