summaryrefslogtreecommitdiff
path: root/misc/subsurface
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja@gmail.com>2017-01-21 11:16:56 -0800
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-01-24 07:23:32 +0700
commit473e187b9b8e7e555a2336d1568c49f11cac25e9 (patch)
treec815a5caf92e6e626a9deea9380bcd8bb387a09b /misc/subsurface
parent133f25becbbb2f7615662139884fc3c6498319f0 (diff)
downloadslackbuilds-473e187b9b8e7e555a2336d1568c49f11cac25e9.tar.gz
misc/subsurface: Updated for version 4.6.0
Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
Diffstat (limited to 'misc/subsurface')
-rw-r--r--misc/subsurface/README5
-rw-r--r--misc/subsurface/subsurface.SlackBuild15
-rw-r--r--misc/subsurface/subsurface.info14
3 files changed, 24 insertions, 10 deletions
diff --git a/misc/subsurface/README b/misc/subsurface/README
index 01dbdce70c..f7624aa661 100644
--- a/misc/subsurface/README
+++ b/misc/subsurface/README
@@ -17,3 +17,8 @@ the SlackBuild. libftdi will be used if both libftdi and libftdi1 are
installed on the system.
# FTDI="yes" ./subsurface.SlackBuild
+
+Note: To build with QWebEngine instead of QtWebKit then pass QWEBENGINE=yes
+to the slackbuild.
+
+ # QWEBENGINE="yes" ./subsurface.SlackBuild
diff --git a/misc/subsurface/subsurface.SlackBuild b/misc/subsurface/subsurface.SlackBuild
index d660b833df..0d7077904e 100644
--- a/misc/subsurface/subsurface.SlackBuild
+++ b/misc/subsurface/subsurface.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for subsurface
-# Copyright 2014-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=subsurface
SRCNAM=Subsurface
-VERSION=${VERSION:-4.5.6}
+VERSION=${VERSION:-4.6.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -74,7 +74,8 @@ find -L . \
# Ugly hack to avoid header collision between grantlee and grantlee-qt5.
# https://mail.kde.org/pipermail/release-team/2015-August/008911.html
-sed -i 's|#include <grantlee_templates.h>|#include "grantlee_templates_local.h"|' templatelayout.h
+sed -i 's|#include <grantlee_templates.h>|#include "grantlee_templates_local.h"|' \
+ desktop-widgets/templatelayout.h
cat /usr/include/Grantlee5/grantlee_templates.h | \
sed -e 's|grantlee/|Grantlee5/grantlee/|'\
> grantlee_templates_local.h
@@ -130,12 +131,20 @@ else
FTDISUPPORT="OFF"
fi
+# Build subsurface with QWebEngine instead of QWebKit. Defualt is QWebKit.
+if [ "${QWEBENGINE:-no}" == "yes" ]; then
+ QWEBSUPPORT="ON"
+else
+ QWEBSUPPORT="OFF"
+fi
+
mkdir build
cd build
cmake -G "Unix Makefiles" \
-DCMAKE_INSTALL_PREFIX:PATH="/usr" \
-DUSE_LIBGIT23_API:BOOL=ON \
-DFTDISUPPORT:BOOL="$FTDISUPPORT" \
+ -DUSE_WEBENGINE:BOOL="$QWEBSUPPORT" \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
-DMARBLE_LIBRARIES="$PKG/usr/lib${LIBDIRSUFFIX}/libssrfmarblewidget.so" \
diff --git a/misc/subsurface/subsurface.info b/misc/subsurface/subsurface.info
index e438b109c4..613f322dd0 100644
--- a/misc/subsurface/subsurface.info
+++ b/misc/subsurface/subsurface.info
@@ -1,12 +1,12 @@
PRGNAM="subsurface"
-VERSION="4.5.6"
+VERSION="4.6.0"
HOMEPAGE="http://subsurface.hohndel.org/"
-DOWNLOAD="http://subsurface.hohndel.org/downloads/Subsurface-4.5.6.tgz \
- http://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-4.5.6.tgz \
- http://subsurface-divelog.org/downloads/marble-subsurface-branch-4.5.6.tgz"
-MD5SUM="2938e9ef0f50279f021f376c2ea5f0b6 \
- 1453be70136d525c588e6665c8e007af \
- 0eed12c9853581b5d9ef150c9f453a36"
+DOWNLOAD="http://subsurface.hohndel.org/downloads/Subsurface-4.6.0.tgz \
+ http://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-4.6.0.tgz \
+ http://subsurface-divelog.org/downloads/marble-subsurface-branch-4.6.0.tgz"
+MD5SUM="dcac9c0d19f3f7b5a71d89a5ac1d330c \
+ b75c0f1f1a53ca7e6bd81740855c9b1f \
+ 850fd31e8fd28764c38f09d9bb864409"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libgit2 grantlee-qt5 qt5-webkit"