diff options
Diffstat (limited to 'academic/xiphos')
| -rw-r--r-- | academic/xiphos/xiphos.SlackBuild | 33 | ||||
| -rw-r--r-- | academic/xiphos/xiphos.info | 6 |
2 files changed, 7 insertions, 32 deletions
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild index ee8a4f4379..859e77f6bc 100644 --- a/academic/xiphos/xiphos.SlackBuild +++ b/academic/xiphos/xiphos.SlackBuild @@ -24,8 +24,7 @@ PRGNAM=xiphos VERSION=${VERSION:-4.2.1} -CMVERSION=${CMVERSION:-3.17.2} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -64,8 +63,7 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -#we need a private copy of a newer version of cmake (at least 3.11) -tar xvf $CWD/cmake-$CMVERSION.tar.gz +#we will use a newer version of cmake (at least 3.11) #sane permissions for everything chown -R root:root . @@ -75,32 +73,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # -#now do private cmake stuff - note capital C -cd CMake-$CMVERSION -mkdir cmake-build -cd cmake-build -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ - ../configure \ - --prefix=$TMP/$PRGNAM-$VERSION/tmpcmake \ - --docdir=/doc \ - --no-qt-gui \ - --system-curl \ - --system-expat \ - --no-system-jsoncpp \ - --system-zlib \ - --system-bzip2 \ - --system-libarchive -#we don't care about the docs really as this is a temp install. -make -make install -#hopefully that has installed our tmp cmake in the right place -#in $TMP/$PRGNAM-$VERSION/tmpcmake/bin -#lets make it available to the xiphos build +#lets make newer cmake available to the xiphos build OLDPATH=$PATH -export PATH=$TMP/$PRGNAM-$VERSION/tmpcmake/bin:$PATH -#move back to the right directory -cd ../../ +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 diff --git a/academic/xiphos/xiphos.info b/academic/xiphos/xiphos.info index b210cffe1d..1fa129b3f2 100644 --- a/academic/xiphos/xiphos.info +++ b/academic/xiphos/xiphos.info @@ -1,10 +1,10 @@ PRGNAM="xiphos" VERSION="4.2.1" HOMEPAGE="http://xiphos.org" -DOWNLOAD="https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2.1.tar.gz https://github.com/KitWare/CMake/archive/v3.17.2/cmake-3.17.2.tar.gz" -MD5SUM="77d8a99c063433bea3006954710b2fd5 41e0259ede89083081d3276ecaba5b38" +DOWNLOAD="https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2.1.tar.gz" +MD5SUM="77d8a99c063433bea3006954710b2fd5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="sword webkitgtk3 biblesync rarian gtkhtml libminizip appstream-glib yelp" +REQUIRES="sword webkitgtk3 biblesync rarian gtkhtml libminizip appstream-glib yelp cmake-202x" MAINTAINER="Tim Dickson" EMAIL="dickson.tim@googlemail.com" |