From 473e187b9b8e7e555a2336d1568c49f11cac25e9 Mon Sep 17 00:00:00 2001
From: Larry Hajali <larryhaja@gmail.com>
Date: Sat, 21 Jan 2017 11:16:56 -0800
Subject: misc/subsurface: Updated for version 4.6.0

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
---
 misc/subsurface/subsurface.SlackBuild | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'misc/subsurface/subsurface.SlackBuild')

diff --git a/misc/subsurface/subsurface.SlackBuild b/misc/subsurface/subsurface.SlackBuild
index d660b833df709..0d7077904ee77 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" \
-- 
cgit v1.2.3