[PR PATCH] skype: update to 8.71.0.36,

[PR PATCH] skype: update to 8.71.0.36,

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1750 bytes --]

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages skype
https://github.com/void-linux/void-packages/pull/30252

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().

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30252.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-skype-30252.patch --]
[-- Type: text/x-diff, Size: 2734 bytes --]

From 3c35fd175d5a452c2a2f4f700457bb702fb25015 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
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 <mobinmob@disroot.org>"
-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"
 }

Re: [PR PATCH] [Updated] skype: update to 8.71.0.36,

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1755 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages skype
https://github.com/void-linux/void-packages/pull/30252

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().

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30252.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-skype-30252.patch --]
[-- Type: text/x-diff, Size: 2799 bytes --]

From 408cacae6a3aaab0644931e73e1627391d8bdfd0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
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 | 44 +++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 4776c3120ebc..c6a157d26299 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,39 +1,31 @@
 # 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 <mobinmob@disroot.org>"
-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"
+	# Remove unneeded dir.
+	rm -rf "${DESTDIR}/usr/lib/.build-id"
 }

Re: skype: update to 8.71.0.36,

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/30252#issuecomment-841707645

Comment:
Superseeded by https://github.com/void-linux/void-packages/pull/30917 .

Re: [PR PATCH] [Closed]: skype: update to 8.71.0.36,

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There's a closed pull request on the void-packages repository

skype: update to 8.71.0.36,
https://github.com/void-linux/void-packages/pull/30252

Description:
- 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().

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->