Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] skype: update to 8.72.0.82,
@ 2021-05-15 18:48 mobinmob
  2021-05-25 20:11 ` [PR PATCH] [Updated] " mobinmob
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: mobinmob @ 2021-05-15 18:48 UTC (permalink / raw)
  To: ml

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

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

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

skype: update to 8.72.0.82,
- 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/30917.patch is attached

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

From 16ac0db825d3c1da096cafaa20153a34a6d419c4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 15 May 2021 21:44:16 +0300
Subject: [PATCH] skype: update to 8.72.0.82, - 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..8800490de65b 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.72.0.82
 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=e3f259f5dbc87f267b35bec7eea4d6a4db0a32e510f9f9d3b11baa6e8426cf16
 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"
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] skype: update to 8.72.0.82,
  2021-05-15 18:48 [PR PATCH] skype: update to 8.72.0.82, mobinmob
@ 2021-05-25 20:11 ` mobinmob
  2021-05-28 19:54 ` mobinmob
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2021-05-25 20:11 UTC (permalink / raw)
  To: ml

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

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

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

skype: update to 8.72.0.82,
- 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/30917.patch is attached

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

From dd46c9e9845f65ce7515b022cd3d588e8736d334 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 15 May 2021 21:44:16 +0300
Subject: [PATCH] skype: update to 8.72.0.82.

Also:
- 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..8800490de65b 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.72.0.82
 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=e3f259f5dbc87f267b35bec7eea4d6a4db0a32e510f9f9d3b11baa6e8426cf16
 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"
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] skype: update to 8.72.0.82,
  2021-05-15 18:48 [PR PATCH] skype: update to 8.72.0.82, mobinmob
  2021-05-25 20:11 ` [PR PATCH] [Updated] " mobinmob
@ 2021-05-28 19:54 ` mobinmob
  2021-05-28 19:55 ` mobinmob
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2021-05-28 19:54 UTC (permalink / raw)
  To: ml

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

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

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

skype: update to 8.72.0.82,
- 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/30917.patch is attached

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

From 68a29d4f0096335a1baa57ba2c59113318a1f26d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 15 May 2021 21:44:16 +0300
Subject: [PATCH] skype: update to 8.72.0.82.

Also:
- 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..a99bcfc7f6e3 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.72.0.94
 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=712ec58037a5bb226e7c86638524f0ce2e37c6dce1739513c2c9bc271e9e8f02
 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"
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: skype: update to 8.72.0.82,
  2021-05-15 18:48 [PR PATCH] skype: update to 8.72.0.82, mobinmob
  2021-05-25 20:11 ` [PR PATCH] [Updated] " mobinmob
  2021-05-28 19:54 ` mobinmob
@ 2021-05-28 19:55 ` mobinmob
  2021-05-29 10:39 ` skype: update to 88.72.0.94, mobinmob
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2021-05-28 19:55 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/30917#issuecomment-850639978

Comment:
- Update to 8.72.0.94.
- Rebase onto master,

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: skype: update to 88.72.0.94,
  2021-05-15 18:48 [PR PATCH] skype: update to 8.72.0.82, mobinmob
                   ` (2 preceding siblings ...)
  2021-05-28 19:55 ` mobinmob
@ 2021-05-29 10:39 ` mobinmob
  2021-06-16 12:24 ` [PR PATCH] [Updated] " mobinmob
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2021-05-29 10:39 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/30917#issuecomment-850639978

Comment:
- Update to 8.72.0.94.
- Rebase onto master.
- Fix commit message.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] skype: update to 88.72.0.94,
  2021-05-15 18:48 [PR PATCH] skype: update to 8.72.0.82, mobinmob
                   ` (3 preceding siblings ...)
  2021-05-29 10:39 ` skype: update to 88.72.0.94, mobinmob
@ 2021-06-16 12:24 ` mobinmob
  2021-06-16 12:25 ` mobinmob
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2021-06-16 12:24 UTC (permalink / raw)
  To: ml

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

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

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

skype: update to 88.72.0.94,
- 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/30917.patch is attached

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

From 511b922eaed7a0c83e65511d607709b194026b4b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 15 May 2021 21:44:16 +0300
Subject: [PATCH] skype: update to 8.73.0.92.

Also:
- 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..cc95daba5958 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.73.0.92
 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=79503a8c5164046186b8ca192957968455bed4a810aef0e841c83b4bbb5ee4bb
 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"
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: skype: update to 88.72.0.94,
  2021-05-15 18:48 [PR PATCH] skype: update to 8.72.0.82, mobinmob
                   ` (4 preceding siblings ...)
  2021-06-16 12:24 ` [PR PATCH] [Updated] " mobinmob
@ 2021-06-16 12:25 ` mobinmob
  2021-06-16 12:26 ` [PR PATCH] [Updated] " mobinmob
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2021-06-16 12:25 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/30917#issuecomment-862335517

Comment:
- Update to 8.73.0.92.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] skype: update to 88.72.0.94,
  2021-05-15 18:48 [PR PATCH] skype: update to 8.72.0.82, mobinmob
                   ` (5 preceding siblings ...)
  2021-06-16 12:25 ` mobinmob
@ 2021-06-16 12:26 ` mobinmob
  2021-06-16 12:26 ` mobinmob
  2021-06-16 13:25 ` [PR PATCH] [Merged]: skype: update to 8.73.0.92, Piraty
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2021-06-16 12:26 UTC (permalink / raw)
  To: ml

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

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

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

skype: update to 88.72.0.94,
- 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/30917.patch is attached

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

From 087b557b0b7e9af98c9e079f23d0a7df5c8305b7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 15 May 2021 21:44:16 +0300
Subject: [PATCH] skype: update to 8.73.0.92.

Also:
- 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..cc95daba5958 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.73.0.92
 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=79503a8c5164046186b8ca192957968455bed4a810aef0e841c83b4bbb5ee4bb
 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"
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: skype: update to 88.72.0.94,
  2021-05-15 18:48 [PR PATCH] skype: update to 8.72.0.82, mobinmob
                   ` (6 preceding siblings ...)
  2021-06-16 12:26 ` [PR PATCH] [Updated] " mobinmob
@ 2021-06-16 12:26 ` mobinmob
  2021-06-16 13:25 ` [PR PATCH] [Merged]: skype: update to 8.73.0.92, Piraty
  8 siblings, 0 replies; 10+ messages in thread
From: mobinmob @ 2021-06-16 12:26 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/30917#issuecomment-862335517

Comment:
- Update to 8.73.0.92.
- Rebase on master.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Merged]: skype: update to 8.73.0.92,
  2021-05-15 18:48 [PR PATCH] skype: update to 8.72.0.82, mobinmob
                   ` (7 preceding siblings ...)
  2021-06-16 12:26 ` mobinmob
@ 2021-06-16 13:25 ` Piraty
  8 siblings, 0 replies; 10+ messages in thread
From: Piraty @ 2021-06-16 13:25 UTC (permalink / raw)
  To: ml

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

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

skype: update to 8.73.0.92,
https://github.com/void-linux/void-packages/pull/30917

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
-->


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-06-16 13:25 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-15 18:48 [PR PATCH] skype: update to 8.72.0.82, mobinmob
2021-05-25 20:11 ` [PR PATCH] [Updated] " mobinmob
2021-05-28 19:54 ` mobinmob
2021-05-28 19:55 ` mobinmob
2021-05-29 10:39 ` skype: update to 88.72.0.94, mobinmob
2021-06-16 12:24 ` [PR PATCH] [Updated] " mobinmob
2021-06-16 12:25 ` mobinmob
2021-06-16 12:26 ` [PR PATCH] [Updated] " mobinmob
2021-06-16 12:26 ` mobinmob
2021-06-16 13:25 ` [PR PATCH] [Merged]: skype: update to 8.73.0.92, Piraty

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).