gis/viking: Updated for version 1.10.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 32 insertions, 116 deletions

diff --git a/gis/viking/README b/gis/viking/README
index 0d61f4f7676e..787e8cf1eb4b 100644
--- a/gis/viking/README
+++ b/gis/viking/README
@@ -1,7 +1,9 @@
-Viking is a free/open source program to manage GPS data. You can import
-and plot tracks and waypoints, show Terraserver maps under it, add 
-coordinate lines, make new tracks and waypoints, hide different things, 
-etc. It is written in C with the GTK+ 2.
+Viking is a free/open source program to manage GPS data. You can
+import, plot and create tracks, routes and waypoints, show OSM
+and other maps, generate maps (using Mapnik),
+see real-time GPS position, Geotag Images,
+control items, upload/download OSM Traces and more.
+It is written mainly in C with some C++ and uses the GTK+3 toolkit.
 
 The following options can be enabled (by default, they are disabled):
 
diff --git a/gis/viking/remove-mapquest.patch b/gis/viking/remove-mapquest.patch
deleted file mode 100644
index cac63f12237f..000000000000
--- a/gis/viking/remove-mapquest.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur viking-1.6.2.orig/src/map_ids.h viking-1.6.2/src/map_ids.h
---- viking-1.6.2.orig/src/map_ids.h	2015-11-10 22:01:35.000000000 +0100
-+++ viking-1.6.2/src/map_ids.h	2017-07-01 11:25:32.496994499 +0200
-@@ -35,7 +35,6 @@
- #define MAP_ID_OSM_MAPNIK 13
- #define MAP_ID_BLUE_MARBLE 15
- #define MAP_ID_OSM_CYCLE 17
--#define MAP_ID_MAPQUEST_OSM 19
- #define MAP_ID_OSM_TRANSPORT 20
- #define MAP_ID_OSM_ON_DISK 21
- #define MAP_ID_OSM_HUMANITARIAN 22
-diff -Naur viking-1.6.2.orig/src/osm.c viking-1.6.2/src/osm.c
---- viking-1.6.2.orig/src/osm.c	2015-11-10 22:01:35.000000000 +0100
-+++ viking-1.6.2/src/osm.c	2017-07-01 11:26:25.051880940 +0200
-@@ -89,21 +89,6 @@
-                                 "license", "CC-BY-SA",
-                                 "license-url", "http://www.openstreetmap.org/copyright",
-                                 NULL));
--  VikMapSource *mapquest_type =
--    VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
--                                "id", MAP_ID_MAPQUEST_OSM,
--                                "name", "OSM-MapQuest",
--                                "label", "OpenStreetMap (MapQuest)",
--                                "hostname", "otile1.mqcdn.com",
--                                "url", "/tiles/1.0.0/osm/%d/%d/%d.png",
--                                "check-file-server-time", TRUE,
--                                "use-etag", FALSE,
--                                "zoom-min", 0,
--                                "zoom-max", 19,
--                                "copyright", "Tiles Courtesy of MapQuest © OpenStreetMap contributors",
--                                "license", "MapQuest Specific",
--                                "license-url", "http://developer.mapquest.com/web/info/terms-of-use",
--                                NULL));
-   VikMapSource *hot_type =
-     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
-                                 "id", MAP_ID_OSM_HUMANITARIAN,
-@@ -152,7 +137,6 @@
-                                 "is-osm-meta-tiles", TRUE,
-                                 NULL));
- 
--  maps_layer_register_map_source (mapquest_type);
-   maps_layer_register_map_source (mapnik_type);
-   maps_layer_register_map_source (cycle_type);
-   maps_layer_register_map_source (transport_type);
-diff -Naur viking-1.6.2.orig/src/vikmapslayer.c viking-1.6.2/src/vikmapslayer.c
---- viking-1.6.2.orig/src/vikmapslayer.c	2015-12-21 12:44:57.000000000 +0100
-+++ viking-1.6.2/src/vikmapslayer.c	2017-07-01 11:25:52.947597509 +0200
-@@ -127,7 +127,7 @@
-  { 0, 255, 3, 0 }, /* alpha */
- };
- 
--static VikLayerParamData id_default ( void ) { return VIK_LPD_UINT ( MAP_ID_MAPQUEST_OSM ); }
-+static VikLayerParamData id_default ( void ) { return VIK_LPD_UINT ( MAP_ID_OSM_MAPNIK ); }
- static VikLayerParamData directory_default ( void )
- {
-   VikLayerParamData data;
diff --git a/gis/viking/slack-desc b/gis/viking/slack-desc
index f60b4b27c202..bd22deb300c3 100644
--- a/gis/viking/slack-desc
+++ b/gis/viking/slack-desc
@@ -9,11 +9,11 @@
 viking: viking (gps data management software)
 viking:
 viking: Viking is a free/open source program to manage GPS data. You can
-viking: import and plot tracks and waypoints, show Terraserver maps under
-viking: it, add coordinate lines, make new tracks and waypoints, hide
-viking: different things, etc. It is written in C with the GTK+ 2.
-viking:
-viking: https://sourceforge.net/projects/viking/
-viking:
+viking: import, plot and create tracks, routes and waypoints, show OSM
+viking: and other maps, generate maps (using Mapnik),
+viking: see real-time GPS position, Geotag Images,
+viking: control items, upload/download OSM Traces and more.
+viking: It is written mainly in C with some C++ and uses the GTK+3 toolkit.
 viking:
+viking: http://viking.sf.net
 viking:
diff --git a/gis/viking/viking-1.6.2-gpsd-3.18-fix.patch b/gis/viking/viking-1.6.2-gpsd-3.18-fix.patch
deleted file mode 100644
index 11aa34423705..000000000000
--- a/gis/viking/viking-1.6.2-gpsd-3.18-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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));
diff --git a/gis/viking/viking.SlackBuild b/gis/viking/viking.SlackBuild
index 20cff729d709..8d0648166d13 100644
--- a/gis/viking/viking.SlackBuild
+++ b/gis/viking/viking.SlackBuild
@@ -22,13 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# Maintained by David Spencer <baildon.research@googlemail.com>
+# Maintained by Roberto Puzzanghera - <admin {at} sagredo [dot] eu>
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=viking
-VERSION=${VERSION:-1.6.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.10}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -40,14 +40,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,6 +58,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 set -e
 
 rm -rf $PKG
@@ -81,10 +81,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Patches ripped off from Arch (thanks!)
-patch -p1 < $CWD/remove-mapquest.patch
-patch -p0 < $CWD/viking-1.6.2-gpsd-3.18-fix.patch
-
 OPT_MAPNIK='--disable-mapnik'
 if [ ${MAPNIK:-no} = "yes" ]; then
   OPT_MAPNIK="--enable-mapnik"
@@ -94,7 +90,7 @@ if [ ${GEOCACHES:-no} = "yes" ]; then
   OPT_GEOCACHES="--enable-geocaches"
 fi
 
-CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \
+CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -103,7 +99,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --mandir=/usr/man \
-  --disable-scrollkeeper \
   $OPT_MAPNIK \
   $OPT_GEOCACHES \
   --build=$ARCH-slackware-linux
@@ -118,7 +113,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 rm -rf $PKG/usr/man
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/gis/viking/viking.info b/gis/viking/viking.info
index a1079f69da29..b9fa44abf7ff 100644
--- a/gis/viking/viking.info
+++ b/gis/viking/viking.info
@@ -1,10 +1,10 @@
 PRGNAM="viking"
-VERSION="1.6.2"
-HOMEPAGE="https://sourceforge.net/projects/viking/"
-DOWNLOAD="https://downloads.sourceforge.net/viking/viking-1.6.2.tar.bz2"
-MD5SUM="288cf8c6043ff4d04523595457fd5ed0"
+VERSION="1.10"
+HOMEPAGE="http://viking.sf.net"
+DOWNLOAD="https://downloads.sourceforge.net/project/viking/viking-1.10.tar.bz2"
+MD5SUM="bb93bc2e6da0bb351afaef4d5a0a0765"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gpsd"
-MAINTAINER="David Spencer"
-EMAIL="baildon.research@googlemail.com"
+REQUIRES="gpsd geoclue2 liboauth"
+MAINTAINER="Roberto Puzzanghera"
+EMAIL="admin@sagredo.eu"