From 2db21f42f1d573cfa75fb9514a0254b2502c6050 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 1 Jun 2019 08:04:50 +0200
Subject: 20190601.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 office/scribus/scribus.SlackBuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'office/scribus/scribus.SlackBuild')

diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild
index 5842344c68..f163f4aff9 100644
--- a/office/scribus/scribus.SlackBuild
+++ b/office/scribus/scribus.SlackBuild
@@ -27,13 +27,13 @@
 # Including input by Yalla-One and some code cleanup by rworkman
 
 PRGNAM=scribus
-VERSION=${VERSION:-1.4.6}
+VERSION=${VERSION:-1.4.7}
 BUILD=${BUILD:-1}
 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
@@ -44,8 +44,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"
@@ -78,7 +78,7 @@ cmake \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX:PATH=/usr \
   -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-  -DRENDER_LIB=CAIRO
+  -DRENDER_LIB=CAIRO .
 
 make
 make install DESTDIR=$PKG
-- 
cgit v1.2.3