From a28662bc0ddbd0230f2611fb47b53fc27d6d284c Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 19 Apr 2018 22:14:27 +0200 Subject: deps/poppler: updated --- deps/poppler/poppler.SlackBuild | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/deps/poppler/poppler.SlackBuild b/deps/poppler/poppler.SlackBuild index b416bba..5fb2da3 100755 --- a/deps/poppler/poppler.SlackBuild +++ b/deps/poppler/poppler.SlackBuild @@ -21,10 +21,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified 2016, 2017 by Eric Hameleers +# Modified 2016, 2017, 2018 by Eric Hameleers + +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=poppler -VERSION=${VERSION:-0.63.0} +VERSION=${VERSION:-0.64.0} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -38,6 +40,14 @@ if [ -z "$ARCH" ]; then export ARCH fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -57,7 +67,6 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} rm -rf $PKG @@ -90,7 +99,7 @@ cd build # Adding " -std=c++11" to CXXFLAGS is needed for compiling against Qt >= 5.7: CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=c++11" \ +CXXFLAGS="$SLKCFLAGS -std=c++11 -fpermissive" \ cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_MANDIR=/usr/man \ -- cgit v1.2.3