academic/xiphos: Fix build.

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

3 files changed, 5 insertions, 34 deletions

diff --git a/academic/xiphos/README b/academic/xiphos/README
index 166b55e9b61f..e430c8f0fe1b 100644
--- a/academic/xiphos/README
+++ b/academic/xiphos/README
@@ -4,13 +4,3 @@ 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.
-
-xiphos version 4.2.1 requires sword v1.8.1-3 or higher
-and biblesync v2.0.1 or higher
-
-xiphos needs a version of cmake 3.11 or higher. A private version is
-included in the slackbuild to enable xiphos to be built. If you want to
-use a different cmake to that included here, pass CMVERSION with the
-version you need (and make sure that the source tar.gz is available)
-There are a few new dependencies as the documentation is now created by
-the build process rather than shipped preprocessed in the source.
diff --git a/academic/xiphos/xiphos-glibc.patch b/academic/xiphos/xiphos-glibc.patch
deleted file mode 100644
index 9a89b0d1fba2..000000000000
--- a/academic/xiphos/xiphos-glibc.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- cmake/config.h.cmake.in-orig	2021-04-15 19:28:57.468140150 +0300
-+++ cmake/config.h.cmake.in	2021-04-15 20:45:57.816551253 +0300
-@@ -65,3 +65,5 @@
- 
- 
- #endif
-+
-+#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_26)
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild
index ea6030fa7002..d7638e29e299 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-2022 Tim Dickson, email: dickson.tim@googlemail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xiphos
 VERSION=${VERSION:-4.2.1}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -73,8 +73,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,20 +80,12 @@ 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 -p0 < $CWD/xiphos-glibc.patch
 
+#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"
+echo "1"
 cmake -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX=/usr \
@@ -106,7 +96,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 ..