network/vivaldi: Updated for version 1.11.917.39.

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

4 files changed, 33 insertions, 40 deletions

diff --git a/network/vivaldi/README b/network/vivaldi/README
index 3723a37e8c..57f7dffd5f 100644
--- a/network/vivaldi/README
+++ b/network/vivaldi/README
@@ -1,8 +1,13 @@
 vivaldi (web browser).
 
-A Browser for Our Friends. An advanced browser made with the power user in
-mind. Finally you can surf your way.
+A Browser for Our Friends. An advanced browser made with the power user
+in mind. Finally you can surf your way.
 
-This suggests: pepperflash-plugin, ffmpeg, vivaldi-codecs-ffmpeg-extra
+Passing to the script the variable CUSTOM_CSS:
+CUSTOM_CSS=yes ./vivaldi.SlackBuild
+makes it possible to customize the user interface using the
+/opt/vivaldi/resources/vivaldi/style/custom.css file.
+By default, CUSTOM_CSS=no.
 
-* Since version 1.10.838.7 Vivaldi's Team drops 32 bits support.
+pepperflash-plugin, ffmpeg, vivaldi-codecs-ffmpeg-extra are optional
+recommended dependencies.
diff --git a/network/vivaldi/slack-desc b/network/vivaldi/slack-desc
index 34e0789c4d..fb2335b9c7 100644
--- a/network/vivaldi/slack-desc
+++ b/network/vivaldi/slack-desc
@@ -13,7 +13,7 @@ vivaldi:
 vivaldi: An advanced browser made with the power user in mind. Finally you
 vivaldi: can surf your way.
 vivaldi:
-vivaldi: Home Page: https://vivaldi.com/
+vivaldi: Home Page: https://vivaldi.com
 vivaldi:
 vivaldi:
 vivaldi:
diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild
index 65386fd648..0c8ea8803a 100644
--- a/network/vivaldi/vivaldi.SlackBuild
+++ b/network/vivaldi/vivaldi.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 #
-# Slackware build script for Vivaldi.
+# Slackware build script for vivaldi.
 #
 # Copyright 2015-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2017, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vivaldi
-VERSION=${VERSION:-1.10.867.48}
+VERSION=${VERSION:-1.11.917.39}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,42 +36,25 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+case "$ARCH" in
+    i?86) BITS="i386" ;;
+  x86_64) BITS="amd64" ;;
+       *) echo "$ARCH is not supported."
+          exit 1 ;;
+esac
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-  BITS="i386"
-  echo "This package is currently only available for 64bit."
-  exit 1
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  BITS="i386"
-  echo "This package is currently only available for 64bit."
-  exit 1
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  BITS="amd64"
-else
-  echo "Package for $(uname -m) architecture is not available."
-  exit 1
-fi
-
-SRCNAM=$PRGNAM-stable
-SRCVER=$VERSION-1
-
 set -e
 
 rm -rf $PKG $TMP/$PRGNAM
 mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
 
 cd $TMP/$PRGNAM
-ar p $CWD/${SRCNAM}_${SRCVER}_${BITS}.deb data.tar.xz | tar xvJ
+ar p $CWD/${PRGNAM}-stable_${VERSION}-*_${BITS}.deb data.tar.xz | tar xvJ
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -81,6 +65,10 @@ find -L . \
 rm -r opt/vivaldi/cron
 mv opt usr $PKG/
 
+[ "${CUSTOM_CSS:-no}" != "no" ] && \
+  sed -i 's/^\([\ ]*<link.*\)common\(\.css.*\)$/\1common\2\n\1custom\2/' \
+    $PKG/opt/vivaldi/resources/vivaldi/browser.html
+
 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/network/vivaldi/vivaldi.info b/network/vivaldi/vivaldi.info
index 027a8920cf..40e1890bee 100644
--- a/network/vivaldi/vivaldi.info
+++ b/network/vivaldi/vivaldi.info
@@ -1,10 +1,10 @@
 PRGNAM="vivaldi"
-VERSION="1.10.867.48"
-HOMEPAGE="https://vivaldi.com/"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-stable_1.10.867.48-1_amd64.deb"
-MD5SUM_x86_64="f206237bfea301c9ac8f1fab56c3217d"
+VERSION="1.11.917.39"
+HOMEPAGE="https://vivaldi.com"
+DOWNLOAD="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-stable_1.11.917.39-1_i386.deb"
+MD5SUM="6ead4c88cdb43b5032c2dd9786d2ef87"
+DOWNLOAD_x86_64="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-stable_1.11.917.39-1_amd64.deb"
+MD5SUM_x86_64="ffe77f50124cfa02c3a5e5c12f242d5a"
 REQUIRES=""
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"