Github messages for voidlinux
 help / color / mirror / Atom feed
From: 0x5c <0x5c@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.36.
Date: Thu, 08 Dec 2022 23:08:40 +0100	[thread overview]
Message-ID: <20221208220840.zZ5ojjaZvivRU8NahfMrbSepcpjHixN2eqzdIUaBQnM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40949@inbox.vuxu.org>

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

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

https://github.com/0x5c/void-packages update/discord-ptb
https://github.com/void-linux/void-packages/pull/40949

discord-ptb: update to 0.0.36.
Switch away from the janky EULA download setup in favour of a file that links to the actual current version of the terms, just like the discord package.

<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/40949.patch is attached

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

From 82fbf87dbe7ddeaa8ed3094e57a3f4c20dddbfde Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 6 Dec 2022 17:50:51 -0500
Subject: [PATCH] discord-ptb: update to 0.0.37.

Switch away from the janky EULA download setup in favour of a file that links
to the actual current version of the terms, just like the discord package.
---
 srcpkgs/discord-ptb/files/LICENSE |  1 +
 srcpkgs/discord-ptb/template      | 23 ++++++-----------------
 2 files changed, 7 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/discord-ptb/files/LICENSE

diff --git a/srcpkgs/discord-ptb/files/LICENSE b/srcpkgs/discord-ptb/files/LICENSE
new file mode 100644
index 000000000000..b489d410a1db
--- /dev/null
+++ b/srcpkgs/discord-ptb/files/LICENSE
@@ -0,0 +1 @@
+The current version of this license can be found at: https://discord.com/terms
diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index 6b722395e1ee..e5fa29968d5d 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,9 +1,8 @@
 # Template file for 'discord-ptb'
 pkgname=discord-ptb
-version=0.0.35
-revision=3
+version=0.0.37
+revision=1
 archs="x86_64"
-hostmakedepends="w3m"
 depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic
  xdg-utils webrtc-audio-processing"
 short_desc="Chat and VoIP application (preview version)"
@@ -11,24 +10,12 @@ maintainer="0x5c <dev@0x5c.io>"
 license="custom:Proprietary"
 homepage="https://discord.com/"
 distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=6e7a79c1f711db5b3b2cc3f11608f91b752cc4f5a5163e2de826dea2c8ae7c76
+checksum=03ba8887595e81091339b7cc7c469ae0f3cb2ae867fb1b5dcc9b8637fd885aa1
 nopie=yes
 restricted=yes
 repository=nonfree
 nostrip=yes
 
-post_extract() {
-	local _license_checksum=bbe45a50d92f383311376477dd6ebecefff801b5d47685757107b6f771cac58d
-	$XBPS_FETCH_CMD -o eula https://discord.com/terms
-	w3m -dump -I utf-8 -T text/html eula |
-		sed -n '/Discord is your place/,/^Imagine a place$/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
@@ -44,6 +31,8 @@ do_install() {
 	done
 	vmkdir usr/bin
 	ln -sfr $DESTDIR/${package_location}/DiscordPTB $DESTDIR/usr/bin/discord-ptb
+}
 
-	vlicense EULA
+post_install() {
+	vlicense $FILESDIR/LICENSE
 }

  parent reply	other threads:[~2022-12-08 22:08 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-06 22:55 [PR PATCH] " 0x5c
2022-12-06 23:38 ` [PR REVIEW] " classabbyamp
2022-12-06 23:52 ` 0x5c
2022-12-08 22:08 ` 0x5c [this message]
2022-12-08 22:53 ` [PR PATCH] [Updated] discord-ptb: update to 0.0.37 0x5c
2022-12-08 22:55 ` [PR PATCH] [Merged]: discord-ptb: update to 0.0.38 classabbyamp

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221208220840.zZ5ojjaZvivRU8NahfMrbSepcpjHixN2eqzdIUaBQnM@z \
    --to=0x5c@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).