diff options
author | Larry Hajali <larryhaja@gmail.com> | 2017-01-25 09:29:24 -0800 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-01-28 07:38:31 +0700 |
commit | b67bfa3061ae49cc101c96e5ea3e466eb139df32 (patch) | |
tree | 9362eadc8139ef0d604846d218558c1233b944d7 /libraries | |
parent | 6ec458ef6c31c5a63e27392c9dd00ed447b011fc (diff) |
libraries/poppler-qt5: fix build against Qt 5.7.1
Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/poppler-qt5/poppler-qt5.SlackBuild | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libraries/poppler-qt5/poppler-qt5.SlackBuild b/libraries/poppler-qt5/poppler-qt5.SlackBuild index 66b10151097df..ce99c22afc572 100644 --- a/libraries/poppler-qt5/poppler-qt5.SlackBuild +++ b/libraries/poppler-qt5/poppler-qt5.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for poppler-qt5 -# Copyright 2013 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +24,12 @@ PRGNAM=poppler-qt5 VERSION=${VERSION:-0.45.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} 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 +40,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" @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ |