summaryrefslogtreecommitdiff
path: root/academic
diff options
context:
space:
mode:
authorTim Dickson <dickson.tim@googlemail.com>2016-10-02 23:29:46 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-10-02 23:29:46 +0700
commit8340b68795d35f9fdac4b19762732940e55a4216 (patch)
tree8a363a9839bd3429ad1b2ec18521cf9c51de339c /academic
parent16bc3dd358c446aa3447be6b418bfbadf998b1a2 (diff)
downloadslackbuilds-8340b68795d35f9fdac4b19762732940e55a4216.tar.gz
academic/xiphos: Switch to i586.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'academic')
-rw-r--r--academic/xiphos/xiphos.SlackBuild14
-rw-r--r--academic/xiphos/xiphos.info2
2 files changed, 9 insertions, 7 deletions
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild
index 9087069730..24dcb92606 100644
--- a/academic/xiphos/xiphos.SlackBuild
+++ b/academic/xiphos/xiphos.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xiphos
-# Copyright 2015 Tim Dickson, email: dickson.tim@googlemail.com
+# Copyright 2015/2016 Tim Dickson, email: dickson.tim@googlemail.com
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,13 @@
PRGNAM=xiphos
VERSION=${VERSION:-4.0.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
+#updated build number for slackware 14.2 which has one less dependency
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -73,7 +74,8 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./waf configure \
--prefix=/usr \
- --enable-webkit-editor
+ --enable-webkit-editor \
+ --gtk=3
# --gtk=2 doesn't work with webkitgtk as gtk2 is disabled
./waf build
diff --git a/academic/xiphos/xiphos.info b/academic/xiphos/xiphos.info
index 66a229d30b..e3fea5352b 100644
--- a/academic/xiphos/xiphos.info
+++ b/academic/xiphos/xiphos.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://heanet.dl.sourceforge.net/project/gnomesword/Xiphos/4.0.4/xipho
MD5SUM="a1d88b7d6812fd261d71a229999c669d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="sword gtkhtml webkitgtk3 biblesync rarian"
+REQUIRES="sword webkitgtk3 biblesync rarian"
MAINTAINER="Tim Dickson"
EMAIL="dickson.tim@googlemail.com"