1 files changed, 6 insertions, 14 deletions
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild
index e7f907c745..3471341e36 100644
--- a/academic/xiphos/xiphos.SlackBuild
+++ b/academic/xiphos/xiphos.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xiphos
 
-# Copyright 2015-2020 Tim Dickson, email: dickson.tim@googlemail.com
+# Copyright 2015-2023 Tim Dickson, email: dickson.tim@googlemail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#note: webkit2gtk is a dep, but is already included as a dep of yelp.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xiphos
 VERSION=${VERSION:-4.2.1}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -73,8 +75,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-#we will use a newer version of cmake (at least 3.11)
-
 #sane permissions for everything
 chown -R root:root .
 find -L . \
@@ -82,18 +82,11 @@ 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 {} \;
-#
-#lets make newer cmake available to the xiphos build
-OLDPATH=$PATH
-export PATH=/opt/cmake-202x/bin:$PATH
-
-# 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
 
+#patch to make work with newer glib
+echo "#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_26)" >>cmake/config.h.cmake.in
 mkdir -p build
 cd build
-export "PATH=/opt/cmake-202x/bin:$PATH"
 cmake -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX=/usr \
@@ -104,7 +97,6 @@ cmake -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DDBUS=OFF -DSTRIP=ON -DPOSTINST=OFF -DGTKHTML=ON ..
 
 #cmake should have created make file so restore PATH
-export PATH=$OLDPATH
 make
 make install DESTDIR=$PKG
 cd ..