network/skypeforlinux: Updated for version 8.131.0.202.

Signed-off-by: Mario Preksavec <mario@slackware.hr>

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

3 files changed, 28 insertions, 24 deletions

diff --git a/network/skypeforlinux/README b/network/skypeforlinux/README
index ca41f8983c3a..24e456987c4c 100644
--- a/network/skypeforlinux/README
+++ b/network/skypeforlinux/README
@@ -3,9 +3,4 @@ and video chat services. Users may transmit both text and video
 messages and may exchange digital documents such as images, text, and
 video. Skype allows video conference calls.
 
-This script repackages the Debian package provided by Microsoft.
-
-Currently, only the 64bit version is available.
-
-Note: At the time of writing, the last version known to correctly
-support the gksu/sudo method is: 8.18.0.6
+This script repackages the snapcraft package, 64bit only.
diff --git a/network/skypeforlinux/skypeforlinux.SlackBuild b/network/skypeforlinux/skypeforlinux.SlackBuild
index 8172e0fb7529..d6faf2739116 100644
--- a/network/skypeforlinux/skypeforlinux.SlackBuild
+++ b/network/skypeforlinux/skypeforlinux.SlackBuild
@@ -22,14 +22,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Snap update thanks to Greg Tourte, Frome, United Kingdom
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=skypeforlinux
-VERSION=${VERSION:-8.109.0.209}
+VERSION=${VERSION:-8.131.0.202}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
+# Snap package details:
+# curl -sH 'Snap-Device-Series: 16' http://api.snapcraft.io/v2/snaps/info/skype | jq
+SNAP_ID=QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV
+SNAP_REVISION=${SNAP_REVISION:-370}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -59,15 +66,12 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $PKG
-if [ -f $CWD/${PRGNAM}_${VERSION}_amd64.deb ]; then
-  ar p $CWD/${PRGNAM}_${VERSION}_amd64.deb data.tar.gz | tar -xvz
-elif [ -f $CWD/${PRGNAM}-64.deb ]; then
-  # Support the website download
-  ar p $CWD/${PRGNAM}-64.deb data.tar.gz | tar -xvz
-  VERSION=$(ar p $CWD/${PRGNAM}-64.deb control.tar.gz \
-            | tar -Ozxf - ./control | awk '/^Version:/{print $NF}')
-fi
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+unsquashfs -d . -f -no -q $CWD/${SNAP_ID}_${SNAP_REVISION}.snap \
+  meta/gui usr/share/{,doc}/$PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -75,14 +79,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 {} \;
 
-rm -rf $PKG/opt
+mkdir -p $PKG/usr/{bin,share/{applications,pixmaps}}
+mv usr/share/$PRGNAM $PKG/usr/share/
+for i in $PRGNAM skype ; do ln -s ../share/$PRGNAM/$PRGNAM $PKG/usr/bin/$i ; done
+mv meta/gui/$PRGNAM.png $PKG/usr/share/pixmaps/
+
+for i in $PRGNAM{,-share} ; do
+  sed 's|\${SNAP}/meta/gui|/usr/share/pixmaps|' meta/gui/${i}.desktop > \
+    $PKG/usr/share/applications/${i}.desktop
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/$PRGNAM/LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
-# Fixes: Help -> About Skype -> Third Party Notices
-ln -s $PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM
+mv usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/skypeforlinux/skypeforlinux.info b/network/skypeforlinux/skypeforlinux.info
index 65042236f250..5d9e39d344bb 100644
--- a/network/skypeforlinux/skypeforlinux.info
+++ b/network/skypeforlinux/skypeforlinux.info
@@ -1,10 +1,10 @@
 PRGNAM="skypeforlinux"
-VERSION="8.109.0.209"
+VERSION="8.131.0.202"
 HOMEPAGE="https://www.skype.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.109.0.209_amd64.deb"
-MD5SUM_x86_64="0b44e0494b00b337e7e31f72c3d826c1"
+DOWNLOAD_x86_64="https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_370.snap"
+MD5SUM_x86_64="5ac5a46dfba702c8e936e9de8a804c04"
 REQUIRES=""
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"