misc/subsurface: Updated for version 4.8.5

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>

2 files changed, 33 insertions, 32 deletions

diff --git a/misc/subsurface/subsurface.SlackBuild b/misc/subsurface/subsurface.SlackBuild
index f8665f2141dc..48c8b25e9333 100644
--- a/misc/subsurface/subsurface.SlackBuild
+++ b/misc/subsurface/subsurface.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for subsurface
 
-# Copyright 2014-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 PRGNAM=subsurface
 SRCNAM=Subsurface
-VERSION=${VERSION:-4.8.4}
-MD5LONG=${MD5LONG:-54a357f9590d9cf011bf1713589f66bad65e00eb}
+VERSION=${VERSION:-4.8.5}
+GOOGLEMAPSVER=${MD5LONG:-0.0.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +65,7 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tgz
 cd $SRCNAM-$VERSION
 tar xvf $CWD/libdivecomputer-$PRGNAM-branch-$VERSION.tgz
-tar xvf $CWD/googlemaps-$MD5LONG.tar.gz
+tar xvf $CWD/googlemaps-v.${GOOGLEMAPSVER}.tar.gz
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -82,37 +82,37 @@ sed -e 's|grantlee/|Grantlee5/grantlee/|' \
   > grantlee_templates_local.h
 
 # Fix the location detection of googlemaps
-sed -i "s|../install-root|googlemaps-$MD5LONG|" CMakeLists.txt
+sed -i "s|../install-root|googlemaps-v.${GOOGLEMAPSVER}|" CMakeLists.txt
 
 # We already have packages for libdivecomputer and marble on the system.
 # Subsurface requires newer (custom) packages then what is currently available,
 # so we're going to compile them into the Subsurface package.
 # Similar to packaging/ubuntu/debian/rules.
 cd libdivecomputer-$PRGNAM-branch-$VERSION
-if [ ! -f configure ]; then
-  autoreconf -ivf
-fi
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-static=yes \
-  --enable-shared=no \
-  --enable-logging=no \
-  --disable-silent-rules
-
-make
-make install DESTDIR="$PWD/.."
+  if [ ! -f configure ]; then
+    autoreconf -ivf
+  fi
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --enable-static=yes \
+    --enable-shared=no \
+    --enable-logging=no \
+    --disable-silent-rules
+
+  make
+  make install DESTDIR="$PWD/.."
 cd -
 
 # Build qt5 locations googlemaps plugin
-cd googlemaps-$MD5LONG
-qmake-qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXLAGS+="$SLKCFLAGS" \
-  -o Makefile googlemaps.pro
+cd googlemaps-v.${GOOGLEMAPSVER}
+  qmake-qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXLAGS+="$SLKCFLAGS" \
+    -o Makefile googlemaps.pro
 
-make
-make install INSTALL_ROOT=$PKG
+  make
+  make install INSTALL_ROOT=$PKG
 cd -
 
 # Build subsurface with libftdi support. Default is no.
@@ -136,6 +136,7 @@ cd build
     -DFTDISUPPORT:BOOL="$FTDISUPPORT" \
     -DUSE_WEBENGINE:BOOL="$QWEBSUPPORT" \
     -DMAKE_TESTS:BOOL=OFF \
+    -DLIBGIT2_DYNAMIC:BOOL=ON \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DLIBDIVECOMPUTER_INCLUDE_DIR="../usr/include" \
diff --git a/misc/subsurface/subsurface.info b/misc/subsurface/subsurface.info
index f328be745c10..bf96617d5779 100644
--- a/misc/subsurface/subsurface.info
+++ b/misc/subsurface/subsurface.info
@@ -1,12 +1,12 @@
 PRGNAM="subsurface"
-VERSION="4.8.4"
+VERSION="4.8.5"
 HOMEPAGE="https://subsurface-divelog.org"
-DOWNLOAD="https://subsurface-divelog.org/downloads/Subsurface-4.8.4.tgz \
-          https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-4.8.4.tgz \
-          https://github.com/vladest/googlemaps/archive/54a357f/googlemaps-54a357f9590d9cf011bf1713589f66bad65e00eb.tar.gz"
-MD5SUM="0315ae1211b41a47f1de2a9185ae338f \
-        955b3f8211f1b737c8de4171c8ca37e9 \
-        78770b2e3a46071f80c7747ed116a128"
+DOWNLOAD="https://subsurface-divelog.org/downloads/Subsurface-4.8.5.tgz \
+          https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-4.8.5.tgz \
+          https://github.com/vladest/googlemaps/archive/v.0.0.0.1/googlemaps-v.0.0.0.1.tar.gz"
+MD5SUM="3e4d43ffcefe84b17d28263ee0bd4d6d \
+        61260bbd37771f6e58f4dfaab7ce36cc \
+        da31bed9b00f168688987b338fa8cda3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libgit2 grantlee-qt5 qt5-webkit"