academic/xiphos: Updated for version 4.1.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 35 insertions, 21 deletions

diff --git a/academic/xiphos/README b/academic/xiphos/README
index 4dcb5d5fa7558..1860dba832ed0 100644
--- a/academic/xiphos/README
+++ b/academic/xiphos/README
@@ -22,4 +22,7 @@ found, so an empty imagebox is added in the text if you try to add an icon.
 
 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.
+line. This can be fixed by making the sidebar a little bit wider.
+
+Note. xiphos version 4.1.0 requires sword v1.8 or higher
+and biblesync v1.2 or higher
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild
index b6829d93b05dc..cd9533ba6f2d5 100644
--- a/academic/xiphos/xiphos.SlackBuild
+++ b/academic/xiphos/xiphos.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xiphos
 
-# Copyright 2015-2017 Tim Dickson, email: dickson.tim@googlemail.com
+# Copyright 2015-2018 Tim Dickson, email: dickson.tim@googlemail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xiphos
-VERSION=${VERSION:-4.0.7}
+VERSION=${VERSION:-4.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 #if WK2 is yes use webkit2. this requires webkit2gtk and gtkhtml (v4) instead of webkitgtk3
 WK2=${WK2:-no}
 
@@ -62,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-20170924.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,23 +71,33 @@ 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 {} \;
+
+./waf distclean
+
+# patch navbar_versekey.gtkbuilder to work with gtk shipped with slackware 14.2
+# patch won't be needed for slackware 15
+sed -i "s/3.20/3.14/g" ui/navbar_versekey.gtkbuilder
+
 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
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./waf configure \
+    --prefix=/usr \
+    --enable-webkit2 \
+    --gtk=3
+  # --disable-dbus
+  #  --gtk=2   doesn't work with webkitgtk as gtk2 is disabled
 else
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./waf configure \
-  --prefix=/usr \
-  --enable-webkit-editor \
-  --gtk=3
-#  --gtk=2   doesn't work with webkitgtk as gtk2 is disabled
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./waf configure \
+    --prefix=/usr \
+    --enable-webkit-editor \
+    --gtk=3
+  #  --disable-dbus
+  #  --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 6e4cb8c96cd53..d2cd894617ba6 100644
--- a/academic/xiphos/xiphos.info
+++ b/academic/xiphos/xiphos.info
@@ -1,8 +1,8 @@
 PRGNAM="xiphos"
-VERSION="4.0.7"
+VERSION="4.1.0"
 HOMEPAGE="http://xiphos.org"
-DOWNLOAD="https://github.com/crosswire/xiphos/releases/download/4.0.7/xiphos-4.0.7-20170924.tar.gz"
-MD5SUM="b28df49270a2aef4f33297e0d40dd421"
+DOWNLOAD="https://github.com/crosswire/xiphos/releases/download/4.1.0/xiphos-4.1.0.tar.gz"
+MD5SUM="f40c5b249c50a49af71de94420ee720d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="sword webkitgtk3 biblesync rarian %README%"