From 37498e325fe958c6948fae9ee70e16ec9427d9a4 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 29 Feb 2020 10:21:37 +0100
Subject: 20200229.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 desktop/cairo-dock/cairo-dock.SlackBuild | 17 ++++++++++-------
 desktop/cairo-dock/cairo-dock.info       |  6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'desktop/cairo-dock')

diff --git a/desktop/cairo-dock/cairo-dock.SlackBuild b/desktop/cairo-dock/cairo-dock.SlackBuild
index f12d52fb2d..9935833256 100644
--- a/desktop/cairo-dock/cairo-dock.SlackBuild
+++ b/desktop/cairo-dock/cairo-dock.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cairo-dock
-VERSION=${VERSION:-3.3.2}
+VERSION=${VERSION:-3.4.1}
 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
@@ -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"
@@ -59,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-core-$VERSION
 tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM-core-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,16 +69,19 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+mkdir build
+cd build
 cmake \
   -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
   -DLIB_SUFFIX=${LIBDIRSUFFIX} \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DMAN_INSTALL_DIR=/usr/man \
-  -DCMAKE_BUILD_TYPE=Release .
+  -DCMAKE_BUILD_TYPE=Release ..
 
 make VERBOSE=1
 make install DESTDIR=$PKG
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/desktop/cairo-dock/cairo-dock.info b/desktop/cairo-dock/cairo-dock.info
index d439b98f7a..1c6f1ba104 100644
--- a/desktop/cairo-dock/cairo-dock.info
+++ b/desktop/cairo-dock/cairo-dock.info
@@ -1,8 +1,8 @@
 PRGNAM="cairo-dock"
-VERSION="3.3.2"
+VERSION="3.4.1"
 HOMEPAGE="http://www.glx-dock.org"
-DOWNLOAD="https://launchpad.net/cairo-dock-core/3.3/3.3.2/+download/cairo-dock-3.3.2.tar.gz"
-MD5SUM="aae077803322049e2488ca7c2980cd0d"
+DOWNLOAD="https://github.com/Cairo-Dock/cairo-dock-core/archive/3.4.1/cairo-dock-3.4.1.tar.gz"
+MD5SUM="63285f2744a76354cea9cc4c012b3c11"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtkglext"
-- 
cgit v1.2.3