* [PR PATCH] anydesk: fix eula checksum.
@ 2022-03-27 18:27 mobinmob
2022-03-27 18:57 ` tibequadorian
` (10 more replies)
0 siblings, 11 replies; 18+ messages in thread
From: mobinmob @ 2022-03-27 18:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages anydesk
https://github.com/void-linux/void-packages/pull/36381
anydesk: fix eula checksum.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/36381.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-anydesk-36381.patch --]
[-- Type: text/x-diff, Size: 871 bytes --]
From 60f8b53edcf1d5051a4d353f63c9abce105d3879 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 27 Mar 2022 21:26:45 +0300
Subject: [PATCH] anydesk: fix eula checksum.
---
srcpkgs/anydesk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index ba95d8775fe1..cfa7d5427832 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -16,7 +16,7 @@ restricted=yes
distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm"
checksum=93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
-_eula_digest=cf42c51d94d40c5890b103a1b2c5b62b5faad7af1e14933cab98dea8066175e8
+_eula_digest=86f8a2b9244ffce441fcaeb99895470c6790f1c334e74e760cd50a9f3a7216c4
post_extract() {
$XBPS_FETCH_CMD -o eula.html https://anydesk.com/en/terms
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
@ 2022-03-27 18:57 ` tibequadorian
2022-03-27 19:00 ` mobinmob
` (9 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: tibequadorian @ 2022-03-27 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/36381#issuecomment-1079998376
Comment:
In their "Generic Linux" version is a copyright file
https://download.anydesk.com/linux/anydesk-6.1.1-amd64.tar.gz
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
2022-03-27 18:57 ` tibequadorian
@ 2022-03-27 19:00 ` mobinmob
2022-03-27 19:00 ` mobinmob
` (8 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2022-03-27 19:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/36381#issuecomment-1079998759
Comment:
> In their "Generic Linux" version is a copyright file https://download.anydesk.com/linux/anydesk-6.1.1-amd64.tar.gz
Not sure that is enough, but the current way of getting the eula and its checksum offes nothing at all.
I will check the contents and probably revert to that, thanks @tibequadorian !
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
2022-03-27 18:57 ` tibequadorian
2022-03-27 19:00 ` mobinmob
@ 2022-03-27 19:00 ` mobinmob
2022-03-27 19:50 ` [PR PATCH] [Updated] " mobinmob
` (7 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2022-03-27 19:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/36381#issuecomment-1079998759
Comment:
> In their "Generic Linux" version is a copyright file https://download.anydesk.com/linux/anydesk-6.1.1-amd64.tar.gz
Not sure that is enough, but the current way of getting the eula and its checksum offers nothing.
I will check the contents and probably revert to that, thanks @tibequadorian !
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
` (2 preceding siblings ...)
2022-03-27 19:00 ` mobinmob
@ 2022-03-27 19:50 ` mobinmob
2022-03-27 19:52 ` mobinmob
` (6 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2022-03-27 19:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages anydesk
https://github.com/void-linux/void-packages/pull/36381
anydesk: fix eula checksum.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/36381.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-anydesk-36381.patch --]
[-- Type: text/x-diff, Size: 2307 bytes --]
From 7d001d1d008072bc57c2f7948f78797a0ef43a90 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 27 Mar 2022 21:26:45 +0300
Subject: [PATCH] anydesk: use the generic upstream tarball.
That fixes the issue with the eula checksums,
thanks @tibequadorian.
---
srcpkgs/anydesk/template | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index ba95d8775fe1..cbbe8b7a66e7 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,10 +1,10 @@
# Template file for 'anydesk'
pkgname=anydesk
version=6.1.1
-revision=1
+revision=2
archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="patchelf rpmextract w3m"
+hostmakedepends="patchelf"
+depends="hicolor-icon-theme"
short_desc="Fast remote desktop application"
maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:Proprietary"
@@ -13,28 +13,22 @@ homepage="https://anydesk.com/remote-desktop"
nopie=yes
restricted=yes
-distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm"
-checksum=93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
+distfiles="https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
+checksum=102e72c75502a4779083320322dd047e2b0c00a25ead7444a00aad1db54325aa
-_eula_digest=cf42c51d94d40c5890b103a1b2c5b62b5faad7af1e14933cab98dea8066175e8
-
-post_extract() {
- $XBPS_FETCH_CMD -o eula.html https://anydesk.com/en/terms
- < eula.html w3m -dump -I utf-8 -T text/html |
- sed -n '/envelope.p/q;/Terms [&] Conditions/,$p' >eula.txt
-
- filesum="$($XBPS_DIGEST_CMD eula.txt)"
- if [ "$filesum" != $_eula_digest ]; then
- msg_error "EULA changed, new digest: $filesum\n"
- fi
-}
do_build() {
- patchelf --remove-needed libpangox-1.0.so.0 usr/bin/anydesk
+ patchelf --remove-needed libpangox-1.0.so.0 anydesk
}
do_install() {
- vcopy usr/share usr
- vbin usr/bin/anydesk
- vlicense eula.txt
+ vbin anydesk
+ vmkdir usr/share/applications
+ vinstall anydesk.desktop 644 usr/share/applications/
+ vcopy icons usr/share
+ vcopy polkit-1 usr/share
+ vmkdir /usr/share/pixmaps
+ vinstall icons/hicolor/256x256/apps/anydesk.png 644 usr/share/pixmaps/
+ vinstall "${FILESDIR}"/anydesk.xpm 644 usr/share/pixmaps/
+ vlicense copyright
}
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
` (3 preceding siblings ...)
2022-03-27 19:50 ` [PR PATCH] [Updated] " mobinmob
@ 2022-03-27 19:52 ` mobinmob
2022-03-27 19:56 ` mobinmob
` (5 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2022-03-27 19:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages anydesk
https://github.com/void-linux/void-packages/pull/36381
anydesk: fix eula checksum.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/36381.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-anydesk-36381.patch --]
[-- Type: text/x-diff, Size: 5170 bytes --]
From 865e00d072e330feb3796e2633b22fcccc5c9278 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 27 Mar 2022 21:26:45 +0300
Subject: [PATCH] anydesk: use the generic upstream tarball.
That fixes the issue with the eula checksums,
thanks @tibequadorian.
---
srcpkgs/anydesk/files/anydesk.xpm | 116 ++++++++++++++++++++++++++++++
srcpkgs/anydesk/template | 36 ++++------
2 files changed, 131 insertions(+), 21 deletions(-)
create mode 100644 srcpkgs/anydesk/files/anydesk.xpm
diff --git a/srcpkgs/anydesk/files/anydesk.xpm b/srcpkgs/anydesk/files/anydesk.xpm
new file mode 100644
index 000000000000..e4b2d9301f7a
--- /dev/null
+++ b/srcpkgs/anydesk/files/anydesk.xpm
@@ -0,0 +1,116 @@
+/* XPM */
+static char *anydesk[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 78 1 ",
+" c #FC4236",
+". c #FC4337",
+"X c #FC4438",
+"o c #FC4539",
+"O c #FC473B",
+"+ c #FC473C",
+"@ c #FC4B3F",
+"# c #FC4B40",
+"$ c #FC4C40",
+"% c #FC4C41",
+"& c #FC554A",
+"* c #FD5B51",
+"= c #FD5C52",
+"- c #FD5D52",
+"; c #FD5D53",
+": c #FD5F54",
+"> c #FD5F55",
+", c #FD6056",
+"< c #FD655B",
+"1 c #FD665C",
+"2 c #FD665D",
+"3 c #FD675D",
+"4 c #FD685E",
+"5 c #FD6960",
+"6 c #FD6A61",
+"7 c #FD6B61",
+"8 c #FD7C74",
+"9 c #FD7D75",
+"0 c #FD7F77",
+"q c #FD8078",
+"w c #FD857D",
+"e c #FD857E",
+"r c #FD867E",
+"t c #FE9C96",
+"y c #FE9D97",
+"u c #FE9E98",
+"i c #FE9F98",
+"p c #FE9F99",
+"a c #FEA099",
+"s c #FEA09A",
+"d c #FEA49D",
+"f c #FEA49E",
+"g c #FEA7A2",
+"h c #FEA8A2",
+"j c #FEA9A3",
+"k c #FEAAA4",
+"l c #FECBC8",
+"z c #FECCC9",
+"x c #FECDCA",
+"c c #FED2D0",
+"v c #FED3D1",
+"b c #FED4D1",
+"n c #FED5D2",
+"m c #FED5D3",
+"M c #FED6D3",
+"N c #FED6D4",
+"B c #FED7D4",
+"V c #FED8D5",
+"C c #FFE5E4",
+"Z c #FFE6E4",
+"A c #FFE8E7",
+"S c #FFE9E8",
+"D c #FFEDEC",
+"F c #FFEEED",
+"G c #FFF0EF",
+"H c #FFF0F0",
+"J c #FFF2F2",
+"K c #FFF3F2",
+"L c #FFF4F3",
+"P c #FFF7F6",
+"I c #FFF7F7",
+"U c #FFF8F7",
+"Y c #FFF8F8",
+"T c #FFFBFB",
+"R c #FFFCFB",
+"E c #FFFEFE",
+"W c white",
+"Q c None",
+/* pixels */
+"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ",
+"QQQQ QQQQ",
+"QQ QQ",
+"QQ QQ",
+"Q Q",
+"Q Q",
+"Q Q",
+"Q Q",
+"Q &$ %& Q",
+"Q .*li$ #sx;. Q",
+"Q .5mERk@ 2CEN7. Q",
+"Q *mEWWYy#OwDEV; Q",
+"Q X1vEWWWWIh%o8DEM4X Q",
+"Q <cEWWWWWWTa%owAEn3 Q",
+"Q .;cEWWWWWWWWLa%O0JEn>. Q",
+"Q ,vEWWWWWWWWWWTf. wGEn, Q",
+"Q ,vEWWWWWWWWWWTd. wHEn, Q",
+"Q .;cEWWWWWWWWLp%+qKEb:. Q",
+"Q <cEWWWWWWTp$oeSEb2 Q",
+"Q X1vEWWWWPg%o9FEn4X Q",
+"Q *mEWWUt#+rFEB- Q",
+"Q .5mETj@ 1ZEm6. Q",
+"Q .*lu$ @pz=. Q",
+"Q &$ %& Q",
+"Q Q",
+"Q Q",
+"Q Q",
+"Q Q",
+"QQ QQ",
+"QQ QQ",
+"QQQQ QQQQ",
+"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ"
+};
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index ba95d8775fe1..cbbe8b7a66e7 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,10 +1,10 @@
# Template file for 'anydesk'
pkgname=anydesk
version=6.1.1
-revision=1
+revision=2
archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="patchelf rpmextract w3m"
+hostmakedepends="patchelf"
+depends="hicolor-icon-theme"
short_desc="Fast remote desktop application"
maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:Proprietary"
@@ -13,28 +13,22 @@ homepage="https://anydesk.com/remote-desktop"
nopie=yes
restricted=yes
-distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm"
-checksum=93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
+distfiles="https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
+checksum=102e72c75502a4779083320322dd047e2b0c00a25ead7444a00aad1db54325aa
-_eula_digest=cf42c51d94d40c5890b103a1b2c5b62b5faad7af1e14933cab98dea8066175e8
-
-post_extract() {
- $XBPS_FETCH_CMD -o eula.html https://anydesk.com/en/terms
- < eula.html w3m -dump -I utf-8 -T text/html |
- sed -n '/envelope.p/q;/Terms [&] Conditions/,$p' >eula.txt
-
- filesum="$($XBPS_DIGEST_CMD eula.txt)"
- if [ "$filesum" != $_eula_digest ]; then
- msg_error "EULA changed, new digest: $filesum\n"
- fi
-}
do_build() {
- patchelf --remove-needed libpangox-1.0.so.0 usr/bin/anydesk
+ patchelf --remove-needed libpangox-1.0.so.0 anydesk
}
do_install() {
- vcopy usr/share usr
- vbin usr/bin/anydesk
- vlicense eula.txt
+ vbin anydesk
+ vmkdir usr/share/applications
+ vinstall anydesk.desktop 644 usr/share/applications/
+ vcopy icons usr/share
+ vcopy polkit-1 usr/share
+ vmkdir /usr/share/pixmaps
+ vinstall icons/hicolor/256x256/apps/anydesk.png 644 usr/share/pixmaps/
+ vinstall "${FILESDIR}"/anydesk.xpm 644 usr/share/pixmaps/
+ vlicense copyright
}
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
` (4 preceding siblings ...)
2022-03-27 19:52 ` mobinmob
@ 2022-03-27 19:56 ` mobinmob
2022-03-30 18:26 ` [PR REVIEW] " Chocimier
` (4 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2022-03-27 19:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/36381#issuecomment-1080007720
Comment:
I reverted to using the generic tarball. I do not have an icon now - the files are in the proper location... Program works fine, I cannot justify spending more time on it :)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
` (5 preceding siblings ...)
2022-03-27 19:56 ` mobinmob
@ 2022-03-30 18:26 ` Chocimier
2022-04-02 5:45 ` mobinmob
` (3 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Chocimier @ 2022-03-30 18:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/36381#discussion_r838842872
Comment:
Can this be added as distfile instead?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
` (6 preceding siblings ...)
2022-03-30 18:26 ` [PR REVIEW] " Chocimier
@ 2022-04-02 5:45 ` mobinmob
2022-05-07 7:16 ` [PR PATCH] [Updated] " mobinmob
` (2 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2022-04-02 5:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/36381#discussion_r841015217
Comment:
Maybe...
I do not have much time rn, I will try a different approach to fixing the eula checksum issue.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
` (7 preceding siblings ...)
2022-04-02 5:45 ` mobinmob
@ 2022-05-07 7:16 ` mobinmob
2022-05-07 7:17 ` [PR REVIEW] " mobinmob
2022-05-07 17:50 ` [PR PATCH] [Merged]: " Chocimier
10 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2022-05-07 7:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages anydesk
https://github.com/void-linux/void-packages/pull/36381
anydesk: fix eula checksum.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/36381.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-anydesk-36381.patch --]
[-- Type: text/x-diff, Size: 2190 bytes --]
From d22842faf5a77954d65e8107be70692f940add94 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 27 Mar 2022 21:26:45 +0300
Subject: [PATCH] anydesk: use the generic upstream tarball for the license.
That fixes the issue with the eula checksums,
thanks @tibequadorian.
---
srcpkgs/anydesk/template | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index ba95d8775fe1..d22134033508 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,10 +1,11 @@
# Template file for 'anydesk'
pkgname=anydesk
version=6.1.1
-revision=1
+revision=2
archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="patchelf rpmextract w3m"
+create_wrksrc="yes"
+hostmakedepends="patchelf rpmextract"
+depends="hicolor-icon-theme"
short_desc="Fast remote desktop application"
maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:Proprietary"
@@ -13,28 +14,18 @@ homepage="https://anydesk.com/remote-desktop"
nopie=yes
restricted=yes
-distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm"
-checksum=93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
+distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm
+ https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
+checksum="93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
+ 102e72c75502a4779083320322dd047e2b0c00a25ead7444a00aad1db54325aa"
-_eula_digest=cf42c51d94d40c5890b103a1b2c5b62b5faad7af1e14933cab98dea8066175e8
-
-post_extract() {
- $XBPS_FETCH_CMD -o eula.html https://anydesk.com/en/terms
- < eula.html w3m -dump -I utf-8 -T text/html |
- sed -n '/envelope.p/q;/Terms [&] Conditions/,$p' >eula.txt
-
- filesum="$($XBPS_DIGEST_CMD eula.txt)"
- if [ "$filesum" != $_eula_digest ]; then
- msg_error "EULA changed, new digest: $filesum\n"
- fi
-}
do_build() {
patchelf --remove-needed libpangox-1.0.so.0 usr/bin/anydesk
}
do_install() {
- vcopy usr/share usr
- vbin usr/bin/anydesk
- vlicense eula.txt
+ vlicense "${pkgname}-${version}"/copyright
+ rm -rf "${pkgname}-${version}"
+ vcopy "*" /
}
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
` (8 preceding siblings ...)
2022-05-07 7:16 ` [PR PATCH] [Updated] " mobinmob
@ 2022-05-07 7:17 ` mobinmob
2022-05-07 17:50 ` [PR PATCH] [Merged]: " Chocimier
10 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2022-05-07 7:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/36381#discussion_r867316704
Comment:
I ended up using both the generic tarball (for the license) and the rpm (for the files). Not the most elegant solution, but miles ahead of the previous one...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Merged]: anydesk: fix eula checksum.
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
` (9 preceding siblings ...)
2022-05-07 7:17 ` [PR REVIEW] " mobinmob
@ 2022-05-07 17:50 ` Chocimier
10 siblings, 0 replies; 18+ messages in thread
From: Chocimier @ 2022-05-07 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]
There's a merged pull request on the void-packages repository
anydesk: fix eula checksum.
https://github.com/void-linux/void-packages/pull/36381
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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] 18+ messages in thread
* Re: anydesk: fix eula checksum.
2021-10-23 14:26 [PR PATCH] " mobinmob
` (4 preceding siblings ...)
2021-10-24 11:40 ` mobinmob
@ 2021-10-24 11:43 ` mobinmob
5 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2021-10-24 11:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/33714#issuecomment-950308130
Comment:
> No need to revbump, I think.
OK :)
Ι though about not revbumping because the template has `restricted=yes`, so it will not be available as a package. Also, the change does not affect users that already have installed the sw.
I will remove it.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: anydesk: fix eula checksum.
2021-10-23 14:26 [PR PATCH] " mobinmob
` (3 preceding siblings ...)
2021-10-24 11:38 ` mobinmob
@ 2021-10-24 11:40 ` mobinmob
2021-10-24 11:43 ` mobinmob
5 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2021-10-24 11:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/33714#issuecomment-950308666
Comment:
@ericonr Done. Or undone :P
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: anydesk: fix eula checksum.
2021-10-23 14:26 [PR PATCH] " mobinmob
` (2 preceding siblings ...)
2021-10-24 11:37 ` mobinmob
@ 2021-10-24 11:38 ` mobinmob
2021-10-24 11:40 ` mobinmob
2021-10-24 11:43 ` mobinmob
5 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2021-10-24 11:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/33714#issuecomment-950308130
Comment:
> No need to revbump, I think.
OK :)
Ι though about not revbumpimg because the template has `restricted=yes`, so it will not be available as a package. Also, the change does not affect users that already have installed the sw.
I will remove it.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: anydesk: fix eula checksum.
2021-10-23 14:26 [PR PATCH] " mobinmob
2021-10-24 0:59 ` ericonr
2021-10-24 11:37 ` mobinmob
@ 2021-10-24 11:37 ` mobinmob
2021-10-24 11:38 ` mobinmob
` (2 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2021-10-24 11:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 374 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/33714#issuecomment-950308130
Comment:
> No need to revbump, I think.
OK :)
Ι though about not revbumpimg because the template has `restricted=yes`, so it will not be available as a package. Also, the change does not affect users that already have installed the sw.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: anydesk: fix eula checksum.
2021-10-23 14:26 [PR PATCH] " mobinmob
2021-10-24 0:59 ` ericonr
@ 2021-10-24 11:37 ` mobinmob
2021-10-24 11:37 ` mobinmob
` (3 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: mobinmob @ 2021-10-24 11:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/33714#issuecomment-950308130
Comment:
> No need to revbump, I think.
OK :)
Ι did not revbump because the template has `restricted=yes`, so it will not be available as a package. Also, the change does not affect users that already have installed the sw.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: anydesk: fix eula checksum.
2021-10-23 14:26 [PR PATCH] " mobinmob
@ 2021-10-24 0:59 ` ericonr
2021-10-24 11:37 ` mobinmob
` (4 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-10-24 0:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/33714#issuecomment-950240400
Comment:
No need to revbump, I think.
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2022-05-07 17:50 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-27 18:27 [PR PATCH] anydesk: fix eula checksum mobinmob
2022-03-27 18:57 ` tibequadorian
2022-03-27 19:00 ` mobinmob
2022-03-27 19:00 ` mobinmob
2022-03-27 19:50 ` [PR PATCH] [Updated] " mobinmob
2022-03-27 19:52 ` mobinmob
2022-03-27 19:56 ` mobinmob
2022-03-30 18:26 ` [PR REVIEW] " Chocimier
2022-04-02 5:45 ` mobinmob
2022-05-07 7:16 ` [PR PATCH] [Updated] " mobinmob
2022-05-07 7:17 ` [PR REVIEW] " mobinmob
2022-05-07 17:50 ` [PR PATCH] [Merged]: " Chocimier
-- strict thread matches above, loose matches on Subject: below --
2021-10-23 14:26 [PR PATCH] " mobinmob
2021-10-24 0:59 ` ericonr
2021-10-24 11:37 ` mobinmob
2021-10-24 11:37 ` mobinmob
2021-10-24 11:38 ` mobinmob
2021-10-24 11:40 ` mobinmob
2021-10-24 11:43 ` mobinmob
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).