diff options
| author | Heinz Wiesinger <pprkut@slackbuilds.org> | 2016-04-20 21:52:57 +0200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-04-23 15:33:59 +0700 |
| commit | 7cdd5d384e9fb35d7f6698b142b5518531939076 (patch) | |
| tree | 11aee2057be4dafc355a3e0ab4cc9fcd4a8a8781 /development/phantomjs/phantomjs.SlackBuild | |
| parent | 25c39c2612f8ad0fa296f6a926b157ad7add44ce (diff) | |
development/phantomjs: Fix building on -current.
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Diffstat (limited to 'development/phantomjs/phantomjs.SlackBuild')
| -rw-r--r-- | development/phantomjs/phantomjs.SlackBuild | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/development/phantomjs/phantomjs.SlackBuild b/development/phantomjs/phantomjs.SlackBuild index d5acb674246b9..4302886e7902f 100644 --- a/development/phantomjs/phantomjs.SlackBuild +++ b/development/phantomjs/phantomjs.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for phantomjs -# Copyright 2012-2014 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2012-2016 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=phantomjs VERSION=${VERSION:-1.9.8} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -76,16 +76,15 @@ sed -i "s|export MAKEFLAGS=||" src/qt/preconfig.sh # Don't use unsupported -fuse-ld=gold flag sed -i "6,11d" src/qt/src/3rdparty/webkit/Source/common.pri -cd src/qt - ./preconfig.sh +# Fix alsa test +sed -i "s|SND_LIB_MINOR == 0 \&\& SND_LIB_SUBMINOR >= 10|SND_LIB_MINOR == 1 \&\& SND_LIB_SUBMINOR >= 0|" \ + src/qt/config.tests/unix/alsa/alsatest.cpp - mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/phantomjs-qt +# Fix gcc 5 detection in qt's configure script +patch -p1 -d src/qt -i $CWD/qt-gcc5.patch - for i in Core Gui Network WebKit Xml; do - cp -d lib/libQt$i.* $PKG/usr/lib$LIBDIRSUFFIX/phantomjs-qt/ - chmod 755 $PKG/usr/lib$LIBDIRSUFFIX/phantomjs-qt/libQt$i.* - chown root:root $PKG/usr/lib$LIBDIRSUFFIX/phantomjs-qt/libQt$i.* - done +cd src/qt + ./preconfig.sh cd - src/qt/bin/qmake @@ -99,8 +98,6 @@ mkdir -p $PKG/usr/bin install -m 755 bin/phantomjs $PKG/usr/bin/ -chrpath -r \$ORIGIN/../lib$LIBDIRSUFFIX/phantomjs-qt $PKG/usr/bin/phantomjs - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true |