[arch-commits] Commit in navit/repos/community-x86_64 (5 files)

[Antonio Rojas]

    Date: Wednesday, September 30, 2020 @ 16:45:49
  Author: arojas
Revision: 714095

archrelease: copy trunk to community-x86_64

Added:
  navit/repos/community-x86_64/PKGBUILD
    (from rev 714094, navit/trunk/PKGBUILD)
  navit/repos/community-x86_64/navit.install
    (from rev 714094, navit/trunk/navit.install)
Deleted:
  navit/repos/community-x86_64/PKGBUILD
  navit/repos/community-x86_64/navit-gpsd-3.18.patch
  navit/repos/community-x86_64/navit.install

-----------------------+
 PKGBUILD              |   79 +++++++++++++++++++++++-------------------------
 navit-gpsd-3.18.patch |   11 ------
 navit.install         |   16 ++++-----
 3 files changed, 46 insertions(+), 60 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-30 16:45:37 UTC (rev 714094)
+++ PKGBUILD	2020-09-30 16:45:49 UTC (rev 714095)
@@ -1,41 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: TDY <tdy at archlinux.info>
-# Contributor: Gergely Imreh <imrehg(at)gmail(dot)com>
-# Contributor: Stefan Lohmaier <noneuss at gmail dot com
-# Contributor: Thermionix <thermionix at gmail dot com>
-
-pkgname=navit
-pkgver=0.5.4
-pkgrel=2
-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')
-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'
-            '697a269cbac7ca426bceb53f45885b5db7216fbfb20b20e72f350035fad0c27c')
-
-prepare() {
-  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
-}
-
-build() {
-  cd $pkgname-$pkgver
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DSAMPLE_MAP=FALSE -DDISABLE_QT=TRUE
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: navit/repos/community-x86_64/PKGBUILD (from rev 714094, navit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-09-30 16:45:49 UTC (rev 714095)
@@ -0,0 +1,38 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: TDY <tdy at archlinux.info>
+# Contributor: Gergely Imreh <imrehg(at)gmail(dot)com>
+# Contributor: Stefan Lohmaier <noneuss at gmail dot com
+# Contributor: Thermionix <thermionix at gmail dot com>
+
+pkgname=navit
+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')
+install=$pkgname.install
+source=($pkgname-$pkgver.tar.gz::https://github.com/navit-gps/navit/archive/v$pkgver.tar.gz
+        navit-gpsd-3.21.patch::"https://github.com/navit-gps/navit/commit/06c5969f.patch")
+sha256sums=('e1630cd0bce875f34475f01d74be4638c26ee9023e80d79082fc2d1811f514b1'
+            '697a269cbac7ca426bceb53f45885b5db7216fbfb20b20e72f350035fad0c27c')
+
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i 's/lib64/lib/' CMakeLists.txt 
+
+  patch -p1 -i ../navit-gpsd-3.21.patch # Fix build with gpsd 3.21
+}
+
+build() {
+  cd $pkgname-$pkgver
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DSAMPLE_MAP=FALSE -DDISABLE_QT=TRUE
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: navit-gpsd-3.18.patch
===================================================================
--- navit-gpsd-3.18.patch	2020-09-30 16:45:37 UTC (rev 714094)
+++ navit-gpsd-3.18.patch	2020-09-30 16:45:49 UTC (rev 714095)
@@ -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);

Deleted: navit.install
===================================================================
--- navit.install	2020-09-30 16:45:37 UTC (rev 714094)
+++ navit.install	2020-09-30 16:45:49 UTC (rev 714095)
@@ -1,8 +0,0 @@
-post_install() {
-  echo "==> Additional setup is required"
-  echo "  -> See http://wiki.navit-project.org/index.php/Configuration"
-  echo
-  echo "==> No maps are bundled with the install"
-  echo "  -> See http://wiki.navit-project.org/index.php/Maps"
-  echo
-}

Copied: navit/repos/community-x86_64/navit.install (from rev 714094, navit/trunk/navit.install)
===================================================================
--- navit.install	                        (rev 0)
+++ navit.install	2020-09-30 16:45:49 UTC (rev 714095)
@@ -0,0 +1,8 @@
+post_install() {
+  echo "==> Additional setup is required"
+  echo "  -> See http://wiki.navit-project.org/index.php/Configuration"
+  echo
+  echo "==> No maps are bundled with the install"
+  echo "  -> See http://wiki.navit-project.org/index.php/Maps"
+  echo
+}