[arch-commits] Commit in viking/trunk (3 files)

[Jaroslav Lichtblau]

    Date: Tuesday, October 9, 2018 @ 19:02:03
  Author: jlichtblau
Revision: 391753

upgpkg: viking 1.6.2-7 - gpsd 3.18 rebuild

Added:
  viking/trunk/viking-1.6.2-gpsd-3.18-fix.patch
Modified:
  viking/trunk/PKGBUILD
  viking/trunk/viking.changelog

----------------------------------+
 PKGBUILD                         |   14 ++++++++++----
 viking-1.6.2-gpsd-3.18-fix.patch |   25 +++++++++++++++++++++++++
 viking.changelog                 |    3 +++
 3 files changed, 38 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-09 19:00:16 UTC (rev 391752)
+++ PKGBUILD	2018-10-09 19:02:03 UTC (rev 391753)
@@ -4,7 +4,7 @@
 
 pkgname=viking
 pkgver=1.6.2
-pkgrel=6
+pkgrel=7
 pkgdesc="GTK+2 application to manage GPS data"
 arch=('x86_64')
 url="https://sourceforge.net/projects/viking/"
@@ -15,15 +15,21 @@
 options=('!emptydirs')
 changelog=$pkgname.changelog
 source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        remove-mapquest.patch)
+        remove-mapquest.patch
+        viking-1.6.2-gpsd-3.18-fix.patch)
 sha256sums=('dfe223b1cd3a1fed3616a70e732321db9013c89df3fd6e1ad0f733a1bb067826'
-            '07d78e7b86a494a3bb3e0389e4a8b42fc2f916aaa66e5b06fc9146ebfa932dc5')
+            '07d78e7b86a494a3bb3e0389e4a8b42fc2f916aaa66e5b06fc9146ebfa932dc5'
+            '78cc5cd6ea8ea38c6fc6be589b7828b30295ea2925f16fa89f2ae1dd15a49c88')
 
 prepare() {
   cd "${srcdir}"/$pkgname-$pkgver
 
-  # Remove discontinued mapquest service
+# Remove discontinued mapquest service
   patch -Np1 -i "${srcdir}"/remove-mapquest.patch
+
+# gpsd 3.18 build fix, with the help of
+# https://github.com/viking-gps/viking/commit/d570cfcfc643b701dd71e8b718784e02c953dace
+  patch -Np0 -i "${srcdir}"/viking-1.6.2-gpsd-3.18-fix.patch
 }
 
 build() {

Added: viking-1.6.2-gpsd-3.18-fix.patch
===================================================================
--- viking-1.6.2-gpsd-3.18-fix.patch	                        (rev 0)
+++ viking-1.6.2-gpsd-3.18-fix.patch	2018-10-09 19:02:03 UTC (rev 391753)
@@ -0,0 +1,25 @@
+--- orig/vikgpslayer.c	2015-12-15 00:34:43.000000000 +0100
++++ src/vikgpslayer.c	2018-10-09 20:32:19.001703665 +0200
+@@ -1681,2 +1681,4 @@
+     if (gps_read(&vgl->vgpsd->gpsd) > -1) {
++#elif GPSD_API_MAJOR_VERSION >= 7
++    if (gps_read(&vgl->vgpsd->gpsd, NULL, 0) > -1) {
+       // Reuse old function to perform operations on the new GPS data
+@@ -1713,2 +1715,12 @@
+ 
++/**
++ * rt_gpsd_try_connect:
++ *
++ * ATM Known to work up to at least GPSD_API_MAJOR_VERSION 7
++ *
++ * Support for the old/very old GPSD API versions is increasingly subject
++ *  to bitrot due to difficulty of creating/maintaining a test environment
++ *  of old software versions
++ *
++ */
+ static gboolean rt_gpsd_try_connect(gpointer *data)
+@@ -1724,3 +1736,3 @@
+   if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) {
+-#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
++#elif GPSD_API_MAJOR_VERSION >= 5
+   vgl->vgpsd = g_malloc(sizeof(VglGpsd));

Modified: viking.changelog
===================================================================
--- viking.changelog	2018-10-09 19:00:16 UTC (rev 391752)
+++ viking.changelog	2018-10-09 19:02:03 UTC (rev 391753)
@@ -1,3 +1,6 @@
+2018-10-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* viking 1.6.2-7 gpsd 3.18 rebuild
+
 2016-04-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* viking 1.6.2-3 pacman hooks rebuild