[arch-commits] Commit in navit/repos/community-x86_64 (6 files)
Antonio Rojas
arojas at archlinux.org
Wed Mar 4 21:29:28 UTC 2020
Date: Wednesday, March 4, 2020 @ 21:29:28
Author: arojas
Revision: 590534
archrelease: copy trunk to community-x86_64
Added:
navit/repos/community-x86_64/PKGBUILD
(from rev 590533, navit/trunk/PKGBUILD)
navit/repos/community-x86_64/navit-gpsd-3.18.patch
(from rev 590533, navit/trunk/navit-gpsd-3.18.patch)
navit/repos/community-x86_64/navit.install
(from rev 590533, 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 | 72 ++++++++++++++++++++++--------------------------
navit-gpsd-3.18.patch | 22 +++++++-------
navit.install | 16 +++++-----
3 files changed, 53 insertions(+), 57 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-04 21:28:56 UTC (rev 590533)
+++ PKGBUILD 2020-03-04 21:29:28 UTC (rev 590534)
@@ -1,38 +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.3
-pkgrel=6
-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.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() {
- cd $pkgname-$pkgver
- export CFLAGS="$CFLAGS -I/usr/include/harfbuzz"
- 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 590533, navit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-04 21:29:28 UTC (rev 590534)
@@ -0,0 +1,34 @@
+# 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=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)
+sha256sums=('728d9dcad00e97769f6cd85bfad5518b0edf62ef75d60543fa4c48c1c3ab1243')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's/lib64/lib/' CMakeLists.txt
+}
+
+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-03-04 21:28:56 UTC (rev 590533)
+++ navit-gpsd-3.18.patch 2020-03-04 21:29:28 UTC (rev 590534)
@@ -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);
Copied: navit/repos/community-x86_64/navit-gpsd-3.18.patch (from rev 590533, navit/trunk/navit-gpsd-3.18.patch)
===================================================================
--- navit-gpsd-3.18.patch (rev 0)
+++ navit-gpsd-3.18.patch 2020-03-04 21:29:28 UTC (rev 590534)
@@ -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);
Deleted: navit.install
===================================================================
--- navit.install 2020-03-04 21:28:56 UTC (rev 590533)
+++ navit.install 2020-03-04 21:29:28 UTC (rev 590534)
@@ -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 590533, navit/trunk/navit.install)
===================================================================
--- navit.install (rev 0)
+++ navit.install 2020-03-04 21:29:28 UTC (rev 590534)
@@ -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
+}
More information about the arch-commits
mailing list