diff options
| -rw-r--r-- | development/phantomjs/phantomjs.SlackBuild | 21 | ||||
| -rw-r--r-- | development/phantomjs/phantomjs.info | 2 | ||||
| -rw-r--r-- | development/phantomjs/qt-gcc5.patch | 58 |
3 files changed, 68 insertions, 13 deletions
diff --git a/development/phantomjs/phantomjs.SlackBuild b/development/phantomjs/phantomjs.SlackBuild index d5acb67424..4302886e79 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 diff --git a/development/phantomjs/phantomjs.info b/development/phantomjs/phantomjs.info index 35c441bad6..34f90fe0a8 100644 --- a/development/phantomjs/phantomjs.info +++ b/development/phantomjs/phantomjs.info @@ -5,6 +5,6 @@ DOWNLOAD="https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-source MD5SUM="f8163aef2230ebbda2d25a71a06ded7d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="chrpath" +REQUIRES="" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" diff --git a/development/phantomjs/qt-gcc5.patch b/development/phantomjs/qt-gcc5.patch new file mode 100644 index 0000000000..39495a5313 --- /dev/null +++ b/development/phantomjs/qt-gcc5.patch @@ -0,0 +1,58 @@ +From 4badb867bbffbd66762c150258b37b6c0b7e3c22 Mon Sep 17 00:00:00 2001 +From: Rex Dieter <rdieter@gmail.com> +Date: Wed, 18 Feb 2015 07:17:22 -0600 +Subject: Configure: Fix detection of GCC 5 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- Backport qt5 commit 9fb4c2c412621b63c06dbbd899f44041b2e126c2 +- fix webkit feature enablement +- set QT_BUILD_KEY (same as gcc4), Qt5 has no QT_BUILD_KEY so no + change there is necessary + +Change-Id: Ie131be711a774052bc42f18e8090b2a3dde69475 +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> +Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> +--- + configure | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index f3a800a..4144400 100755 +--- a/configure ++++ b/configure +@@ -7729,7 +7729,7 @@ case "$XPLATFORM" in + *-g++*) + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 4*|3.4*) ++ 5*|4*|3.4*) + ;; + 3.3*) + canBuildWebKit="no" +@@ -8031,6 +8031,11 @@ g++*) + QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\2,'` + QT_GCC_PATCH_VERSION=0 + ;; ++ *) ++ QT_GCC_MAJOR_VERSION=$COMPILER_VERSION ++ QT_GCC_MINOR_VERSION=0 ++ QT_GCC_PATCH_VERSION=0 ++ ;; + esac + + case "$COMPILER_VERSION" in +@@ -8040,7 +8045,7 @@ g++*) + 3.*) + COMPILER_VERSION="3.*" + ;; +- 4.*) ++ 5*|4.*) + COMPILER_VERSION="4" + ;; + *) +-- +cgit v0.11.0 + |