* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
@ 2020-08-07 0:07 ` fosslinux
2020-08-07 0:07 ` fosslinux
` (46 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: fosslinux @ 2020-08-07 0:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r466749719
Comment:
Preferably, split this into two lines using a `\` at the end of the line to make it more readable.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
2020-08-07 0:07 ` [PR REVIEW] " fosslinux
@ 2020-08-07 0:07 ` fosslinux
2020-08-07 8:26 ` [PR REVIEW] " MGlolenstine
` (45 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: fosslinux @ 2020-08-07 0:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670250561
Comment:
Thanks for your PR!
https://travis-ci.org/github/void-linux/void-packages/jobs/715664522 as you can see here, there are some `xlint` erorrs. Would you mind fixing them?
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
2020-08-07 0:07 ` [PR REVIEW] " fosslinux
2020-08-07 0:07 ` fosslinux
@ 2020-08-07 8:26 ` MGlolenstine
2020-08-07 8:26 ` MGlolenstine
` (44 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-07 8:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New review comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r466897827
Comment:
Sure! I'm unsure on the formatting though. How long should the line be? Usually those are split on 90 characters.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (2 preceding siblings ...)
2020-08-07 8:26 ` [PR REVIEW] " MGlolenstine
@ 2020-08-07 8:26 ` MGlolenstine
2020-08-07 8:40 ` MGlolenstine
` (43 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-07 8:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670398291
Comment:
On it!
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (3 preceding siblings ...)
2020-08-07 8:26 ` MGlolenstine
@ 2020-08-07 8:40 ` MGlolenstine
2020-08-07 8:40 ` MGlolenstine
` (42 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-07 8:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 594 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670398291
Comment:
On it!
EDIT: I've been trying to find a license Discord uses, but was unable to.
it's set as "proprietary" in the file, but no SPDX is set. Now I've found this https://discord.com/terms , but I'm unsure on how to add it to the file.
[Here](https://github.com/void-linux/void-packages/blob/master/Manual.md#mandatory-variables) it states that it can be a `Public Domain`. Does that mean, that I can just insert the URL from above and we're set?
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (4 preceding siblings ...)
2020-08-07 8:40 ` MGlolenstine
@ 2020-08-07 8:40 ` MGlolenstine
2020-08-07 8:46 ` [PR PATCH] [Updated] " MGlolenstine
` (41 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-07 8:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 593 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670398291
Comment:
On it!
EDIT: I've been trying to find a license Discord uses, but was unable to.
it's set as "proprietary" in the file, but no SPDX is set. Now I've found this https://discord.com/terms , but I'm unsure on how to add it to the file.
[Here](https://github.com/void-linux/void-packages/blob/master/Manual.md#mandatory-variables) it states that it can be a `Public Domain`. Does that mean that I can just insert the URL from above and we're set?
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (5 preceding siblings ...)
2020-08-07 8:40 ` MGlolenstine
@ 2020-08-07 8:46 ` MGlolenstine
2020-08-07 9:11 ` MGlolenstine
` (40 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-07 8:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by MGlolenstine against master on the void-packages repository
https://github.com/MGlolenstine/void-packages discord-ptb
https://github.com/void-linux/void-packages/pull/24117
discord-ptb: update to 0.0.21
A patch file from https://github.com/void-linux/void-packages/pull/24117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discord-ptb-24117.patch --]
[-- Type: text/x-diff, Size: 3912 bytes --]
From 34a5c3b4a1d664ed1264d4cbea680bf529dbdcfc Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 00:21:03 +0200
Subject: [PATCH 1/2] 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 <abel@abelgraham.com>"
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 47edc2aa4d012b0ecb751d80793a10b0eef86db9 Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 10:44:46 +0200
Subject: [PATCH 2/2] 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 <abel@abelgraham.com>"
-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
+}
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (6 preceding siblings ...)
2020-08-07 8:46 ` [PR PATCH] [Updated] " MGlolenstine
@ 2020-08-07 9:11 ` MGlolenstine
2020-08-07 21:42 ` fosslinux
` (39 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-07 9:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by MGlolenstine against master on the void-packages repository
https://github.com/MGlolenstine/void-packages discord-ptb
https://github.com/void-linux/void-packages/pull/24117
discord-ptb: update to 0.0.21
A patch file from https://github.com/void-linux/void-packages/pull/24117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discord-ptb-24117.patch --]
[-- Type: text/x-diff, Size: 3925 bytes --]
From 34a5c3b4a1d664ed1264d4cbea680bf529dbdcfc Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 00:21:03 +0200
Subject: [PATCH 1/2] 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 <abel@abelgraham.com>"
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 <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 10:44:46 +0200
Subject: [PATCH 2/2] 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 <abel@abelgraham.com>"
-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
+}
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (7 preceding siblings ...)
2020-08-07 9:11 ` MGlolenstine
@ 2020-08-07 21:42 ` fosslinux
2020-08-07 21:43 ` fosslinux
` (38 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: fosslinux @ 2020-08-07 21:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670724491
Comment:
The `custom:` speciefier indicates it is not SPDX. Use something along the lines of `custom:proprietary`.
The line wrap looks good, but maybe make it consistent. I.e., if you are going to split at (I think you did) 90 characters, split the next line at 90 characters too... keep all of the lines for that block the same length.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (8 preceding siblings ...)
2020-08-07 21:42 ` fosslinux
@ 2020-08-07 21:43 ` fosslinux
2020-08-07 21:54 ` ericonr
` (37 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: fosslinux @ 2020-08-07 21:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 977 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670724491
Comment:
The `custom:` speciefier indicates it is not SPDX. Use something along the lines of `custom:proprietary`.
The line wrap looks good, but maybe make it consistent. I.e., if you are going to split at (I think you did) 90 characters, split the next line at 90 characters too... keep all of the lines for that block the same length.
Eg:
```
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
```
to
```
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
```
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (9 preceding siblings ...)
2020-08-07 21:43 ` fosslinux
@ 2020-08-07 21:54 ` ericonr
2020-08-07 22:00 ` MGlolenstine
` (36 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: ericonr @ 2020-08-07 21:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670727828
Comment:
I believe "custom:Proprietary" is preferred. And line wraps around 80 columns, if possible.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (10 preceding siblings ...)
2020-08-07 21:54 ` ericonr
@ 2020-08-07 22:00 ` MGlolenstine
2020-08-08 17:34 ` [PR PATCH] [Updated] " MGlolenstine
` (35 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-07 22:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670729485
Comment:
I think "custom:Proprietary" had some problems with xlint and was throwing errors... I'll have to check out that tomorrow (it's midnight here) and I'm in for 80 char line wrap.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (11 preceding siblings ...)
2020-08-07 22:00 ` MGlolenstine
@ 2020-08-08 17:34 ` MGlolenstine
2020-08-08 17:45 ` MGlolenstine
` (34 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-08 17:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by MGlolenstine against master on the void-packages repository
https://github.com/MGlolenstine/void-packages discord-ptb
https://github.com/void-linux/void-packages/pull/24117
discord-ptb: update to 0.0.21
A patch file from https://github.com/void-linux/void-packages/pull/24117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discord-ptb-24117.patch --]
[-- Type: text/x-diff, Size: 5593 bytes --]
From 34a5c3b4a1d664ed1264d4cbea680bf529dbdcfc Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 00:21:03 +0200
Subject: [PATCH 1/3] 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 <abel@abelgraham.com>"
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 <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 10:44:46 +0200
Subject: [PATCH 2/3] 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 <abel@abelgraham.com>"
-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 <mglolenstine@gmail.com>
Date: Sat, 8 Aug 2020 19:34:17 +0200
Subject: [PATCH 3/3] 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 <abel@abelgraham.com>"
-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
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (12 preceding siblings ...)
2020-08-08 17:34 ` [PR PATCH] [Updated] " MGlolenstine
@ 2020-08-08 17:45 ` MGlolenstine
2020-08-08 18:28 ` ericonr
` (33 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-08 17:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670955236
Comment:
@ericonr This is the lint error I was talking about. I'm unsure what to put at the `vlicense` if anything.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (13 preceding siblings ...)
2020-08-08 17:45 ` MGlolenstine
@ 2020-08-08 18:28 ` ericonr
2020-08-08 18:30 ` MGlolenstine
` (32 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: ericonr @ 2020-08-08 18:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670959395
Comment:
You might need to find an EULA or License Agreement. The spotify template, for example, has to do a similar dance.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (14 preceding siblings ...)
2020-08-08 18:28 ` ericonr
@ 2020-08-08 18:30 ` MGlolenstine
2020-08-08 18:32 ` ericonr
` (31 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-08 18:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670959555
Comment:
> You might need to find an EULA or License Agreement. The spotify template, for example, has to do a similar dance.
Would this do?
How should I format it in the file?
```
vlicense=https://discord.com/terms
```
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (15 preceding siblings ...)
2020-08-08 18:30 ` MGlolenstine
@ 2020-08-08 18:32 ` ericonr
2020-08-08 18:36 ` MGlolenstine
` (30 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: ericonr @ 2020-08-08 18:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670959734
Comment:
I think that file would work, but you'd have to do something like https://github.com/void-linux/void-packages/blob/master/srcpkgs/spotify/template#L23 to pre-process it.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (16 preceding siblings ...)
2020-08-08 18:32 ` ericonr
@ 2020-08-08 18:36 ` MGlolenstine
2020-08-09 7:39 ` [PR PATCH] [Updated] " MGlolenstine
` (29 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-08 18:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 425 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-670960105
Comment:
> I think that file would work, but you'd have to do something like https://github.com/void-linux/void-packages/blob/master/srcpkgs/spotify/template#L23 to pre-process it.
Oh wow, that looks complicated... It's pretty late here, so I'll take my time tomorrow and modify it...
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (17 preceding siblings ...)
2020-08-08 18:36 ` MGlolenstine
@ 2020-08-09 7:39 ` MGlolenstine
2020-08-10 6:09 ` MGlolenstine
` (28 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-09 7:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by MGlolenstine against master on the void-packages repository
https://github.com/MGlolenstine/void-packages discord-ptb
https://github.com/void-linux/void-packages/pull/24117
discord-ptb: update to 0.0.21
A patch file from https://github.com/void-linux/void-packages/pull/24117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discord-ptb-24117.patch --]
[-- Type: text/x-diff, Size: 6997 bytes --]
From 34a5c3b4a1d664ed1264d4cbea680bf529dbdcfc Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
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 <abel@abelgraham.com>"
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 <mglolenstine@gmail.com>
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 <abel@abelgraham.com>"
-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 <mglolenstine@gmail.com>
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 <abel@abelgraham.com>"
-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 <mglolenstine@gmail.com>
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
}
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (18 preceding siblings ...)
2020-08-09 7:39 ` [PR PATCH] [Updated] " MGlolenstine
@ 2020-08-10 6:09 ` MGlolenstine
2020-08-10 19:06 ` FirstZero
` (27 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-10 6:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-671178770
Comment:
Would this be ready for merge, or is there something still missing?
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (19 preceding siblings ...)
2020-08-10 6:09 ` MGlolenstine
@ 2020-08-10 19:06 ` FirstZero
2020-08-14 17:41 ` ericonr
` (26 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: FirstZero @ 2020-08-10 19:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by FirstZero on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-671533939
Comment:
Ideally you might want to squash rebase your commits into one. Other than that, this seems ready for review.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (20 preceding siblings ...)
2020-08-10 19:06 ` FirstZero
@ 2020-08-14 17:41 ` ericonr
2020-08-14 17:51 ` [PR PATCH] [Updated] " MGlolenstine
` (25 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: ericonr @ 2020-08-14 17:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-674187140
Comment:
You need to squash these commits before it can be merged.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (21 preceding siblings ...)
2020-08-14 17:41 ` ericonr
@ 2020-08-14 17:51 ` MGlolenstine
2020-08-14 17:51 ` MGlolenstine
` (24 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-14 17:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by MGlolenstine against master on the void-packages repository
https://github.com/MGlolenstine/void-packages discord-ptb
https://github.com/void-linux/void-packages/pull/24117
discord-ptb: update to 0.0.21
A patch file from https://github.com/void-linux/void-packages/pull/24117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discord-ptb-24117.patch --]
[-- Type: text/x-diff, Size: 52855 bytes --]
From e6e8d2f664c2562b312d1a9f75701dfb4df1ae31 Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Thu, 6 Aug 2020 23:56:48 +0200
Subject: [PATCH 01/27] anydesk: update to 6.0.0
---
srcpkgs/anydesk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 1843379a90b..4b80ff1b61e 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,6 +1,6 @@
# Template file for 'anydesk'
pkgname=anydesk
-version=5.5.6
+version=6.0.0
revision=1
archs="i686 x86_64"
wrksrc=${pkgname}-${version}
@@ -14,10 +14,10 @@ restricted=yes
if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then
distfiles="https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
- checksum=d37678596d7df3926b9ea7dec842cd895618b9860fd75e490deebcf09cf3eeee
+ checksum=9df6583097865591d153853f730f02dde003756dd5840dc670d25f3c275d86a5
elif [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
distfiles="https://download.anydesk.com/linux/anydesk-${version}-i386.tar.gz"
- checksum=2b62a369a9fb24cc060bf29ccd1ee94f45d4c2be8c62e4fba8b925ca3008f747
+ checksum=369ed52f4876f29ea4d3713401493e28fa21749bc0f24f0809e5b770c93e8c37
fi
do_install() {
From 22bede4b19eb3c3d22fbe5b3d6999b183f979e66 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 7 Aug 2020 00:29:04 +0200
Subject: [PATCH 02/27] notmuch: remove obsolete symlink
---
srcpkgs/notmuch-python | 1 -
1 file changed, 1 deletion(-)
delete mode 120000 srcpkgs/notmuch-python
diff --git a/srcpkgs/notmuch-python b/srcpkgs/notmuch-python
deleted file mode 120000
index 67778b7eb37..00000000000
--- a/srcpkgs/notmuch-python
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
From b3796c10d238662ef9770507d667518f8cb80da8 Mon Sep 17 00:00:00 2001
From: bra1nwave <bra1nwave@protonmail.com>
Date: Thu, 6 Aug 2020 20:12:02 +0200
Subject: [PATCH 03/27] pmbootstrap: update to 1.22.2.
---
srcpkgs/pmbootstrap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 36878f266f8..c2b2d92e87a 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'pmbootstrap'
pkgname=pmbootstrap
-version=1.22.0
+version=1.22.2
revision=1
archs=noarch
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://postmarketos.org"
distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz"
-checksum=5a9d5a854db17306031e76736dc7c1627eb190ee72d17ecde6dd3da86479703a
+checksum=e5b95e17892f77027a3812cb3a95b24e66672d2ec88df4ce197423e0208a7fc8
do_check() {
# tests require chroot
From c7f5a457fb22cff849fb4dbcbbb0def5217ffea6 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 6 Aug 2020 10:46:51 +0200
Subject: [PATCH 04/27] links: update to 2.21
---
srcpkgs/links/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index 496985fdfab..b42bac91a13 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,7 +1,7 @@
# Template file for 'links'
pkgname=links
-version=2.20.2
-revision=2
+version=2.21
+revision=1
build_style=gnu-configure
configure_args="--with-ssl --enable-graphics"
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://links.twibright.com/"
distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424
+checksum=285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63
post_install() {
mkdir -p ${DESTDIR}/usr/share/doc/
From 59a452a8b2d6c8e5e16779ea1b9b5ea732ad930d Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 6 Aug 2020 10:47:16 +0200
Subject: [PATCH 05/27] links-x11: update to 2.21
---
srcpkgs/links-x11/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 124263362be..3f68f321580 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,7 +1,7 @@
# Template file for 'links-x11'
pkgname=links-x11
-version=2.20.2
-revision=2
+version=2.21
+revision=1
wrksrc="${pkgname%-x11}-${version}"
build_style=gnu-configure
configure_args="--with-ssl --enable-graphics --enable-x"
@@ -13,7 +13,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="http://links.twibright.com/"
distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424
+checksum=285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63
conflicts="links"
post_install() {
From f8c73dfb9bf72b293a9869d668923d873c55d6a8 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 6 Aug 2020 10:48:05 +0200
Subject: [PATCH 06/27] po4a: update to 0.61
---
srcpkgs/po4a/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index aee5cb75275..afa923f9e3e 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.60
+version=0.61
revision=1
archs=noarch
build_style=perl-ModuleBuild
@@ -15,4 +15,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=1eaae2786696c823e6c02838366c3825f5abb3adb5d32ba3342e299466e20b3c
+checksum=ccfd32e64afb33fbb955ca620bd7bfd275ed634c468c6c25c2df541b22895de0
From a2d6ec9f464e9280fd561fa13a13aaba1f0d26c6 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Wed, 5 Aug 2020 15:39:52 +0200
Subject: [PATCH 07/27] R-cran-data.table: update to 1.13.0.
---
srcpkgs/R-cran-data.table/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-data.table/template b/srcpkgs/R-cran-data.table/template
index 07467a219af..b91448b2854 100644
--- a/srcpkgs/R-cran-data.table/template
+++ b/srcpkgs/R-cran-data.table/template
@@ -1,11 +1,11 @@
# Template file for 'R-cran-data.table'
pkgname=R-cran-data.table
-version=1.12.8
+version=1.13.0
revision=1
build_style=R-cran
-makedepends="libgomp-devel zlib-devel"
+makedepends="libgomp-devel pkg-config zlib-devel"
short_desc="Extension of 'data.frame'"
maintainer="Florian Wagner <florian@wagner-flo.net>"
license="MPL-2.0"
homepage="https://github.com/Rdatatable/data.table/wiki"
-checksum=d3a75f3a355ff144cc20a476041617e21fcf2a9f79265fd9bbd4693f3671f9dc
+checksum=f6098eb4a0916333783a118b25387c4cb8bdc1801c562764d4bf4bafc3bb3072
From 9db3151f3852206f306421fb19dcd12296b03d39 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 5 Aug 2020 22:27:55 +0200
Subject: [PATCH 08/27] tllist: update to 1.0.2.
No code actually changed so no need for any rebuilds. Just a fix for the
license year and some changes in what meson installs.
---
srcpkgs/tllist/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tllist/template b/srcpkgs/tllist/template
index b18dd90d14d..5bb8ca0fa98 100644
--- a/srcpkgs/tllist/template
+++ b/srcpkgs/tllist/template
@@ -1,6 +1,6 @@
# Template file for 'tllist'
pkgname=tllist
-version=1.0.1
+version=1.0.2
revision=1
wrksrc=$pkgname
build_style=meson
@@ -9,9 +9,9 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
license="MIT"
homepage="https://codeberg.org/dnkl/tllist"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=baa94259ee6a8cc9114cf59cf58395a7f6537d36909e8bed036f0da7457b6a0e
+checksum=8fe933e4614aed35aa6dfb6ab3105b2c2d6eb80a75bd3e93d4445ce6efd3dba0
post_install() {
vlicense LICENSE
- vdoc README.md
+ rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE
}
From 864f28b548f7cf6d4e31075efa742db430178990 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 6 Aug 2020 20:44:38 -0500
Subject: [PATCH 09/27] delta: update to 0.4.0.
---
srcpkgs/delta/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index ff581cb88cd..e7c038aeeae 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
# Template file for 'delta'
pkgname=delta
-version=0.3.0
+version=0.4.0
revision=1
build_style=cargo
hostmakedepends="llvm clang"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/dandavison/delta"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=4ff8d5864306f130be8e0da3d8013bcc4ece082835d4cc5395775c669111ed77
+checksum=cae9bda3fb1b4e1adea439bb0e834d703d5925f0ace44eafa2d1b1293ae79209
pre_build() {
export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
From bb04d83f7cbd29038e3fb91240c4acbf71aa6257 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 6 Aug 2020 20:46:23 -0500
Subject: [PATCH 10/27] nfdump: update to 1.6.21.
---
srcpkgs/nfdump/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template
index 2b1411affa3..31db7feb0d0 100644
--- a/srcpkgs/nfdump/template
+++ b/srcpkgs/nfdump/template
@@ -1,6 +1,6 @@
# Template file for 'nfdump'
pkgname=nfdump
-version=1.6.20
+version=1.6.21
revision=1
build_style=gnu-configure
hostmakedepends="automake flex libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/phaag/nfdump"
distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz"
-checksum=672f4fbe2b7424cfdba5917441100a440cbc9083f2a79147562fb5a966838543
+checksum=7ad5dd6a7c226865b5cafe317684e4c61ea95093f943fd46cd896977f234ca5c
configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd"
pre_configure() {
From 7fb8ac967b1f83b6aeb9ecba795cb8e1f85845a3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 6 Aug 2020 20:48:54 -0500
Subject: [PATCH 11/27] libxlsxwriter: update to 0.9.7.
---
srcpkgs/libxlsxwriter/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 77ec5f33fe2..1973dfa385d 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
# Template file for 'libxlsxwriter'
pkgname=libxlsxwriter
-version=0.9.5
+version=0.9.7
revision=1
wrksrc="${pkgname}-RELEASE_${version}"
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-2-Clause"
homepage="https://libxlsxwriter.github.io/"
distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=a42daf9a96a5ba24d46a56bd0ad0d44bc4bc35f73b8aed22c4fa5f8f3e8eb8be
+checksum=0a2102f415770548299a1f4cc5c86fc99b5e94ee605ee059e3fba63e75429d08
pre_configure() {
sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME} \
From 37e060e056fc5a935aae7467ad216948d2bfdc26 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 Aug 2020 08:45:55 -0500
Subject: [PATCH 12/27] steam: update to 1.0.0.66, adopt.
---
srcpkgs/steam/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index 6d57a116f9c..90a856864fb 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,17 +1,17 @@
# Template file for 'steam'
pkgname=steam
-version=1.0.0.63
+version=1.0.0.66
revision=1
archs="i686 x86_64"
wrksrc=steam-launcher
depends="zenity xz curl dbus freetype gdk-pixbuf hicolor-icon-theme desktop-file-utils
liberation-fonts-ttf file tar bash coreutils"
short_desc="Digital distribution client bootstrap package - Valve's steam client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom: Proprietary license"
homepage="https://steampowered.com/"
distfiles="http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${version}.tar.gz"
-checksum=e322506fc7de1e2de6641edb34888829d82081984b582640aac638ac122272e9
+checksum=738c855f73168d0bce0b9297c75d9dbf56419b722264d8ca3f7737657754c710
repository=nonfree
do_install() {
From 7e9a06432ec327817799bea2479bfa0f200c956d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 3 Aug 2020 21:27:52 -0300
Subject: [PATCH 13/27] snapper: link against libintl on musl.
---
.../patches/0003-musl-_nl_msg_cat_cntr.patch | 60 -------------------
srcpkgs/snapper/template | 5 +-
2 files changed, 4 insertions(+), 61 deletions(-)
delete mode 100644 srcpkgs/snapper/patches/0003-musl-_nl_msg_cat_cntr.patch
diff --git a/srcpkgs/snapper/patches/0003-musl-_nl_msg_cat_cntr.patch b/srcpkgs/snapper/patches/0003-musl-_nl_msg_cat_cntr.patch
deleted file mode 100644
index 303e79d709c..00000000000
--- a/srcpkgs/snapper/patches/0003-musl-_nl_msg_cat_cntr.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 554bf69b4cfb5e91a20f0df0ac0fef918648fb48 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:26:02 -0600
-Subject: [PATCH 3/4] musl-_nl_msg_cat_cntr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/Regex.cc | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/snapper/Regex.cc b/snapper/Regex.cc
-index da8f862..6b2cd2d 100644
---- snapper/Regex.cc
-+++ snapper/Regex.cc
-@@ -21,9 +21,9 @@
-
- #include <stdexcept>
- #include "snapper/Regex.h"
--
-+#ifdef __GLIBC__
- extern int _nl_msg_cat_cntr;
--
-+#endif
-
- namespace snapper
- {
-@@ -40,8 +40,10 @@ Regex::Regex (const string& pattern, int cflags, unsigned int nm)
- regerror(errcode, &rx, error, esize);
- throw std::runtime_error(string("Regex compilation error: ") + error);
- }
-+#ifdef __GLIBC__
- my_nl_msg_cat_cntr = _nl_msg_cat_cntr;
-- rm = new regmatch_t[nm];
-+#endif
-+ rm = new regmatch_t[nm];
- }
-
-
-@@ -55,11 +57,16 @@ Regex::~Regex ()
- bool
- Regex::match (const string& str, int eflags) const
- {
-- if (my_nl_msg_cat_cntr != _nl_msg_cat_cntr) {
-+#ifdef __GLIBC__
-+ if (my_nl_msg_cat_cntr != _nl_msg_cat_cntr)
-+#endif
-+ {
- regfree (&rx);
- regcomp (&rx, pattern.c_str (), cflags);
-+#ifdef __GLIBC__
- my_nl_msg_cat_cntr = _nl_msg_cat_cntr;
-- }
-+#endif
-+ }
-
- last_str = str;
-
---
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index aec7ad12434..13f41f2aa63 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
version=0.8.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-zypp --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
@@ -22,6 +22,9 @@ case "$XBPS_TARGET_MACHINE" in
*-musl) # We define MUSL_LIBC to pick the correct return type
# for strerror_r(2) which is int (XSI-compliant)
CXXFLAGS="-DMUSL_LIBC=1"
+ # We also link against libintl
+ makedepends+=" gettext-devel"
+ LDFLAGS="-lintl"
esac
pre_configure() {
From d7da29c485fe500df5fb78dd5ef7a56a41a45f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 3 Aug 2020 21:39:44 -0300
Subject: [PATCH 14/27] anope: link against libintl on musl.
---
srcpkgs/anope/patches/fix-musl-cross.patch | 23 ----------------------
srcpkgs/anope/template | 9 +++++++--
2 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/anope/patches/fix-musl-cross.patch
diff --git a/srcpkgs/anope/patches/fix-musl-cross.patch b/srcpkgs/anope/patches/fix-musl-cross.patch
deleted file mode 100644
index 6e6050aed50..00000000000
--- a/srcpkgs/anope/patches/fix-musl-cross.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/language.cpp b/src/language.cpp
-index 8b7b0ee..9a97093 100644
---- src/language.cpp
-+++ src/language.cpp
-@@ -75,7 +75,7 @@ const char *Language::Translate(const NickCore *nc, const char *string)
-
- #if GETTEXT_FOUND
-
--#ifdef __USE_GNU_GETTEXT
-+#if defined(__USE_GNU_GETTEXT) && defined(_nl_msg_cat_cntr)
- extern "C" int _nl_msg_cat_cntr;
- #endif
-
-@@ -87,7 +87,7 @@ const char *Language::Translate(const char *lang, const char *string)
- if (!lang || !*lang)
- lang = Config->DefLanguage.c_str();
-
--#ifdef __USE_GNU_GETTEXT
-+#if defined(__USE_GNU_GETTEXT) && defined(_nl_msg_cat_cntr)
- ++_nl_msg_cat_cntr;
- #endif
-
-
diff --git a/srcpkgs/anope/template b/srcpkgs/anope/template
index 227d8226c68..42b05622161 100644
--- a/srcpkgs/anope/template
+++ b/srcpkgs/anope/template
@@ -1,7 +1,7 @@
# Template file for 'anope'
pkgname=anope
version=2.0.7
-revision=1
+revision=2
wrksrc="${pkgname}-${version}-source"
build_style=cmake
configure_args="-DINSTDIR=../install -DRUNGROUP=_anope -DDEFUMASK=077
@@ -20,6 +20,11 @@ make_dirs="
/var/lib/anope 755 _anope _anope
/var/log/anope 755 _anope _anope"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" gettext-devel"
+ LDFLAGS="-lintl"
+fi
+
pre_configure() {
# prevent cmake from building include/version and running
# because it breaks cross compiling (cmake can't differentiate
@@ -49,7 +54,7 @@ do_install() {
vbin bin/services anopeservices
for conffile in conf/*example.conf; do
- vsconf ${conffile}
+ vsconf ${conffile}
done
vmkdir /usr/share/anope
From 4955dbae22d4cbff6cc6d572fcd44c3ab26241a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 3 Aug 2020 21:56:09 -0300
Subject: [PATCH 15/27] workrave: link against libintl on musl.
Use LDFLAGS instead of configure.ac patch.
Use python3-cheetah3 instead of python-cheetah.
---
srcpkgs/workrave/patches/configure_ac.patch | 11 ---------
.../patches/musl-nl_msg_cat_cntr.patch | 23 -------------------
srcpkgs/workrave/template | 9 ++++++--
3 files changed, 7 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/workrave/patches/configure_ac.patch
delete mode 100644 srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch
diff --git a/srcpkgs/workrave/patches/configure_ac.patch b/srcpkgs/workrave/patches/configure_ac.patch
deleted file mode 100644
index 641b1b07615..00000000000
--- a/srcpkgs/workrave/patches/configure_ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.ac.orig 2015-11-02 15:12:56.227947986 -0500
-+++ ./configure.ac 2015-11-02 15:13:00.392948034 -0500
-@@ -323,6 +323,8 @@
-
- AM_CONDITIONAL(HAVE_DSOUND, test "x$have_dsound" = "xyes")
-
-+AC_CHECK_LIB(intl, gettext)
-+
- dnl
- dnl OSX specific checks
- dnl
diff --git a/srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch b/srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch
deleted file mode 100644
index 9f7cf197098..00000000000
--- a/srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Avoid glibc-specific libintl symbol on musl.
-
---- common/src/Locale.cc
-+++ common/src/Locale.cc
-@@ -34,7 +34,9 @@
-
- #include "locale.inc"
-
-+#if defined(__GLIBC__)
- extern "C" int _nl_msg_cat_cntr;
-+#endif
-
- Locale::LanguageMap Locale::languages_native_locale;
-
-@@ -102,7 +104,7 @@ Locale::set_locale(const std::string &code)
- g_unsetenv("LANG");
- }
-
--#ifndef PLATFORM_OS_WIN32_NATIVE
-+#if defined(__GLIBC__)
- ++_nl_msg_cat_cntr;
- #endif
- }
diff --git a/srcpkgs/workrave/template b/srcpkgs/workrave/template
index a07d5358be9..733e6d13f79 100644
--- a/srcpkgs/workrave/template
+++ b/srcpkgs/workrave/template
@@ -1,7 +1,7 @@
# Template file for 'workrave'
pkgname=workrave
version=1.10.34
-revision=1
+revision=2
_realversion="${version//./_}"
wrksrc="${pkgname}-${_realversion}"
build_style=gnu-configure
@@ -9,7 +9,7 @@ build_helper="gir"
configure_args="--disable-static --disable-gnome --disable-gsettings
$(vopt_enable pulseaudio pulse)"
hostmakedepends="automake autoconf-archive gettext-devel intltool python3-Jinja2
-pkg-config python-cheetah libtool"
+pkg-config python3-cheetah3 libtool"
makedepends="boost-devel gtkmm-devel libSM-devel libXtst-devel libXScrnSaver-devel
$(vopt_if pulseaudio pulseaudio-devel)"
short_desc="Program that assists in the recovery and prevention of RSI"
@@ -21,6 +21,11 @@ checksum=31a090b48c67c5a2ccb73fb56633f182fcc6d7aca5ec6376146671c72fda1444
build_options="pulseaudio"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" gettext-devel"
+ LDFLAGS="-lintl"
+fi
+
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
From 81aebc147cf3eafbce0f60cc26f07a43caf2af8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 3 Aug 2020 21:58:14 -0300
Subject: [PATCH 16/27] widelands: link against libintl on musl.
Close: #24037
---
.../patches/fix_nl_msg_cat_cntr.patch | 24 --------------
.../{musl-execinfo.patch => musl.patch} | 31 ++++++++++++-------
srcpkgs/widelands/template | 4 +--
3 files changed, 21 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/widelands/patches/fix_nl_msg_cat_cntr.patch
rename srcpkgs/widelands/patches/{musl-execinfo.patch => musl.patch} (66%)
diff --git a/srcpkgs/widelands/patches/fix_nl_msg_cat_cntr.patch b/srcpkgs/widelands/patches/fix_nl_msg_cat_cntr.patch
deleted file mode 100644
index 06097d2c51e..00000000000
--- a/srcpkgs/widelands/patches/fix_nl_msg_cat_cntr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/base/i18n.cc 2016-11-10 08:28:01.000000000 +0100
-+++ src/base/i18n.cc 2017-12-19 07:16:43.225723387 +0100
-@@ -45,7 +45,9 @@
- #endif
- #endif
-
-+#if defined(__GLIBC__)
- extern int _nl_msg_cat_cntr;
-+#endif
-
- namespace i18n {
-
-@@ -302,9 +304,11 @@
- locale = lang;
- }
-
-+#if defined(__GLIBC__)
- /* Finally make changes known. */
- ++_nl_msg_cat_cntr;
- #endif
-+#endif
-
- SETLOCALE(LC_ALL, ""); // call to libintl
-
diff --git a/srcpkgs/widelands/patches/musl-execinfo.patch b/srcpkgs/widelands/patches/musl.patch
similarity index 66%
rename from srcpkgs/widelands/patches/musl-execinfo.patch
rename to srcpkgs/widelands/patches/musl.patch
index 15467dcae0e..507297e01be 100644
--- a/srcpkgs/widelands/patches/musl-execinfo.patch
+++ b/srcpkgs/widelands/patches/musl.patch
@@ -1,6 +1,8 @@
---- CMakeLists.txt 2020-07-12 21:33:44.000000000 +0200
-+++ CMakeLists.txt 2020-07-19 08:28:28.360260489 +0200
-@@ -312,19 +312,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 018d9ea0..827bf33e 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -312,19 +312,15 @@ IF (WIN32)
endif (CMAKE_SIZEOF_VOID_P EQUAL 4)
endif (WIN32)
@@ -10,15 +12,17 @@
- if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
- find_library(EXECINFO_LIBRARY NAMES execinfo)
- endif (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
-+# Find libexecinfo for musl
-+find_library(EXECINFO_LIBRARY NAMES execinfo)
-
+-
- # OpenBSD needs the X11 include directory in order to find GL/glu.h
- if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
- find_package(X11 REQUIRED)
- include_directories(${X11_INCLUDE_DIR})
- endif ()
-endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++# Find libexecinfo and libintl for musl
++find_library(EXECINFO_LIBRARY NAMES execinfo)
++find_library(INTL_LIBRARY NAMES intl)
++
+# OpenBSD needs the X11 include directory in order to find GL/glu.h
+if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+ find_package(X11 REQUIRED)
@@ -27,17 +31,20 @@
if (NOT DEFINED WL_VERSION)
include (${CMAKE_SOURCE_DIR}/cmake/BzrRevision.cmake)
---- src/CMakeLists.txt 2020-07-12 21:33:44.000000000 +0200
-+++ src/CMakeLists.txt 2020-07-19 08:28:57.894258728 +0200
-@@ -140,9 +140,9 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 31f5a76e..1f27495f 100644
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -140,9 +140,9 @@ wl_library(widelands_options
logic_filesystem_constants
)
-if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+if (EXECINFO_LIBRARY)
- target_link_libraries(widelands_ball_of_mud ${EXECINFO_LIBRARY})
+- target_link_libraries(widelands_ball_of_mud ${EXECINFO_LIBRARY})
-endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+endif (EXECINFO_LIBRARY)
++if (EXECINFO_LIBRARY OR INTL_LIBRARY)
++ target_link_libraries(widelands_ball_of_mud ${EXECINFO_LIBRARY} ${INTL_LIBRARY})
++endif (EXECINFO_LIBRARY OR INTL_LIBRARY)
if (WIN32)
target_link_libraries(widelands_ball_of_mud wsock32)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index f8b35faaedc..061040d9ae4 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=1
+revision=2
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -21,7 +21,7 @@ checksum=601e0e4c6f91b3fb0ece2cd1b83ecfb02344a1b9194fbb70ef3f70e06994e357
CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- makedepends+=" libexecinfo-devel"
+ makedepends+=" libexecinfo-devel gettext-devel"
fi
if [ "$CROSS_BUILD" ]; then
From a79ab2a296732da155a0abbcde1884af92a004ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 7 Aug 2020 18:30:00 +0700
Subject: [PATCH 17/27] python3-usb: depends on libusb
---
srcpkgs/python3-usb/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index d26c24df669..1e27b46961b 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,19 +1,17 @@
# Template file for 'python3-usb'
pkgname=python3-usb
-_pkgname=pyusb
version=1.0.2
-revision=2
+revision=3
archs=noarch
-wrksrc="${_pkgname}-${version}"
+wrksrc="pyusb-${version}"
build_style=python3-module
-pycompile_module=usb
hostmakedepends="python3-setuptools"
-depends="python3"
+depends="python3 libusb"
short_desc="Python library for USB communication"
-maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/pyusb/pyusb"
-distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
checksum=4e9b72cc4a4205ca64fbf1f3fff39a335512166c151ad103e55c8223ac147362
post_install() {
From fbf88f0054c1c2e12c5df8b436d355da1a79e808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 28 Jul 2020 21:09:54 +0700
Subject: [PATCH 18/27] xbps-src: enable C.UTF-8 locale on glibc masterdir
`util-linux` requires `C.UTF-8` for testing.
Since this is an important part of system,
enable `C.UTF-8' for checking `util-linux`.
---
common/xbps-src/shutils/chroot.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 436f8866cd4..ea63bf7e779 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -132,7 +132,10 @@ chroot_prepare() {
# Prepare default locale: en_US.UTF-8.
if [ -s ${XBPS_MASTERDIR}/etc/default/libc-locales ]; then
- echo 'en_US.UTF-8 UTF-8' >> ${XBPS_MASTERDIR}/etc/default/libc-locales
+ printf '%s\n' \
+ 'C.UTF-8 UTF-8' \
+ 'en_US.UTF-8 UTF-8' \
+ >> ${XBPS_MASTERDIR}/etc/default/libc-locales
fi
touch -f $XBPS_MASTERDIR/.xbps_chroot_init
From 308a4a42049cbe8d6247e961ced796ece9f7d4ce Mon Sep 17 00:00:00 2001
From: Alessandro Saglia <ale.saglia@gmail.com>
Date: Thu, 6 Aug 2020 15:15:53 +0200
Subject: [PATCH 19/27] New package: bitwig-studio-3.2.6
Removed blank lines
Reordered variables according to xlint suggestions
---
srcpkgs/bitwig-studio/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/bitwig-studio/template
diff --git a/srcpkgs/bitwig-studio/template b/srcpkgs/bitwig-studio/template
new file mode 100644
index 00000000000..65c697ba9db
--- /dev/null
+++ b/srcpkgs/bitwig-studio/template
@@ -0,0 +1,29 @@
+# Template file for 'bitwig-studio'
+pkgname=bitwig-studio
+version=3.2.6
+revision=1
+archs="x86_64"
+depends="xdg-utils xcb-util-wm libbsd"
+short_desc="DAW for music production, remixing and live performance"
+maintainer="Alessandro Saglia <ale.saglia@gmail.com>"
+license="custom:bitwig"
+homepage="https://bitwig.com/"
+_file="bitwig-studio-${version}.deb"
+distfiles="https://downloads.bitwig.com/stable/${version}/${_file}"
+checksum=d60e288e1ff1fd4b716843b3315ea68d7cbe36e67ca92517457a682bed5b1902
+nostrip=yes
+restricted=yes
+repository=nonfree
+
+do_extract() {
+ mkdir -p ${DESTDIR}
+ ar x ${XBPS_SRCDISTDIR}/bitwig-studio-${version}/${_file}
+}
+
+do_install() {
+ bsdtar -xf data.tar.xz -C ${DESTDIR}
+}
+
+post_install() {
+ vlicense ${DESTDIR}/opt/bitwig-studio/EULA.rtf
+}
From f240704be089c75542658e5b23622d32d81defb8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 Aug 2020 12:13:08 -0400
Subject: [PATCH 20/27] base-files: improve consistency of relative paths in
kernel hooks
---
srcpkgs/base-files/files/vkpurge | 4 +++-
srcpkgs/base-files/template | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/base-files/files/vkpurge b/srcpkgs/base-files/files/vkpurge
index 92098ec736e..5519147b905 100644
--- a/srcpkgs/base-files/files/vkpurge
+++ b/srcpkgs/base-files/files/vkpurge
@@ -39,10 +39,12 @@ list_kernels() {
run_hooks() {
dir="$1"
kver="$2"
+
for d in /etc/kernel.d/"${dir}"/*; do
[ -x "$d" ] || continue
printf "Running %s kernel hook: %s...\n" "$dir" "${d##*/}"
- "$d" kernel "$kver"
+ # Hooks assume they run from the root
+ (cd / && ROOTDIR=. "$d" kernel "$kver")
done
}
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index d608bc81f57..6b503690606 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
# Template file for 'base-files'
pkgname=base-files
version=0.141
-revision=1
+revision=2
bootstrap=yes
depends="xbps-triggers"
short_desc="Void Linux base system files"
From 868ee7e94878d1a6ae0868e4d4e53c305eeec94d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 Aug 2020 12:13:08 -0400
Subject: [PATCH 21/27] dkms: improve consistency of relative paths in kernel
hooks
---
srcpkgs/dkms/files/kernel.d/dkms.postinst | 34 ++++++++++++-----------
srcpkgs/dkms/files/kernel.d/dkms.prerm | 6 ++--
srcpkgs/dkms/template | 2 +-
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/dkms/files/kernel.d/dkms.postinst b/srcpkgs/dkms/files/kernel.d/dkms.postinst
index 5cfc630de1c..ef2a10bac28 100644
--- a/srcpkgs/dkms/files/kernel.d/dkms.postinst
+++ b/srcpkgs/dkms/files/kernel.d/dkms.postinst
@@ -8,7 +8,7 @@ PKGNAME="$1"
VERSION="$2"
ARCH=$(uname -m)
-if [ ! -x /usr/sbin/dkms ]; then
+if [ ! -x /usr/bin/dkms ]; then
exit 0
fi
@@ -59,16 +59,16 @@ while [ $# -gt 1 ]; do
# If adding a module, depmod is necessary unless dkms runs it
do_depmod="yes"
- status=$(dkms status -m ${module} -v ${modulever} -k ${VERSION})
+ status=$(/usr/bin/dkms status -m ${module} -v ${modulever} -k ${VERSION})
if [ $(echo "$status"|grep -c ": built") -eq 0 ]; then
# Check if the module is still there.
- if [ ! -f usr/src/${module}-${modulever}/dkms.conf ]; then
+ if [ ! -f /usr/src/${module}-${modulever}/dkms.conf ]; then
echo "Skipping nonexistent DKMS module: ${module}-${modulever}."
continue
fi
# Build the module
echo -n "Building DKMS module: ${module}-${modulever}... "
- dkms build -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH}
+ /usr/bin/dkms build -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH}
rval=$?
# If the module was skipped or failed, go to the next module.
if [ $rval -eq 0 ]; then
@@ -80,14 +80,14 @@ while [ $# -gt 1 ]; do
echo "FAILED!"
continue
fi
- status=$(dkms status -m ${module} -v ${modulever} -k ${VERSION})
+ status=$(/usr/bin/dkms status -m ${module} -v ${modulever} -k ${VERSION})
fi
# If the module is built (either pre-built or just now), install it
if [ $(echo "$status"|grep -c ": built") -eq 1 ] &&
[ $(echo "$status"|grep -c ": installed") -eq 0 ]; then
echo -n "Installing DKMS module: ${module}-${modulever}... "
- dkms install -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH}
+ /usr/bin/dkms install -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH}
rval=$?
# If the module failed installation, go to the next module.
if [ $rval -eq 0 ]; then
@@ -101,16 +101,18 @@ while [ $# -gt 1 ]; do
fi
done
-if [ -n "$do_depmod" ]; then
- echo -n "Generating kernel module dependency lists... "
- depmod -a ${VERSION}
- rval=$?
- if [ $rval -eq 0 ]; then
- echo "done."
- else
- echo "FAILED!"
- exit $rval
- fi
+if [ -z "$do_depmod" ] || [ ! -x /usr/bin/depmod ]; then
+ exit 0
+fi
+
+echo -n "Generating kernel module dependency lists... "
+/usr/bin/depmod -a ${VERSION}
+rval=$?
+if [ $rval -eq 0 ]; then
+ echo "done."
+else
+ echo "FAILED!"
+ exit $rval
fi
exit 0
diff --git a/srcpkgs/dkms/files/kernel.d/dkms.prerm b/srcpkgs/dkms/files/kernel.d/dkms.prerm
index 0307e895311..155e9734aee 100644
--- a/srcpkgs/dkms/files/kernel.d/dkms.prerm
+++ b/srcpkgs/dkms/files/kernel.d/dkms.prerm
@@ -4,14 +4,14 @@
PKGNAME="$1"
VERSION="$2"
-if [ -x /usr/sbin/dkms ]; then
+if [ -x /usr/bin/dkms ]; then
while read line; do
name=`echo "$line" | awk '{print $1}' | sed 's/,$//'`
vers=`echo "$line" | awk '{print $2}' | sed 's/,$//'`
arch=`echo "$line" | awk '{print $4}' | sed 's/:$//'`
echo "dkms: removing: $name $vers (${PKGNAME}-${VERSION}) ($arch)" >&2
- dkms remove -q -m $name -v $vers -k ${VERSION} -a $arch
-done < <(dkms status -k ${VERSION} 2>/dev/null | grep ": installed")
+ /usr/bin/dkms remove -q -m $name -v $vers -k ${VERSION} -a $arch
+done < <(/usr/bin/dkms status -k ${VERSION} 2>/dev/null | grep ": installed")
fi
rmdir \
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 4365bc5a7d7..f6b5035e8a0 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
# Template file for 'dkms'
pkgname=dkms
version=2.8.3
-revision=1
+revision=2
conf_files="/etc/dkms/framework.conf"
depends="bash kmod gcc make coreutils linux-headers"
short_desc="Dynamic Kernel Modules System"
From e45e126f808412d2ad1e8c3c41ac898f49d46eff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 Aug 2020 12:13:08 -0400
Subject: [PATCH 22/27] dracut: improve consistency of relative paths in kernel
hooks
---
srcpkgs/dracut/files/kernel-hook-postinst | 4 ++--
srcpkgs/dracut/files/kernel-hook-postrm | 4 +---
srcpkgs/dracut/files/kernel-uefi-hook-postinst | 5 +++--
srcpkgs/dracut/files/kernel-uefi-hook-postrm | 4 +---
srcpkgs/dracut/template | 2 +-
5 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/dracut/files/kernel-hook-postinst b/srcpkgs/dracut/files/kernel-hook-postinst
index a9d265b6ed6..537af549796 100644
--- a/srcpkgs/dracut/files/kernel-hook-postinst
+++ b/srcpkgs/dracut/files/kernel-hook-postinst
@@ -7,9 +7,9 @@
PKGNAME="$1"
VERSION="$2"
-if [ ! -x bin/dracut ]; then
+if [ ! -x usr/bin/dracut ]; then
exit 0
fi
-dracut -q --force boot/initramfs-${VERSION}.img ${VERSION}
+usr/bin/dracut -q --force --sysroot . boot/initramfs-${VERSION}.img ${VERSION}
exit $?
diff --git a/srcpkgs/dracut/files/kernel-hook-postrm b/srcpkgs/dracut/files/kernel-hook-postrm
index f99458a4bfa..c338cf617a7 100644
--- a/srcpkgs/dracut/files/kernel-hook-postrm
+++ b/srcpkgs/dracut/files/kernel-hook-postrm
@@ -7,7 +7,5 @@
PKGNAME="$1"
VERSION="$2"
-if [ -f boot/initramfs-${VERSION}.img ]; then
- rm -f boot/initramfs-${VERSION}.img
-fi
+rm -f boot/initramfs-${VERSION}.img
exit $?
diff --git a/srcpkgs/dracut/files/kernel-uefi-hook-postinst b/srcpkgs/dracut/files/kernel-uefi-hook-postinst
index d623c3f86df..f1098a48a81 100644
--- a/srcpkgs/dracut/files/kernel-uefi-hook-postinst
+++ b/srcpkgs/dracut/files/kernel-uefi-hook-postinst
@@ -12,12 +12,13 @@ if [ -z "${CREATE_UEFI_BUNDLES}" ]; then
exit 0
fi
-if [ ! -x bin/dracut ]; then
+if [ ! -x usr/bin/dracut ]; then
exit 0
fi
mkdir -p ${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}
-dracut -q --force ${KERNEL_CMDLINE:+--kernel-cmdline="${KERNEL_CMDLINE}"} ${DRACUT_OPTIONS} \
+usr/bin/dracut -q --force --sysroot . ${DRACUT_OPTIONS} \
+ ${KERNEL_CMDLINE:+--kernel-cmdline="${KERNEL_CMDLINE}"} \
--uefi ${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi ${VERSION}
exit $?
diff --git a/srcpkgs/dracut/files/kernel-uefi-hook-postrm b/srcpkgs/dracut/files/kernel-uefi-hook-postrm
index 8183bb26f08..120efb1bd6e 100644
--- a/srcpkgs/dracut/files/kernel-uefi-hook-postrm
+++ b/srcpkgs/dracut/files/kernel-uefi-hook-postrm
@@ -11,7 +11,5 @@ VERSION="$2"
: "${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}"
-if [ -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi" ]; then
- rm -fv "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi"
-fi
+rm -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi"
exit $?
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 8fb41d17a72..232f70a0d4a 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
version=050
-revision=5
+revision=6
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
From c4f013ce009883bced4052f86936da2b498fabb3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 Aug 2020 12:13:08 -0400
Subject: [PATCH 23/27] gummiboot: improve consistency of relative paths in
kernel hooks
---
.../files/kernel.d/gummiboot.post-install | 28 +++++++++----------
.../files/kernel.d/gummiboot.post-remove | 16 +++++------
srcpkgs/gummiboot/template | 2 +-
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-install b/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-install
index 7f4d27e985d..2517421e3e5 100644
--- a/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-install
+++ b/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-install
@@ -13,33 +13,33 @@ if [ "$GUMMIBOOT_DISABLE" ]; then
exit 0
fi
-boot=$ROOTDIR/boot
-entries=$boot/loader/entries
-name=void-$VERSION
-entry=$entries/$name.conf
-options=$boot/loader/void-options.conf
-loader=$boot/loader/loader.conf
+boot="$ROOTDIR/boot"
+entries="$boot/loader/entries"
+name="void-$VERSION"
+entry="$entries/$name.conf"
+options="$boot/loader/void-options.conf"
+loader="$boot/loader/loader.conf"
-[ -d $boot ] || exit 0
+[ -d "$boot" ] || exit 0
-mkdir -p $entries
+mkdir -p "$entries"
-cat <<-EOF > $entry
+cat <<-EOF > "$entry"
title Void Linux
version $VERSION
linux /vmlinuz-$VERSION
initrd /initramfs-$VERSION.img
EOF
-if [ -r $options ]; then
+if [ -r "$options" ]; then
# Add user provided options from /boot/loader/void-options.conf:
- printf 'options %s\n' "$(cat $options | sed '/^#/d;/^$/d')" >> $entry
+ printf 'options %s\n' "$(cat "$options" | sed '/^#/d;/^$/d')" >> "$entry"
fi
-if grep -q ^default $loader 2>/dev/null; then
+if grep -q ^default "$loader" 2>/dev/null; then
# Replace existing default entry with this entry:
- sed -i "s/default.*/default $name/" $loader
+ sed -i "s/default.*/default $name/" "$loader"
else
# Add this entry as the default:
- printf 'default %s\n' $name >>$loader
+ printf 'default %s\n' $name >>"$loader"
fi
diff --git a/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-remove b/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-remove
index b946d62456a..a207b2d362c 100644
--- a/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-remove
+++ b/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-remove
@@ -7,15 +7,15 @@
PKGNAME="$1"
VERSION="$2"
-boot=$ROOTDIR/boot
-entries=$boot/loader/entries
-name=void-$VERSION
-entry=$entries/$name.conf
-loader=$boot/loader/loader.conf
+boot="$ROOTDIR/boot"
+entries="$boot/loader/entries"
+name="void-$VERSION"
+entry="$entries/$name.conf"
+loader="$boot/loader/loader.conf"
-[ -d $boot ] || exit 0
+[ -d "$boot" ] || exit 0
-rm -f $entry
+rm -f "$entry"
# No default entry if the removed entry was the default:
-sed -i "/^default $name\$/d" $loader
+[ -e "$loader" ] && sed -i "/^default $name\$/d" "$loader"
diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template
index a824e27c021..052776fe7ff 100644
--- a/srcpkgs/gummiboot/template
+++ b/srcpkgs/gummiboot/template
@@ -1,7 +1,7 @@
# Template file for 'gummiboot'
pkgname=gummiboot
version=48.1
-revision=5
+revision=6
archs="i686* x86_64* aarch64*"
build_style=gnu-configure
conf_files="/etc/default/gummiboot"
From 5cbc1b34dbfc28561215b6f2a549eb4aebdd4f58 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 Aug 2020 12:13:09 -0400
Subject: [PATCH 24/27] mkinitcpio: improve consistency of relative paths in
kernel hooks
---
srcpkgs/mkinitcpio/files/kernel-hook-postinst | 4 ++--
srcpkgs/mkinitcpio/files/kernel-hook-postrm | 4 +---
srcpkgs/mkinitcpio/template | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/mkinitcpio/files/kernel-hook-postinst b/srcpkgs/mkinitcpio/files/kernel-hook-postinst
index 31fe5705812..c6f2ab81264 100644
--- a/srcpkgs/mkinitcpio/files/kernel-hook-postinst
+++ b/srcpkgs/mkinitcpio/files/kernel-hook-postinst
@@ -7,9 +7,9 @@
PKGNAME="$1"
VERSION="$2"
-if [ ! -x bin/mkinitcpio ]; then
+if [ ! -x usr/bin/mkinitcpio ]; then
exit 0
fi
-mkinitcpio -g boot/initramfs-${VERSION}.img -k ${VERSION}
+usr/bin/mkinitcpio -g boot/initramfs-${VERSION}.img -k ${VERSION}
exit $?
diff --git a/srcpkgs/mkinitcpio/files/kernel-hook-postrm b/srcpkgs/mkinitcpio/files/kernel-hook-postrm
index f099aba66ca..028fd097b87 100644
--- a/srcpkgs/mkinitcpio/files/kernel-hook-postrm
+++ b/srcpkgs/mkinitcpio/files/kernel-hook-postrm
@@ -7,7 +7,5 @@
PKGNAME="$1"
VERSION="$2"
-if [ -f /boot/initramfs-${VERSION}.img ]; then
- rm -f /boot/initramfs-${VERSION}.img
-fi
+rm -f boot/initramfs-${VERSION}.img
exit $?
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index 303905d0f1f..a0f44360db4 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
# Template file for 'mkinitcpio'
pkgname=mkinitcpio
version=27
-revision=1
+revision=2
archs=noarch
build_style=gnu-makefile
depends="busybox-static bsdtar bash"
From 41eed8fb69b477c23508b0b9c9524ca05fabf31c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 5 Aug 2020 12:13:09 -0400
Subject: [PATCH 25/27] refind: improve consistency of relative paths in kernel
hooks
---
srcpkgs/refind/files/kernel.post-install | 10 +++-------
srcpkgs/refind/files/kernel.post-remove | 4 +++-
srcpkgs/refind/template | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/refind/files/kernel.post-install b/srcpkgs/refind/files/kernel.post-install
index 88b261aaacd..fd18f9c45ff 100755
--- a/srcpkgs/refind/files/kernel.post-install
+++ b/srcpkgs/refind/files/kernel.post-install
@@ -12,22 +12,18 @@ if [ "z$UPDATE_REFIND_CONF" != "z1" ]; then
exit 0;
fi
-# Default refind.conf
-: "${REFIND_CONF:=/boot/EFI/refind/refind.conf}"
+: ${REFIND_CONF:=boot/EFI/refind/refind.conf}
+REFIND_CONF="${REFIND_CONF#/}"
-zrefind_dir="${REFIND_CONF%/*}"
-mkdir -p "$zrefind_dir"
+mkdir -p "${REFIND_CONF%/*}"
touch "$REFIND_CONF"
tmpfile=$(mktemp /tmp/refind.XXXXXXX)
-zefi_mountpoint=$(df -P "$REFIND_CONF" | awk 'NR==2{print $6}')
-zicon="${zrefind_dir#$zefi_mountpoint}/icons/os_void.png"
zversion=$(echo "$VERSION" | sed 's/[.]/[.]/g')
zentry=$(cat <<EOF
menuentry "Void Linux $VERSION" {
- icon $zicon
volume "Void Linux"
loader /vmlinuz-$VERSION
initrd /initramfs-$VERSION.img
diff --git a/srcpkgs/refind/files/kernel.post-remove b/srcpkgs/refind/files/kernel.post-remove
index efb3786396c..58881766e4d 100755
--- a/srcpkgs/refind/files/kernel.post-remove
+++ b/srcpkgs/refind/files/kernel.post-remove
@@ -13,7 +13,9 @@ if [ "z$UPDATE_REFIND_CONF" != "z1" ]; then
fi
# Default refind.conf
-: "${REFIND_CONF:=/boot/EFI/refind/refind.conf}"
+: "${REFIND_CONF:=boot/EFI/refind/refind.conf}"
+# Make sure paths are relative
+REFIND_CONF="${REFIND_CONF#/}"
[ -f "$REFIND_CONF" ] || exit 0
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 5e9865b9667..d7f8f2fba1c 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -1,7 +1,7 @@
# Template file for 'refind'
pkgname=refind
version=0.12.0
-revision=1
+revision=2
archs="x86_64* i686* aarch64*"
makedepends="gnu-efi-libs"
depends="bash dosfstools efibootmgr"
From 8098af3c22d312ce2f1a91f6334f74852a22b37e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 21 Jul 2020 00:03:15 +0700
Subject: [PATCH 26/27] sbsigntool: rewrite post-install kernel hook
* run the hook on target filesystem
* Use ls | awk to check ownership and permission, instead of relying on
GNU-stat.
* libify signing code, in order to support uefi bundle in the future
* Stop append signature to the efi signed by current key/cert.
While we're at it,
* add post-remove script to remove unsigned file if exist
Closes #23688.
Closes #24079.
---
.../files/kernel.d/sbsigntool.post-install | 66 +++++++++++--------
.../files/kernel.d/sbsigntool.post-remove | 13 ++++
srcpkgs/sbsigntool/template | 4 +-
3 files changed, 53 insertions(+), 30 deletions(-)
create mode 100644 srcpkgs/sbsigntool/files/kernel.d/sbsigntool.post-remove
diff --git a/srcpkgs/sbsigntool/files/kernel.d/sbsigntool.post-install b/srcpkgs/sbsigntool/files/kernel.d/sbsigntool.post-install
index bc450dbc428..70918527711 100644
--- a/srcpkgs/sbsigntool/files/kernel.d/sbsigntool.post-install
+++ b/srcpkgs/sbsigntool/files/kernel.d/sbsigntool.post-install
@@ -9,7 +9,35 @@ PKGNAME="$1"
VERSION="$2"
msg() {
- echo "EFI sbsign hook: $1"
+ echo "sbsigntool: $1"
+}
+
+do_sign() {
+ _kernel="$1"
+ if [ ! -f "$_kernel" ]; then
+ msg "$_kernel not found"
+ return 1
+ fi
+ # Ignore efi file signed with this key
+ if usr/bin/sbverify -c "$ROOTDIR/$EFI_CERT_FILE" "$_kernel" >/dev/null 2>&1; then
+ return 0
+ fi
+ if ! usr/bin/sbsign ${EFI_SIGN_ENGINE:+"--engine=$EFI_SIGN_ENGINE"} \
+ -k "$ROOTDIR/$EFI_KEY_FILE" -c "$ROOTDIR/$EFI_CERT_FILE" \
+ "$_kernel"
+ then
+ msg "failed to sign $_kernel"
+ return 1
+ fi
+ if ! usr/bin/sbverify -c "$ROOTDIR/$EFI_CERT_FILE" "$_kernel.signed"; then
+ msg "failed to verify the signature"
+ return 1
+ fi
+
+ if [ "x${EFI_KEEP_UNSIGNED}" = "x1" ]; then
+ mv -f "$_kernel" "$_kernel.unsigned"
+ fi
+ mv -f "$_kernel.signed" "$_kernel"
}
. "${ROOTDIR}/etc/default/sbsigntool-kernel-hook"
@@ -17,38 +45,18 @@ if [ "x${SBSIGN_EFI_KERNEL}" != x1 ]; then
exit 0
fi
-if [ ! -f "${EFI_KEY_FILE}" ] || [ ! -f "${EFI_CERT_FILE}" ]; then
+if [ ! -f "$ROOTDIR/$EFI_KEY_FILE" ] || [ ! -f "$ROOTDIR/$EFI_CERT_FILE" ]; then
msg "key and/or certificate is not available"
exit 1
fi
-key_stat=$(stat --dereference --format="%a %u" "${EFI_KEY_FILE}")
-
-# check if go=00 owner=0
-if [ "${key_stat}" = "${key_stat%00 0}" ]; then
- msg "Please chown root:root '${EFI_KEY_FILE}'"
- msg "and chmod go-rwx '${EFI_KEY_FILE}'"
- exit 1
-fi
-
-# this part is completely untested
-options=""
-if [ "x${EFI_SIGN_ENGINE}" != x ]; then
- options="--engine=${EFI_SIGN_ENGINE}"
-fi
-
-if ! sbsign $options -k "${EFI_KEY_FILE}" -c "${EFI_CERT_FILE}" \
- "/boot/vmlinuz-${VERSION}"; then
- msg "failed to sign kernel"
- exit 1
-fi
-
-if ! sbverify -c "${EFI_CERT_FILE}" "/boot/vmlinuz-${VERSION}.signed"; then
- msg "failed to verify the signature"
+# All POSIX comformance ls should work
+if ! ls -Ll "$ROOTDIR/$EFI_KEY_FILE" "$ROOTDIR/$EFI_CERT_FILE" |
+ awk '$1 !~ /^-...------$/ || $3 != "root" { exit 1 }'
+then
+ msg "$EFI_KEY_FILE and $EFI_CERT_FILE must be owned by root."
+ msg "and not readable by other users."
exit 1
fi
-if [ "x${EFI_KEEP_UNSIGNED}" = "x1" ]; then
- mv -f "/boot/vmlinuz-${VERSION}" "/boot/vmlinuz-${VERSION}.unsigned"
-fi
-mv -f "/boot/vmlinuz-${VERSION}.signed" "/boot/vmlinuz-${VERSION}"
+do_sign "boot/vmlinuz-$VERSION"
diff --git a/srcpkgs/sbsigntool/files/kernel.d/sbsigntool.post-remove b/srcpkgs/sbsigntool/files/kernel.d/sbsigntool.post-remove
new file mode 100644
index 00000000000..5d3f73602af
--- /dev/null
+++ b/srcpkgs/sbsigntool/files/kernel.d/sbsigntool.post-remove
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Kernel hook for sbsigntool.
+#
+# Arguments passed to this script: $1 pkgname, $2 version.
+#
+
+PKGNAME="$1"
+VERSION="$2"
+
+if [ -f "boot/vmlinuz-$VERSION.unsigned" ]; then
+ rm -f "boot/vmlinuz-${VERSION}.unsigned"
+fi
diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6e39cac66d9..6ee86139b27 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,7 +1,7 @@
# Template file for 'sbsigntool'
pkgname=sbsigntool
version=0.9.4
-revision=2
+revision=3
archs="x86_64* i686* aarch64* arm*"
wrksrc=sbsigntools-$version
build_style=gnu-configure
@@ -59,4 +59,6 @@ post_install() {
# and I'm not sure about their interaction
vinstall ${FILESDIR}/kernel.d/sbsigntool.post-install 744 \
etc/kernel.d/post-install 40-sbsigntool
+ vinstall ${FILESDIR}/kernel.d/sbsigntool.post-remove 744 \
+ etc/kernel.d/post-remove 40-sbsigntool
}
From 4aa98c1af0a29b4807faa5dd9ba9da7e66f56c9f Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 00:21:03 +0200
Subject: [PATCH 27/27] discord-ptb: update to 0.0.21
---
srcpkgs/discord-ptb/template | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index 0485c222023..0a6a395e26e 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,19 +1,31 @@
# Template file for 'discord-ptb'
-pkgname="discord-ptb"
-version=0.0.9
+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 <abel@abelgraham.com>"
-license="proprietary"
+license="custom:Proprietary"
homepage="https://discordapp.com/"
distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=372d6f75203626370218c97c21519b779e5af334177cafa65a5655e357c77520
+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
@@ -22,9 +34,14 @@ 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
+
+ vlicense EULA
}
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (22 preceding siblings ...)
2020-08-14 17:51 ` [PR PATCH] [Updated] " MGlolenstine
@ 2020-08-14 17:51 ` MGlolenstine
2020-08-14 17:55 ` [PR PATCH] [Updated] " MGlolenstine
` (23 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-14 17:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-674191304
Comment:
Ugh... I guess that squash didn't work like I wanted it to. :sweat_smile:
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (23 preceding siblings ...)
2020-08-14 17:51 ` MGlolenstine
@ 2020-08-14 17:55 ` MGlolenstine
2020-08-14 17:56 ` MGlolenstine
` (22 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-14 17:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by MGlolenstine against master on the void-packages repository
https://github.com/MGlolenstine/void-packages discord-ptb
https://github.com/void-linux/void-packages/pull/24117
discord-ptb: update to 0.0.21
A patch file from https://github.com/void-linux/void-packages/pull/24117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discord-ptb-24117.patch --]
[-- Type: text/x-diff, Size: 2592 bytes --]
From a9da981e838748af40de4cdb5bc19063d130bda9 Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 00:21:03 +0200
Subject: [PATCH] discord-ptb: update to 0.0.21
discord-ptb: updated license, shortened long line and fixed xlint warnings
discord-ptb: formatted file and changed licence
discord-ptb: added license
---
srcpkgs/discord-ptb/template | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index 0485c222023..0a6a395e26e 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,19 +1,31 @@
# Template file for 'discord-ptb'
-pkgname="discord-ptb"
-version=0.0.9
+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 <abel@abelgraham.com>"
-license="proprietary"
+license="custom:Proprietary"
homepage="https://discordapp.com/"
distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=372d6f75203626370218c97c21519b779e5af334177cafa65a5655e357c77520
+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
@@ -22,9 +34,14 @@ 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
+
+ vlicense EULA
}
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (24 preceding siblings ...)
2020-08-14 17:55 ` [PR PATCH] [Updated] " MGlolenstine
@ 2020-08-14 17:56 ` MGlolenstine
2020-08-18 14:49 ` [PR REVIEW] " Chocimier
` (21 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-14 17:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-674192934
Comment:
This seems better.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (25 preceding siblings ...)
2020-08-14 17:56 ` MGlolenstine
@ 2020-08-18 14:49 ` Chocimier
2020-08-18 14:49 ` Chocimier
` (20 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: Chocimier @ 2020-08-18 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 517 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r472255708
Comment:
This is checksum of empty string. Empty file is produced because of
```
=> discord-ptb-0.0.21_1: running post_extract ...
/void-packages/srcpkgs/discord-ptb/template: line 21: w3m: command not found
/void-packages/srcpkgs/discord-ptb/template: line 20: curl: command not found
```
Add w3m to hostmakedepends, use `$XBPS_FETCH_CMD -o eula` instead of `curl -L`.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (26 preceding siblings ...)
2020-08-18 14:49 ` [PR REVIEW] " Chocimier
@ 2020-08-18 14:49 ` Chocimier
2020-08-20 9:41 ` [PR PATCH] [Updated] " MGlolenstine
` (19 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: Chocimier @ 2020-08-18 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r472256181
Comment:
There is no word "USA" in this license.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (27 preceding siblings ...)
2020-08-18 14:49 ` Chocimier
@ 2020-08-20 9:41 ` MGlolenstine
2020-08-20 9:42 ` [PR REVIEW] " MGlolenstine
` (18 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-20 9:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by MGlolenstine against master on the void-packages repository
https://github.com/MGlolenstine/void-packages discord-ptb
https://github.com/void-linux/void-packages/pull/24117
discord-ptb: update to 0.0.21
A patch file from https://github.com/void-linux/void-packages/pull/24117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discord-ptb-24117.patch --]
[-- Type: text/x-diff, Size: 2693 bytes --]
From 35cd40690477f5c0c3a403949637dcd08d71ba11 Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 00:21:03 +0200
Subject: [PATCH] discord-ptb: update to 0.0.21
discord-ptb: updated license, shortened long line and fixed xlint warnings
discord-ptb: formatted file and changed licence
discord-ptb: added license
discord-ptb: changed EULA fetching algorithm
---
srcpkgs/discord-ptb/template | 36 +++++++++++++++++++++++++++---------
1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index 0485c222023..b807c326a72 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,19 +1,32 @@
# Template file for 'discord-ptb'
-pkgname="discord-ptb"
-version=0.0.9
+pkgname=discord-ptb
+version=0.0.21
revision=1
+archs="x86_64"
wrksrc="DiscordPTB"
+hostmakedepends="w3m"
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 <abel@abelgraham.com>"
-license="proprietary"
+license="custom:Proprietary"
homepage="https://discordapp.com/"
distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=372d6f75203626370218c97c21519b779e5af334177cafa65a5655e357c77520
+checksum=a1fa4e20cce5f493d84c9e3c7ac74c8265768886859e98022fa41d102f2726c4
+_license_checksum=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+nopie=yes
+restricted=yes
+repository=nonfree
+
+post_extract() {
+ $XBPS_FETCH_CMD -o eula https://discord.com/terms |
+ w3m -dump -I utf-8 -T text/html |
+ sed -n '/Discord Terms of Service/,/^Your place to talk$/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
@@ -22,9 +35,14 @@ 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
+
+ vlicense EULA
}
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (28 preceding siblings ...)
2020-08-20 9:41 ` [PR PATCH] [Updated] " MGlolenstine
@ 2020-08-20 9:42 ` MGlolenstine
2020-08-20 9:43 ` MGlolenstine
` (17 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-20 9:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New review comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r473822464
Comment:
You're right. I have no idea why I didn't replace that with something that's inside of the EULA.
Thanks for pointing it out!
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (29 preceding siblings ...)
2020-08-20 9:42 ` [PR REVIEW] " MGlolenstine
@ 2020-08-20 9:43 ` MGlolenstine
2020-08-20 22:42 ` chilledfrogs
` (16 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-20 9:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New review comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r473823159
Comment:
I've installed both, so the errors weren't being thrown for me. Thanks for checking it out!
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (30 preceding siblings ...)
2020-08-20 9:43 ` MGlolenstine
@ 2020-08-20 22:42 ` chilledfrogs
2020-08-20 22:46 ` [PR PATCH] [Updated] " MGlolenstine
` (15 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: chilledfrogs @ 2020-08-20 22:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
New comment by chilledfrogs on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-677942795
Comment:
BTW, just a little detail, but they moved to https://discord.com/ recently-ish @MGlolenstine, might wanna update that in homepage (for the moment the old URL is still usable though so not a huge deal)
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (31 preceding siblings ...)
2020-08-20 22:42 ` chilledfrogs
@ 2020-08-20 22:46 ` MGlolenstine
2020-08-20 22:48 ` MGlolenstine
` (14 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-20 22:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by MGlolenstine against master on the void-packages repository
https://github.com/MGlolenstine/void-packages discord-ptb
https://github.com/void-linux/void-packages/pull/24117
discord-ptb: update to 0.0.21
A patch file from https://github.com/void-linux/void-packages/pull/24117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discord-ptb-24117.patch --]
[-- Type: text/x-diff, Size: 2770 bytes --]
From b4b50458161e3e77b62922f6461b526bb1665702 Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 00:21:03 +0200
Subject: [PATCH] discord-ptb: update to 0.0.21
discord-ptb: updated license, shortened long line and fixed xlint warnings
discord-ptb: formatted file and changed licence
discord-ptb: added license
discord-ptb: changed EULA fetching algorithm
discord-ptb: fixed the url to discord.com
---
srcpkgs/discord-ptb/template | 38 ++++++++++++++++++++++++++----------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index 0485c222023..a630b1025e9 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,19 +1,32 @@
# Template file for 'discord-ptb'
-pkgname="discord-ptb"
-version=0.0.9
+pkgname=discord-ptb
+version=0.0.21
revision=1
+archs="x86_64"
wrksrc="DiscordPTB"
+hostmakedepends="w3m"
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 <abel@abelgraham.com>"
-license="proprietary"
-homepage="https://discordapp.com/"
+license="custom:Proprietary"
+homepage="https://discord.com/"
distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=372d6f75203626370218c97c21519b779e5af334177cafa65a5655e357c77520
+checksum=a1fa4e20cce5f493d84c9e3c7ac74c8265768886859e98022fa41d102f2726c4
+_license_checksum=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+nopie=yes
+restricted=yes
+repository=nonfree
+
+post_extract() {
+ $XBPS_FETCH_CMD -o eula https://discord.com/terms |
+ w3m -dump -I utf-8 -T text/html |
+ sed -n '/Discord Terms of Service/,/^Your place to talk$/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
@@ -22,9 +35,14 @@ 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
+
+ vlicense EULA
}
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (32 preceding siblings ...)
2020-08-20 22:46 ` [PR PATCH] [Updated] " MGlolenstine
@ 2020-08-20 22:48 ` MGlolenstine
2020-08-27 16:45 ` [PR REVIEW] " Chocimier
` (13 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-20 22:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-677944274
Comment:
> BTW, just a little detail, but they moved to https://discord.com/ recently-ish @MGlolenstine, might wanna update that in homepage (for the moment the old URL is still usable though so not a huge deal)
I've just updated the URL.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (33 preceding siblings ...)
2020-08-20 22:48 ` MGlolenstine
@ 2020-08-27 16:45 ` Chocimier
2020-08-27 21:07 ` MGlolenstine
` (12 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: Chocimier @ 2020-08-27 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r478556315
Comment:
license in package is still empty
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (34 preceding siblings ...)
2020-08-27 16:45 ` [PR REVIEW] " Chocimier
@ 2020-08-27 21:07 ` MGlolenstine
2020-08-28 17:55 ` Chocimier
` (11 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-27 21:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
New review comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r478696074
Comment:
@Chocimier If you have any ideas on how to fix it, I'm welcoming any. I'm not very knowledgable and I don't know much about VoidLinux, but this above code works for me.
Please help me fix this template so we can merge this.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (35 preceding siblings ...)
2020-08-27 21:07 ` MGlolenstine
@ 2020-08-28 17:55 ` Chocimier
2020-08-28 18:47 ` MGlolenstine
` (10 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: Chocimier @ 2020-08-28 17:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r479453999
Comment:
`$XBPS_FETCH_CMD -o eula` outputs to eula file, not stdout. Do something like `$XBPS_FETCH_CMD -o eula; cat eula | ...`, rebuild (with local revbump possibly to create new package, but then send with revision=1) and check if packaged license has right content.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (36 preceding siblings ...)
2020-08-28 17:55 ` Chocimier
@ 2020-08-28 18:47 ` MGlolenstine
2020-09-10 7:45 ` MGlolenstine
` (9 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-08-28 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
New review comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r479477923
Comment:
I might be thick-skulled, but I'm not exactly sure why we don't want to save it to a file, but instead output it to a stdout. Is there a reason for it?
I'll try doing the above as soon as my laptop is free(few hours).
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR REVIEW] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (37 preceding siblings ...)
2020-08-28 18:47 ` MGlolenstine
@ 2020-09-10 7:45 ` MGlolenstine
2020-09-10 8:11 ` [PR PATCH] [Updated] " MGlolenstine
` (8 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-09-10 7:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
New review comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#discussion_r486133144
Comment:
I figured out that I was being thick-skulled and I realised what the problem with the file was...
Piping didn't do anything if the output of the first command wasn't outputted to the stdout.
In the meantime, there has been an update to 0.0.22, so I'll update to that and commit again.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (38 preceding siblings ...)
2020-09-10 7:45 ` MGlolenstine
@ 2020-09-10 8:11 ` MGlolenstine
2020-09-10 8:12 ` MGlolenstine
` (7 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-09-10 8:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by MGlolenstine against master on the void-packages repository
https://github.com/MGlolenstine/void-packages discord-ptb
https://github.com/void-linux/void-packages/pull/24117
discord-ptb: update to 0.0.21
A patch file from https://github.com/void-linux/void-packages/pull/24117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discord-ptb-24117.patch --]
[-- Type: text/x-diff, Size: 2819 bytes --]
From b4e6047f52bdd1abe39a38aa7a07991c73b71810 Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 00:21:03 +0200
Subject: [PATCH] discord-ptb: update to 0.0.21
discord-ptb: updated license, shortened long line and fixed xlint warnings
discord-ptb: formatted file and changed licence
discord-ptb: added license
discord-ptb: changed EULA fetching algorithm
discord-ptb: fixed the url to discord.com
discord-ptb: bumped version to 0.0.22
---
srcpkgs/discord-ptb/template | 38 ++++++++++++++++++++++++++----------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index 0485c222023..867ba7e5dca 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,19 +1,32 @@
# Template file for 'discord-ptb'
-pkgname="discord-ptb"
-version=0.0.9
+pkgname=discord-ptb
+version=0.0.22
revision=1
+archs="x86_64"
wrksrc="DiscordPTB"
+hostmakedepends="w3m"
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 <abel@abelgraham.com>"
-license="proprietary"
-homepage="https://discordapp.com/"
+license="custom:Proprietary"
+homepage="https://discord.com/"
distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=372d6f75203626370218c97c21519b779e5af334177cafa65a5655e357c77520
+checksum=3225e1f1c96e781566ece413968dcc8fb5cad6aa5ec5830f36349e9622821e1b
+_license_checksum=9abbd207c86f76a59c0017c131dc7a30089c40b4dacb54a0f339272468344e1e
+nopie=yes
+restricted=yes
+repository=nonfree
+
+post_extract() {
+ $XBPS_FETCH_CMD -o eula https://discord.com/terms; cat eula |
+ w3m -dump -I utf-8 -T text/html |
+ sed -n '/Discord Terms of Service/,/^Your place to talk$/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
@@ -22,9 +35,14 @@ 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
+
+ vlicense EULA
}
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (39 preceding siblings ...)
2020-09-10 8:11 ` [PR PATCH] [Updated] " MGlolenstine
@ 2020-09-10 8:12 ` MGlolenstine
2020-09-10 9:39 ` fosslinux
` (6 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-09-10 8:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-690070729
Comment:
I've updated the package to 0.0.22.
Should I close this PR and create a new one, as the version changed or would it be ok, if I just changed the commit message and PR's title?
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (40 preceding siblings ...)
2020-09-10 8:12 ` MGlolenstine
@ 2020-09-10 9:39 ` fosslinux
2020-09-10 9:40 ` MGlolenstine
` (5 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: fosslinux @ 2020-09-10 9:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-690116231
Comment:
No, you should just change the commit message and the title.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (41 preceding siblings ...)
2020-09-10 9:39 ` fosslinux
@ 2020-09-10 9:40 ` MGlolenstine
2020-09-10 9:43 ` [PR PATCH] [Updated] " MGlolenstine
` (4 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-09-10 9:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-690116845
Comment:
Should commit message contain every change or just the "discord-ptb: update to 0.0.22"?
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Updated] discord-ptb: update to 0.0.21
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (42 preceding siblings ...)
2020-09-10 9:40 ` MGlolenstine
@ 2020-09-10 9:43 ` MGlolenstine
2020-09-10 10:57 ` discord-ptb: update to 0.0.22 fosslinux
` (3 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-09-10 9:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by MGlolenstine against master on the void-packages repository
https://github.com/MGlolenstine/void-packages discord-ptb
https://github.com/void-linux/void-packages/pull/24117
discord-ptb: update to 0.0.21
A patch file from https://github.com/void-linux/void-packages/pull/24117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discord-ptb-24117.patch --]
[-- Type: text/x-diff, Size: 2539 bytes --]
From 1ccbdced5b7cb8ca235d28cf0cd1f91f186a813e Mon Sep 17 00:00:00 2001
From: MGlolenstine <mglolenstine@gmail.com>
Date: Fri, 7 Aug 2020 00:21:03 +0200
Subject: [PATCH] discord-ptb: update to 0.0.22
---
srcpkgs/discord-ptb/template | 38 ++++++++++++++++++++++++++----------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index 0485c222023..867ba7e5dca 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,19 +1,32 @@
# Template file for 'discord-ptb'
-pkgname="discord-ptb"
-version=0.0.9
+pkgname=discord-ptb
+version=0.0.22
revision=1
+archs="x86_64"
wrksrc="DiscordPTB"
+hostmakedepends="w3m"
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 <abel@abelgraham.com>"
-license="proprietary"
-homepage="https://discordapp.com/"
+license="custom:Proprietary"
+homepage="https://discord.com/"
distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=372d6f75203626370218c97c21519b779e5af334177cafa65a5655e357c77520
+checksum=3225e1f1c96e781566ece413968dcc8fb5cad6aa5ec5830f36349e9622821e1b
+_license_checksum=9abbd207c86f76a59c0017c131dc7a30089c40b4dacb54a0f339272468344e1e
+nopie=yes
+restricted=yes
+repository=nonfree
+
+post_extract() {
+ $XBPS_FETCH_CMD -o eula https://discord.com/terms; cat eula |
+ w3m -dump -I utf-8 -T text/html |
+ sed -n '/Discord Terms of Service/,/^Your place to talk$/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
@@ -22,9 +35,14 @@ 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
+
+ vlicense EULA
}
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.22
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (43 preceding siblings ...)
2020-09-10 9:43 ` [PR PATCH] [Updated] " MGlolenstine
@ 2020-09-10 10:57 ` fosslinux
2020-09-11 18:15 ` Chocimier
` (2 subsequent siblings)
47 siblings, 0 replies; 49+ messages in thread
From: fosslinux @ 2020-09-10 10:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-690155501
Comment:
How you have it now is correct.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.22
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (44 preceding siblings ...)
2020-09-10 10:57 ` discord-ptb: update to 0.0.22 fosslinux
@ 2020-09-11 18:15 ` Chocimier
2020-09-12 13:25 ` MGlolenstine
2020-09-12 13:36 ` [PR PATCH] [Merged]: " Chocimier
47 siblings, 0 replies; 49+ messages in thread
From: Chocimier @ 2020-09-11 18:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-691242010
Comment:
@MGlolenstine Do you run this updated 0.0.22 version? Is everything ok?
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: discord-ptb: update to 0.0.22
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (45 preceding siblings ...)
2020-09-11 18:15 ` Chocimier
@ 2020-09-12 13:25 ` MGlolenstine
2020-09-12 13:36 ` [PR PATCH] [Merged]: " Chocimier
47 siblings, 0 replies; 49+ messages in thread
From: MGlolenstine @ 2020-09-12 13:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
New comment by MGlolenstine on void-packages repository
https://github.com/void-linux/void-packages/pull/24117#issuecomment-691487560
Comment:
@Chocimier Correct, I've updated it because I needed it for my laptop. I'm running it and it's working perfectly fine.
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PR PATCH] [Merged]: discord-ptb: update to 0.0.22
2020-08-06 22:28 [PR PATCH] discord-ptb: update to 0.0.21 MGlolenstine
` (46 preceding siblings ...)
2020-09-12 13:25 ` MGlolenstine
@ 2020-09-12 13:36 ` Chocimier
47 siblings, 0 replies; 49+ messages in thread
From: Chocimier @ 2020-09-12 13:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
There's a merged pull request on the void-packages repository
discord-ptb: update to 0.0.22
https://github.com/void-linux/void-packages/pull/24117
Description:
^ permalink raw reply [flat|nested] 49+ messages in thread