academic/xiphos: Updated for version 4.0.7.

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

3 files changed, 37 insertions, 8 deletions

diff --git a/academic/xiphos/README b/academic/xiphos/README
index 7c5804e8584e..4dcb5d5fa755 100644
--- a/academic/xiphos/README
+++ b/academic/xiphos/README
@@ -4,3 +4,22 @@ Sword project by the CrossWire Bible Society.
 
 computer reading of the text using festival has not been tested.
 if it works let me know, and i'll remove these two lines from the readme.
+
+if you pass the variable WK2=yes to the build script, the dependencies
+change slightly. instead of webkitgtk3, webkit2gtk and gtkhtml (v4) are
+required.
+
+note: End program differences between webkit and webkit2 versions.
+webkit:
+   studypad is missing the image for the "bold" text button (but it works)
+   reported not to work with current
+webkit2:
+   studypad has an "add emoticon" button, but the images included are not
+found, so an empty imagebox is added in the text if you try to add an icon.
+   a few warnings shown on compile (but seems to work just fine).
+   try this one for current. if it works, let me know, and I might change
+   the default to WK2 :-).
+
+For both versions, there is an issue where if the previewer is in the sidebar,
+text is offset to the left, so you can't see the first 2 characters of each
+line. This has been reported upstream.
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild
index dc1d29b0193b..b6829d93b05d 100644
--- a/academic/xiphos/xiphos.SlackBuild
+++ b/academic/xiphos/xiphos.SlackBuild
@@ -23,9 +23,11 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xiphos
-VERSION=${VERSION:-4.0.6}
+VERSION=${VERSION:-4.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+#if WK2 is yes use webkit2. this requires webkit2gtk and gtkhtml (v4) instead of webkitgtk3
+WK2=${WK2:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -60,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-20170810.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-20170924.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -68,7 +70,15 @@ find -L . \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
+if [ "x$WK2" = "xyes" ]; then
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./waf configure \
+  --prefix=/usr \
+  --enable-webkit2 \
+  --gtk=3
+#  --gtk=2   doesn't work with webkitgtk as gtk2 is disabled
+else
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./waf configure \
@@ -76,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-webkit-editor \
   --gtk=3
 #  --gtk=2   doesn't work with webkitgtk as gtk2 is disabled
-
+fi
 ./waf build
 ./waf install --destdir=$PKG
 
diff --git a/academic/xiphos/xiphos.info b/academic/xiphos/xiphos.info
index 714bf8c035cb..6e4cb8c96cd5 100644
--- a/academic/xiphos/xiphos.info
+++ b/academic/xiphos/xiphos.info
@@ -1,10 +1,10 @@
 PRGNAM="xiphos"
-VERSION="4.0.6"
+VERSION="4.0.7"
 HOMEPAGE="http://xiphos.org"
-DOWNLOAD="https://github.com/crosswire/xiphos/releases/download/4.0.6/xiphos-4.0.6-20170810.tar.gz"
-MD5SUM="5a990a97da5118c22c2c01d3cb14c5f5"
+DOWNLOAD="https://github.com/crosswire/xiphos/releases/download/4.0.7/xiphos-4.0.7-20170924.tar.gz"
+MD5SUM="b28df49270a2aef4f33297e0d40dd421"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="sword webkitgtk3 biblesync rarian"
+REQUIRES="sword webkitgtk3 biblesync rarian %README%"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"