network/vivaldi: Updated for version 5.2.2623.48.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

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

1 files changed, 19 insertions, 30 deletions

diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild
index e6e90a0135..7a951c7c3b 100644
--- a/network/vivaldi/vivaldi.SlackBuild
+++ b/network/vivaldi/vivaldi.SlackBuild
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=vivaldi
-VERSION=${VERSION:-5.2.2623.46}
+VERSION=${VERSION:-5.2.2623.48}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -65,17 +65,25 @@ 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 {} \;
 
-rm -r opt/vivaldi/cron
+rm -r opt/vivaldi/cron usr/share/doc
 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
 
-# Make symlinks relative
+# Create relative symlinks (first removing any potentially non-relative
+# ones).
+
 rm -f $PKG/usr/bin/vivaldi* $PKG/opt/vivaldi/WidevineCdm
 ln -s ../../opt/vivaldi/vivaldi $PKG/usr/bin/vivaldi
 ln -s ../../opt/vivaldi/vivaldi $PKG/usr/bin/vivaldi-stable
-# Note that this is a broken link until the user manually installs widevineCdm
+
+# This following may appear as a broken/dangling symlink but it actually
+# can be used by Vivaldi as a fallback source for Widevine in cases
+# where, Google Chrome is also installed (it bundles Widevine at the
+# linked location) and the components system in the browser
+# (vivaldi://components) is non-functional.
+
 ln -s ../google/chrome/WidevineCdm $PKG/opt/vivaldi/WidevineCdm
 
 for res in 16 22 24 32 48 64 128 256; do
@@ -89,33 +97,14 @@ sed \
   > $PKG/usr/share/applications/vivaldi.desktop
 rm $PKG/usr/share/applications/vivaldi-stable.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-gzip -dc $PKG/usr/share/doc/vivaldi-stable/changelog.gz > \
-  $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
-rm -rf $PKG/usr/share/doc
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-# Add a note about uninstall on Slackware 14.2
-cat <<EON> $PKG/usr/doc/$PRGNAM-$VERSION/UNINSTALL-Slackware-14.2.txt
-Since '${0##*/}' was created with Slackware 15 and above in mind, it
-uses the new 'douninst.sh' script to clear down any proprietary media libs
-fetched by 'update-ffmpeg' during post install.
-
-If you run 14.2 (or older), make a copy of the douninst.sh *before* uninstall:
-
-  cp /var/lib/pkgtools/douninst.sh/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG .
-
-Then simply run it as root after uninstall.
-
-(If you forget it is not the end of the world, you will just potentially leave
-behind a small file [libffmpeg.so] under /var/opt/vivaldi*)
-EON
+for doc in README README.SBo $PRGNAM.SlackBuild; do
+  install -Dm644 $CWD/$doc $PKG/usr/doc/$PRGNAM-$VERSION/$doc
+done
+lynx -dump file://$CWD/${VERSION}.html > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
 
-mkdir -p $PKG/install $PKG/var/lib/pkgtools/douninst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-cat $CWD/douninst.sh > $PKG/var/lib/pkgtools/douninst.sh/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG
+for meta in doinst.sh douninst.sh slack-desc; do
+  install -Dm644 $CWD/$meta $PKG/install/$meta
+done
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE