network/vivaldi: Updated for version 1.0.270.16_1.

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

3 files changed, 20 insertions, 72 deletions

diff --git a/network/vivaldi/doinst.sh b/network/vivaldi/doinst.sh
index ec603cf7e83a..4129fd499ea7 100644
--- a/network/vivaldi/doinst.sh
+++ b/network/vivaldi/doinst.sh
@@ -1,6 +1,6 @@
 set -e
 
-# make links.
+# create links.
 ln -sf /opt/vivaldi-snapshot/vivaldi-snapshot /usr/bin/vivaldi-snapshot
 ln -sf /opt/vivaldi-snapshot/vivaldi-snapshot /opt/vivaldi-snapshot/vivaldi
 
@@ -8,76 +8,18 @@ ln -sf /opt/vivaldi-snapshot/vivaldi-snapshot /opt/vivaldi-snapshot/vivaldi
 chown root:root /opt/vivaldi-snapshot/vivaldi-sandbox
 chmod 4755 /opt/vivaldi-snapshot/vivaldi-sandbox
 
-# modify .desktop file.
-sed -i 's/TargetEnvironment/X-TargetEnvironment/g' /usr/share/applications/vivaldi-snapshot.desktop
-
-# Add icons to the system icons.
-XDG_ICON_RESOURCE="`which xdg-icon-resource 2> /dev/null`"
-if [ ! -x "$XDG_ICON_RESOURCE" ]; then
-  echo "Error: Could not find xdg-icon-resource" >&2
-  exit 1
-fi
-for icon in "/opt/vivaldi-snapshot/product_logo_"*.png; do
-  size="${icon##*/product_logo_}"
-  "$XDG_ICON_RESOURCE" install --size "${size%.png}" "$icon" "vivaldi-snapshot"
-done
-
-# Add an entry to the system menu.
-XDG_DESKTOP_MENU="`which xdg-desktop-menu 2> /dev/null`"
-UPDATE_MENUS="`which update-menus 2> /dev/null`"
-if [ ! -x "$XDG_DESKTOP_MENU" ]; then
-  echo "Error: Could not find xdg-desktop-menu" >&2
-  exit 1
-fi
-
-"$XDG_DESKTOP_MENU"  install --novendor /opt/vivaldi-snapshot/vivaldi-snapshot.desktop
-
-if [ -x "$UPDATE_MENUS" ]; then
-  update-menus
-fi
-
-# Begin SlackBuild options.
+# begin SlackBuilds options.
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-# End SlackBuild options.
-
-# Updates defaults.list file if present.
-update_defaults_list() {
-  # $1: name of the .desktop file
-
-  local DEFAULTS_FILE="/usr/share/applications/defaults.list"
-
-  if [ ! -f "${DEFAULTS_FILE}" ]; then
-    return
-  fi
-
-  # Split key-value pair out of MimeType= line from the .desktop file,
-  # then split semicolon-separated list of mime types (they should not contain
-  # spaces).
-  mime_types="$(grep MimeType= /usr/share/applications/${1} |
-                cut -d '=' -f 2- |
-                tr ';' ' ')"
-  for mime_type in ${mime_types}; do
-    if egrep -q "^${mime_type}=" "${DEFAULTS_FILE}"; then
-      if ! egrep -q "^${mime_type}=.*${1}" "${DEFAULTS_FILE}"; then
-        default_apps="$(grep ${mime_type}= "${DEFAULTS_FILE}" |
-                        cut -d '=' -f 2-)"
-        egrep -v "^${mime_type}=" "${DEFAULTS_FILE}" > "${DEFAULTS_FILE}.new"
-        echo "${mime_type}=${default_apps};${1}" >> "${DEFAULTS_FILE}.new"
-        mv "${DEFAULTS_FILE}.new" "${DEFAULTS_FILE}"
-      fi
-    else
-      # If there's no mention of the mime type in the file, add it.
-      echo "${mime_type}=${1};" >> "${DEFAULTS_FILE}"
-    fi
-  done
-}
-
-update_defaults_list "vivaldi-snapshot.desktop"
+# end SlackBuilds options.
diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild
index 565254df0ebd..9db7659a0143 100644
--- a/network/vivaldi/vivaldi.SlackBuild
+++ b/network/vivaldi/vivaldi.SlackBuild
@@ -24,8 +24,8 @@
 
 PRGNAM="vivaldi"
 SRCNAM="vivaldi-snapshot"
-VERSION=${VERSION:-1.0.264.3}
-SRCVER=${SRCVER:-1.0.264.3-1}
+VERSION=${VERSION:-1.0.270.16}
+SRCVER=${SRCVER:-1.0.270.16-1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,6 +79,12 @@ mv opt usr $PKG/
 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
 
+# install icons.
+for res in 16 22 24 32 48 64 128 256; do
+   install -Dm644 "$PKG/opt/vivaldi-snapshot/product_logo_${res}.png" \
+"$PKG/usr/share/icons/hicolor/${res}x${res}/apps/vivaldi-snapshot.png"
+done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 gzip -dc $PKG/usr/share/doc/vivaldi-snapshot/changelog.gz > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog; rm -rf $PKG/usr/share/doc
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
diff --git a/network/vivaldi/vivaldi.info b/network/vivaldi/vivaldi.info
index de815b149b72..ccadb5467206 100644
--- a/network/vivaldi/vivaldi.info
+++ b/network/vivaldi/vivaldi.info
@@ -1,10 +1,10 @@
 PRGNAM="vivaldi"
-VERSION="1.0.264.3_1"
+VERSION="1.0.270.16_1"
 HOMEPAGE="https://vivaldi.com/"
-DOWNLOAD="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-snapshot_1.0.264.3-1_i386.deb"
-MD5SUM="1a573721c1e50a8111972de82325aa60"
-DOWNLOAD_x86_64="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-snapshot_1.0.264.3-1_amd64.deb"
-MD5SUM_x86_64="a0c890ed2701dfcb89e8bc2f226afcc3"
+DOWNLOAD="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-snapshot_1.0.270.16-1_i386.deb"
+MD5SUM="8dc2e9308c44147ca4cce7f43df94a7e"
+DOWNLOAD_x86_64="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-snapshot_1.0.270.16-1_amd64.deb"
+MD5SUM_x86_64="51d19186d04bd624014cacfce902492b"
 REQUIRES=""
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"