From 34a5c3b4a1d664ed1264d4cbea680bf529dbdcfc Mon Sep 17 00:00:00 2001 From: MGlolenstine Date: Fri, 7 Aug 2020 00:21:03 +0200 Subject: [PATCH 1/4] discord-ptb: update to 0.0.21 --- srcpkgs/discord-ptb/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template index 0485c222023..28ab797bbce 100644 --- a/srcpkgs/discord-ptb/template +++ b/srcpkgs/discord-ptb/template @@ -1,6 +1,6 @@ # Template file for 'discord-ptb' pkgname="discord-ptb" -version=0.0.9 +version=0.0.21 revision=1 wrksrc="DiscordPTB" depends="alsa-lib dbus-glib gtk+3 GConf libnotify nss libXtst libcxx libatomic" @@ -13,7 +13,7 @@ maintainer="Abel Graham " license="proprietary" homepage="https://discordapp.com/" distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz" -checksum=372d6f75203626370218c97c21519b779e5af334177cafa65a5655e357c77520 +checksum=a1fa4e20cce5f493d84c9e3c7ac74c8265768886859e98022fa41d102f2726c4 do_install() { local package_location="usr/lib/$pkgname" item @@ -22,9 +22,9 @@ do_install() { vmkdir usr/share/applications vcopy discord-ptb.desktop /usr/share/applications/ vmkdir ${package_location} - for item in locales resources DiscordPTB libffmpeg.so libnode.so natives_blob.bin snapshot_blob.bin content_shell.pak icudtl.dat; do + for item in DiscordPTB chrome_100_percent.pak chrome_200_percent.pak icudtl.dat libEGL.so libGLESv2.so libffmpeg.so locales natives_blob.bin resources resources.pak snapshot_blob.bin swiftshader v8_context_snapshot.bin; do vcopy "${item}" "${package_location}" done vmkdir usr/bin ln -sfr $DESTDIR/${package_location}/DiscordPTB $DESTDIR/usr/bin/discord-ptb -} +} \ No newline at end of file From 60803924532a96f4d3167eae454f2001db5c766f Mon Sep 17 00:00:00 2001 From: MGlolenstine Date: Fri, 7 Aug 2020 10:44:46 +0200 Subject: [PATCH 2/4] discord-ptb: updated license, shortened long line and fixed xlint warnings --- srcpkgs/discord-ptb/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template index 28ab797bbce..a93aa1e10d5 100644 --- a/srcpkgs/discord-ptb/template +++ b/srcpkgs/discord-ptb/template @@ -1,19 +1,19 @@ # Template file for 'discord-ptb' -pkgname="discord-ptb" +pkgname=discord-ptb version=0.0.21 revision=1 +archs="x86_64" wrksrc="DiscordPTB" depends="alsa-lib dbus-glib gtk+3 GConf libnotify nss libXtst libcxx libatomic" -archs="x86_64" -nopie=yes -repository=nonfree -restricted=yes short_desc="Proprietary freeware VoIP application" maintainer="Abel Graham " -license="proprietary" +license=https://discord.com/terms homepage="https://discordapp.com/" distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz" checksum=a1fa4e20cce5f493d84c9e3c7ac74c8265768886859e98022fa41d102f2726c4 +nopie=yes +restricted=yes +repository=nonfree do_install() { local package_location="usr/lib/$pkgname" item @@ -22,9 +22,10 @@ do_install() { vmkdir usr/share/applications vcopy discord-ptb.desktop /usr/share/applications/ vmkdir ${package_location} - for item in DiscordPTB chrome_100_percent.pak chrome_200_percent.pak icudtl.dat libEGL.so libGLESv2.so libffmpeg.so locales natives_blob.bin resources resources.pak snapshot_blob.bin swiftshader v8_context_snapshot.bin; do + for item in DiscordPTB chrome_100_percent.pak chrome_200_percent.pak icudtl.dat libEGL.so \ + libGLESv2.so libffmpeg.so locales natives_blob.bin resources resources.pak snapshot_blob.bin swiftshader v8_context_snapshot.bin; do vcopy "${item}" "${package_location}" done vmkdir usr/bin ln -sfr $DESTDIR/${package_location}/DiscordPTB $DESTDIR/usr/bin/discord-ptb -} \ No newline at end of file +} From 1958791cd1e5d6df461fe36dfcdfa303aa9f176f Mon Sep 17 00:00:00 2001 From: MGlolenstine Date: Sat, 8 Aug 2020 19:34:17 +0200 Subject: [PATCH 3/4] discord-ptb: formatted file and changed licence --- srcpkgs/discord-ptb/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template index a93aa1e10d5..9d91e96f9d6 100644 --- a/srcpkgs/discord-ptb/template +++ b/srcpkgs/discord-ptb/template @@ -7,7 +7,7 @@ wrksrc="DiscordPTB" depends="alsa-lib dbus-glib gtk+3 GConf libnotify nss libXtst libcxx libatomic" short_desc="Proprietary freeware VoIP application" maintainer="Abel Graham " -license=https://discord.com/terms +license="custom:Proprietary" homepage="https://discordapp.com/" distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz" checksum=a1fa4e20cce5f493d84c9e3c7ac74c8265768886859e98022fa41d102f2726c4 @@ -22,8 +22,10 @@ do_install() { vmkdir usr/share/applications vcopy discord-ptb.desktop /usr/share/applications/ vmkdir ${package_location} - for item in DiscordPTB chrome_100_percent.pak chrome_200_percent.pak icudtl.dat libEGL.so \ - libGLESv2.so libffmpeg.so locales natives_blob.bin resources resources.pak snapshot_blob.bin swiftshader v8_context_snapshot.bin; do + for item in DiscordPTB chrome_100_percent.pak chrome_200_percent.pak \ + icudtl.dat libEGL.so libGLESv2.so libffmpeg.so locales natives_blob.bin \ + resources resources.pak snapshot_blob.bin swiftshader \ + v8_context_snapshot.bin; do vcopy "${item}" "${package_location}" done vmkdir usr/bin From 377416add02574842a751e83b15bffcd829ba2da Mon Sep 17 00:00:00 2001 From: MGlolenstine Date: Sun, 9 Aug 2020 09:39:18 +0200 Subject: [PATCH 4/4] discord-ptb: added license --- srcpkgs/discord-ptb/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template index 9d91e96f9d6..0a6a395e26e 100644 --- a/srcpkgs/discord-ptb/template +++ b/srcpkgs/discord-ptb/template @@ -11,10 +11,22 @@ license="custom:Proprietary" homepage="https://discordapp.com/" distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz" checksum=a1fa4e20cce5f493d84c9e3c7ac74c8265768886859e98022fa41d102f2726c4 +_license_checksum=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 nopie=yes restricted=yes repository=nonfree +post_extract() { + curl -L https://discord.com/terms | + w3m -dump -I utf-8 -T text/html | + sed -n '/Discord Terms of Service/,/^USA$/p' > EULA + + filesum="$(xbps-digest EULA)" + if [ "$filesum" != "$_license_checksum" ]; then + msg_error "SHA256 mismatch for EULA:\n$filesum\n" + fi +} + do_install() { local package_location="usr/lib/$pkgname" item vmkdir usr/share/pixmaps @@ -30,4 +42,6 @@ do_install() { done vmkdir usr/bin ln -sfr $DESTDIR/${package_location}/DiscordPTB $DESTDIR/usr/bin/discord-ptb + + vlicense EULA }