system/sakura: Updated for version 3.4.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 36 insertions, 29 deletions

diff --git a/system/sakura/README b/system/sakura/README
index 9f72ecb534..0aeaec3004 100644
--- a/system/sakura/README
+++ b/system/sakura/README
@@ -1,4 +1,5 @@
-sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator
-with few dependencies, so you don't need a full GNOME desktop installed to
-have a decent terminal emulator. Sakura uses a notebook to provide several
-terminals in one window and adds a contextual menu with some basic options.
+Sakura is a terminal emulator based on GTK and libvte. It has few
+dependencies, so there's no need of a full GNOME desktop installed to
+have a powerful terminal emulator. Sakura uses a GTK notebook to provide
+tabbed terminals in one window and has a contextual menu for
+configuration; it was designed without a menubar. No more or less.
diff --git a/system/sakura/sakura.SlackBuild b/system/sakura/sakura.SlackBuild
index f03d9b30f8..4ae662af88 100644
--- a/system/sakura/sakura.SlackBuild
+++ b/system/sakura/sakura.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Erik Hanson  erik@slackbuilds.org
 # Updated by Kristaps Esterlins <esterlinsh[at]gmail.com>
 # Updated by Eugene Wissner <eugen@flevum.de>
-# Updated by Donald Cooley <dfc@warpmail.net>
+# Copyright 2017 Donald Cooley South Haven, IN USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,20 +25,25 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sakura
-VERSION=${VERSION:-3.3.3}
+VERSION=${VERSION:-3.4.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
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -47,11 +52,6 @@ else
   SLKCFLAGS="-O2"
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 set -e
 
 rm -rf $PKG
@@ -67,12 +67,18 @@ 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 {} \;
 
-cmake \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DNDEBUG" \
-  -DCMAKE_BUILD_TYPE=Release
+#  -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DNDEBUG" \
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
 make
 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/system/sakura/sakura.info b/system/sakura/sakura.info
index 8cdf6eed4e..b9c2ebeadf 100644
--- a/system/sakura/sakura.info
+++ b/system/sakura/sakura.info
@@ -1,10 +1,10 @@
 PRGNAM="sakura"
-VERSION="3.3.3"
-HOMEPAGE="https://launchpad.net/sakura"
-DOWNLOAD="https://launchpad.net/sakura/trunk/3.3.3/+download/sakura-3.3.3.tar.bz2"
-MD5SUM="50ba216554bcedffae7612f4271137ad"
+VERSION="3.4.0"
+HOMEPAGE="http://www.pleyades.net/david/projects/sakura"
+DOWNLOAD="https://launchpad.net/sakura/trunk/3.4.0/+download/sakura-3.4.0.tar.bz2"
+MD5SUM="dfc4b01f8cabea475334a2825b66f62b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="vte3"
 MAINTAINER="Donald Cooley"
-EMAIL="dfc@warpmail.net"
+EMAIL="chytraeu@sdf.org"
diff --git a/system/sakura/slack-desc b/system/sakura/slack-desc
index e58c826b93..17dabcefbd 100644
--- a/system/sakura/slack-desc
+++ b/system/sakura/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 sakura: sakura (a terminal emulator)
 sakura:
-sakura: sakura is a terminal emulator based on GTK and VTE. It's a terminal
-sakura: emulator with few dependencies, so you don't need a full GNOME
-sakura: desktop installed to have a decent terminal emulator. Sakura uses
-sakura: a notebook to provide several terminals in one window and adds
-sakura: a contextual menu with some basic options. No more no less.
+sakura: Sakura is a terminal emulator based on GTK and libvte. It has few
+sakura: dependencies, so there's no need of a full GNOME desktop installed to
+sakura: have a powerful terminal emulator. Sakura uses a GTK notebook to
+sakura: provide tabbed terminals in one window and has a contextual menu for
+sakura: configuration; it was designed without a menubar. No more or less.
 sakura:
-sakura: http://pleyades.net/david/sakura.php
 sakura:
 sakura:
+sakura: http://www.pleyades.net/david/projects/sakura