1 files changed, 28 insertions, 17 deletions
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild
index b6829d93b0..cd9533ba6f 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