From 3c35fd175d5a452c2a2f4f700457bb702fb25015 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Thu, 15 Apr 2021 14:57:54 +0300 Subject: [PATCH] skype: update to 8.71.0.36, - use the rpm as distfile, (the deb has changed dir structure and I vastly prefer to handle rpms) - simplify do_install(), - add comments on do_install(). --- srcpkgs/skype/template | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index 4776c3120ebc..a8eeaf6f8452 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -1,39 +1,29 @@ # Template file for 'skype' -# This just repackages the debian package. +# This just repackages the rpm package. pkgname=skype -version=8.69.0.77 +version=8.71.0.36 revision=1 archs="x86_64" +create_wrksrc=yes +hostmakedepends="rpmextract" depends="elogind" short_desc="Skype for Linux" maintainer="mobinmob " -license="custom:skype-servicesagreement" +license="custom:skype-servicesagreement" # no vlicense homepage="https://www.skype.com" -distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" -checksum=3daaa53e9f81452d1c1fb5c8e31d7fe47a98b62eb7ad04e1993b4f6a0848407d +distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm" +checksum=4487c1d577dde1526b83493bf7bb50fa585444f9bec07801528dfb0021ba710c repository="nonfree" nostrip="yes" -do_extract() { - ar p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/skypeforlinux_${version}_amd64.deb data.tar.xz | bsdtar xf - ./usr -} - do_install() { - - vsed -i usr/bin/skypeforlinux -e "s;share/;lib/;g" - vbin usr/bin/skypeforlinux - - vmkdir usr/lib - vcopy usr/share/skypeforlinux usr/lib - - vlicense usr/share/doc/skypeforlinux/third-party_attributions.html - # The binary needs to be able to find this under /usr/share/doc - vmkdir usr/share/doc/skypeforlinux - ln -s ../../licenses/skype/third-party_attributions.html ${DESTDIR}/usr/share/doc/skypeforlinux - - vinstall usr/share/applications/skypeforlinux.desktop 644 usr/share/applications - vinstall usr/share/pixmaps/skypeforlinux.png 644 usr/share/pixmaps - find usr/share/icons -type f -print | while read _f; do - vinstall "${_f}" 644 "${_f%/*}" - done + # Copy files + vcopy "*" / + # Move executables to usr/lib and change the launcher script + vsed -i "${DESTDIR}/usr/bin/skypeforlinux" -e "s;share/;lib/;g" + vmkdir usr/lib/skypeforlinux + mv "${DESTDIR}/usr/share/skypeforlinux" "${DESTDIR}/usr/lib/" + # Install NOTICE.txt as license. Skype has only a services + # agreement available online. + vlicense "${DESTDIR}/usr/share/doc/skypeforlinux/NOTICE.txt" }