From ba295afbbb907833cfa6ac387484f96d170b9932 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 6 Mar 2021 11:17:38 +0100
Subject: 20210306.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 graphics/kphotoalbum/kphotoalbum.SlackBuild | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'graphics/kphotoalbum/kphotoalbum.SlackBuild')

diff --git a/graphics/kphotoalbum/kphotoalbum.SlackBuild b/graphics/kphotoalbum/kphotoalbum.SlackBuild
index ff0c67222a..baf39a00b2 100644
--- a/graphics/kphotoalbum/kphotoalbum.SlackBuild
+++ b/graphics/kphotoalbum/kphotoalbum.SlackBuild
@@ -4,13 +4,13 @@
 # By default the demo pictures and movie are packaged.
 
 PRGNAM=kphotoalbum
-VERSION=${VERSION:-4.7.1}
+VERSION=${VERSION:-5.7.0}
 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
@@ -25,8 +25,8 @@ OUTPUT=${OUTPUT:-/tmp}
 # set DEMO to no to omit them.
 DEMO=${DEMO:-yes}
 
-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"
@@ -56,13 +56,12 @@ find -L . \
 
 mkdir build && cd build
   cmake \
-    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
     -DLIB_INSTALL_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     ..
-  make -j1
+  make
   make install DESTDIR=$PKG
 cd -
 
@@ -71,7 +70,7 @@ if [ "$DEMO" = "no" ]; then
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog tips README \
+cp -a COPYING ChangeLog tips README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-- 
cgit v1.2.3