From cdaa321746964a215506d9dd91d7195aec03ad45 Mon Sep 17 00:00:00 2001 From: Zoddo Date: Mon, 25 Mar 2024 20:23:23 +0100 Subject: [PATCH 01/10] uppkg: discord 0.0.47 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 16e8592..fe1e048 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord_arch_electron pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance - pkgver = 0.0.46 + pkgver = 0.0.47 pkgrel = 1 url = https://discord.com arch = any @@ -13,11 +13,11 @@ pkgbase = discord_arch_electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.46/discord-0.0.46.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.47/discord-0.0.47.tar.gz source = discord-launcher.sh source = LICENSE.html::https://discord.com/terms source = OSS-LICENSES.html::https://discord.com/licenses - sha512sums = 7f88a1f5281beb5bcdb9741ae4d984ec71c09931f31c4265e15f63b5710baff0124b38421971e45e217e20d7de14e4b5ab9e0b7da6afc3eb8ff3456643f692e8 + sha512sums = da08bd801210d7194f8c5de1b43948e018dfccffc7685adbc28d0710351fbf9161f77ccb1e8c0c34b13d1955f53f8dd58f15470415b05d2e22057fe7ae73c703 sha512sums = d398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc sha512sums = SKIP sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index a208e7a..9c7f9ad 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=discord _electron=electron pkgname=${_pkgname}_arch_electron -pkgver=0.0.46 +pkgver=0.0.47 pkgrel=1 pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" arch=('any') @@ -23,7 +23,7 @@ source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" 'discord-launcher.sh' 'LICENSE.html::https://discord.com/terms' 'OSS-LICENSES.html::https://discord.com/licenses') -sha512sums=('7f88a1f5281beb5bcdb9741ae4d984ec71c09931f31c4265e15f63b5710baff0124b38421971e45e217e20d7de14e4b5ab9e0b7da6afc3eb8ff3456643f692e8' +sha512sums=('da08bd801210d7194f8c5de1b43948e018dfccffc7685adbc28d0710351fbf9161f77ccb1e8c0c34b13d1955f53f8dd58f15470415b05d2e22057fe7ae73c703' 'd398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc' SKIP SKIP) From 2e8c14312e2f6d45e5608a0258218b028a4ced34 Mon Sep 17 00:00:00 2001 From: Zoddo Date: Mon, 8 Apr 2024 21:24:01 +0200 Subject: [PATCH 02/10] uppkg: discord 0.0.48 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fe1e048..9f7ae18 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord_arch_electron pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance - pkgver = 0.0.47 + pkgver = 0.0.48 pkgrel = 1 url = https://discord.com arch = any @@ -13,11 +13,11 @@ pkgbase = discord_arch_electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.47/discord-0.0.47.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.48/discord-0.0.48.tar.gz source = discord-launcher.sh source = LICENSE.html::https://discord.com/terms source = OSS-LICENSES.html::https://discord.com/licenses - sha512sums = da08bd801210d7194f8c5de1b43948e018dfccffc7685adbc28d0710351fbf9161f77ccb1e8c0c34b13d1955f53f8dd58f15470415b05d2e22057fe7ae73c703 + sha512sums = 3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b sha512sums = d398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc sha512sums = SKIP sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 9c7f9ad..a95d6a7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=discord _electron=electron pkgname=${_pkgname}_arch_electron -pkgver=0.0.47 +pkgver=0.0.48 pkgrel=1 pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" arch=('any') @@ -23,7 +23,7 @@ source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" 'discord-launcher.sh' 'LICENSE.html::https://discord.com/terms' 'OSS-LICENSES.html::https://discord.com/licenses') -sha512sums=('da08bd801210d7194f8c5de1b43948e018dfccffc7685adbc28d0710351fbf9161f77ccb1e8c0c34b13d1955f53f8dd58f15470415b05d2e22057fe7ae73c703' +sha512sums=('3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b' 'd398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc' SKIP SKIP) From b8192ddf659da866894b19931d45103c2e779ef8 Mon Sep 17 00:00:00 2001 From: Zoddo Date: Tue, 9 Apr 2024 20:36:33 +0200 Subject: [PATCH 03/10] uppkg: discord 0.0.49 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9f7ae18..0dcc665 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord_arch_electron pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance - pkgver = 0.0.48 + pkgver = 0.0.49 pkgrel = 1 url = https://discord.com arch = any @@ -13,11 +13,11 @@ pkgbase = discord_arch_electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.48/discord-0.0.48.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.49/discord-0.0.49.tar.gz source = discord-launcher.sh source = LICENSE.html::https://discord.com/terms source = OSS-LICENSES.html::https://discord.com/licenses - sha512sums = 3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b + sha512sums = b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce sha512sums = d398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc sha512sums = SKIP sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index a95d6a7..ce81681 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=discord _electron=electron pkgname=${_pkgname}_arch_electron -pkgver=0.0.48 +pkgver=0.0.49 pkgrel=1 pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" arch=('any') @@ -23,7 +23,7 @@ source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" 'discord-launcher.sh' 'LICENSE.html::https://discord.com/terms' 'OSS-LICENSES.html::https://discord.com/licenses') -sha512sums=('3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b' +sha512sums=('b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce' 'd398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc' SKIP SKIP) From e39dfd8905399099441be1127a1c67b6d643b108 Mon Sep 17 00:00:00 2001 From: Zoddo Date: Tue, 16 Apr 2024 19:48:20 +0200 Subject: [PATCH 04/10] uppkg: discord 0.0.49-2: Revert to electron29 while segfaults with electron30 are being investigated --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0dcc665..05eff53 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,12 @@ pkgbase = discord_arch_electron pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance pkgver = 0.0.49 - pkgrel = 1 + pkgrel = 2 url = https://discord.com arch = any license = custom makedepends = asar - depends = electron + depends = electron29 depends = libxss optdepends = libpulse: Pulseaudio support optdepends = xdg-utils: Open files diff --git a/PKGBUILD b/PKGBUILD index ce81681..913a6bc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,10 +4,10 @@ # Contributor: johnnyapol # Based off the discord community repo PKGBUILD by Filipe Laíns (FFY00) _pkgname=discord -_electron=electron +_electron=electron29 pkgname=${_pkgname}_arch_electron pkgver=0.0.49 -pkgrel=1 +pkgrel=2 pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" arch=('any') provides=("${_pkgname}") From 0ef87eb9f58039ebcefe102afa4af4694fd5ade3 Mon Sep 17 00:00:00 2001 From: Zoddo Date: Tue, 16 Apr 2024 20:31:47 +0200 Subject: [PATCH 05/10] uppkg: discord 0.0.50 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 05eff53..f95b5f6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord_arch_electron pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance - pkgver = 0.0.49 - pkgrel = 2 + pkgver = 0.0.50 + pkgrel = 1 url = https://discord.com arch = any license = custom @@ -13,11 +13,11 @@ pkgbase = discord_arch_electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.49/discord-0.0.49.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.50/discord-0.0.50.tar.gz source = discord-launcher.sh source = LICENSE.html::https://discord.com/terms source = OSS-LICENSES.html::https://discord.com/licenses - sha512sums = b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce + sha512sums = 8e745436645ab8aa3fae582e125224b81c8556b74b40476ead337594f377fab95684a96287c53510d3838e948a64e0397f07ca8a76f6d99cd243af6a06080873 sha512sums = d398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc sha512sums = SKIP sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 913a6bc..9b5a860 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ _pkgname=discord _electron=electron29 pkgname=${_pkgname}_arch_electron -pkgver=0.0.49 -pkgrel=2 +pkgver=0.0.50 +pkgrel=1 pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" arch=('any') provides=("${_pkgname}") @@ -23,7 +23,7 @@ source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" 'discord-launcher.sh' 'LICENSE.html::https://discord.com/terms' 'OSS-LICENSES.html::https://discord.com/licenses') -sha512sums=('b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce' +sha512sums=('8e745436645ab8aa3fae582e125224b81c8556b74b40476ead337594f377fab95684a96287c53510d3838e948a64e0397f07ca8a76f6d99cd243af6a06080873' 'd398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc' SKIP SKIP) From 4db4404dbcd49f6ab801645e76a4dbc3c016f891 Mon Sep 17 00:00:00 2001 From: Zoddo Date: Tue, 23 Apr 2024 18:07:23 +0200 Subject: [PATCH 06/10] uppkg: discord 0.0.51 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f95b5f6..39bea99 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord_arch_electron pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance - pkgver = 0.0.50 + pkgver = 0.0.51 pkgrel = 1 url = https://discord.com arch = any @@ -13,11 +13,11 @@ pkgbase = discord_arch_electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.50/discord-0.0.50.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.51/discord-0.0.51.tar.gz source = discord-launcher.sh source = LICENSE.html::https://discord.com/terms source = OSS-LICENSES.html::https://discord.com/licenses - sha512sums = 8e745436645ab8aa3fae582e125224b81c8556b74b40476ead337594f377fab95684a96287c53510d3838e948a64e0397f07ca8a76f6d99cd243af6a06080873 + sha512sums = b98072a64cfb593176e7e057b926fcf2d9e1a4aa555a659cebb8abe20fe463ff135a8028fd0fc36dc6c1bd40235da98c7c055c372e707cae00b882c8b0462dd9 sha512sums = d398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc sha512sums = SKIP sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 9b5a860..8de6879 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=discord _electron=electron29 pkgname=${_pkgname}_arch_electron -pkgver=0.0.50 +pkgver=0.0.51 pkgrel=1 pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" arch=('any') @@ -23,7 +23,7 @@ source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" 'discord-launcher.sh' 'LICENSE.html::https://discord.com/terms' 'OSS-LICENSES.html::https://discord.com/licenses') -sha512sums=('8e745436645ab8aa3fae582e125224b81c8556b74b40476ead337594f377fab95684a96287c53510d3838e948a64e0397f07ca8a76f6d99cd243af6a06080873' +sha512sums=('b98072a64cfb593176e7e057b926fcf2d9e1a4aa555a659cebb8abe20fe463ff135a8028fd0fc36dc6c1bd40235da98c7c055c372e707cae00b882c8b0462dd9' 'd398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc' SKIP SKIP) From 82a5c336060d6ffb200bff697983e9afa7fce981 Mon Sep 17 00:00:00 2001 From: Zoddo Date: Mon, 29 Apr 2024 23:27:44 +0200 Subject: [PATCH 07/10] uppkg: discord 0.0.52 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 39bea99..59aeb39 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord_arch_electron pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance - pkgver = 0.0.51 + pkgver = 0.0.52 pkgrel = 1 url = https://discord.com arch = any @@ -13,11 +13,11 @@ pkgbase = discord_arch_electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.51/discord-0.0.51.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.52/discord-0.0.52.tar.gz source = discord-launcher.sh source = LICENSE.html::https://discord.com/terms source = OSS-LICENSES.html::https://discord.com/licenses - sha512sums = b98072a64cfb593176e7e057b926fcf2d9e1a4aa555a659cebb8abe20fe463ff135a8028fd0fc36dc6c1bd40235da98c7c055c372e707cae00b882c8b0462dd9 + sha512sums = 42ff4b59a0dd846f06a297a1a8b5a1e28f37daa6951b4ce597d103492458c5ae90f69545908cd41238c5ed91b249ad2dd9b9cec3ef4feeb9ad22245c692eaa72 sha512sums = d398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc sha512sums = SKIP sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 8de6879..7a27fc5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=discord _electron=electron29 pkgname=${_pkgname}_arch_electron -pkgver=0.0.51 +pkgver=0.0.52 pkgrel=1 pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" arch=('any') @@ -23,7 +23,7 @@ source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" 'discord-launcher.sh' 'LICENSE.html::https://discord.com/terms' 'OSS-LICENSES.html::https://discord.com/licenses') -sha512sums=('b98072a64cfb593176e7e057b926fcf2d9e1a4aa555a659cebb8abe20fe463ff135a8028fd0fc36dc6c1bd40235da98c7c055c372e707cae00b882c8b0462dd9' +sha512sums=('42ff4b59a0dd846f06a297a1a8b5a1e28f37daa6951b4ce597d103492458c5ae90f69545908cd41238c5ed91b249ad2dd9b9cec3ef4feeb9ad22245c692eaa72' 'd398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc' SKIP SKIP) From 9c7aa51866966db3d1e15f3764d11d38586534a4 Mon Sep 17 00:00:00 2001 From: Zoddo Date: Mon, 6 May 2024 21:00:48 +0200 Subject: [PATCH 08/10] uppkg: discord 0.0.53 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 59aeb39..93ca7b0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord_arch_electron pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance - pkgver = 0.0.52 + pkgver = 0.0.53 pkgrel = 1 url = https://discord.com arch = any @@ -13,11 +13,11 @@ pkgbase = discord_arch_electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.52/discord-0.0.52.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.53/discord-0.0.53.tar.gz source = discord-launcher.sh source = LICENSE.html::https://discord.com/terms source = OSS-LICENSES.html::https://discord.com/licenses - sha512sums = 42ff4b59a0dd846f06a297a1a8b5a1e28f37daa6951b4ce597d103492458c5ae90f69545908cd41238c5ed91b249ad2dd9b9cec3ef4feeb9ad22245c692eaa72 + sha512sums = dfc92d477397324383a4656a770c0aac153527002b07bac56ec5e3947443f2ab6d0958b2c508d6cf5ed2ecaff83b64616387b7a2459d340b438c3d73ab0f6f83 sha512sums = d398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc sha512sums = SKIP sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 7a27fc5..f587a06 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=discord _electron=electron29 pkgname=${_pkgname}_arch_electron -pkgver=0.0.52 +pkgver=0.0.53 pkgrel=1 pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" arch=('any') @@ -23,7 +23,7 @@ source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" 'discord-launcher.sh' 'LICENSE.html::https://discord.com/terms' 'OSS-LICENSES.html::https://discord.com/licenses') -sha512sums=('42ff4b59a0dd846f06a297a1a8b5a1e28f37daa6951b4ce597d103492458c5ae90f69545908cd41238c5ed91b249ad2dd9b9cec3ef4feeb9ad22245c692eaa72' +sha512sums=('dfc92d477397324383a4656a770c0aac153527002b07bac56ec5e3947443f2ab6d0958b2c508d6cf5ed2ecaff83b64616387b7a2459d340b438c3d73ab0f6f83' 'd398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc' SKIP SKIP) From 2b972808d29f686bcb1127dbf1670837cc0ce028 Mon Sep 17 00:00:00 2001 From: Zoddo Date: Tue, 14 May 2024 00:36:32 +0200 Subject: [PATCH 09/10] uppkg: discord 0.0.54 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 93ca7b0..e0ee6c6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord_arch_electron pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance - pkgver = 0.0.53 + pkgver = 0.0.54 pkgrel = 1 url = https://discord.com arch = any @@ -13,11 +13,11 @@ pkgbase = discord_arch_electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.53/discord-0.0.53.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.54/discord-0.0.54.tar.gz source = discord-launcher.sh source = LICENSE.html::https://discord.com/terms source = OSS-LICENSES.html::https://discord.com/licenses - sha512sums = dfc92d477397324383a4656a770c0aac153527002b07bac56ec5e3947443f2ab6d0958b2c508d6cf5ed2ecaff83b64616387b7a2459d340b438c3d73ab0f6f83 + sha512sums = ceb6265e846fafd27e3c2941f00f0a2d4e045abe5471a2691b070bedb330ef345edee838a706b27ff65ecce40aec46b1a1dd9c4bb9763dadaa907ec181c1a222 sha512sums = d398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc sha512sums = SKIP sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index f587a06..186d4f2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=discord _electron=electron29 pkgname=${_pkgname}_arch_electron -pkgver=0.0.53 +pkgver=0.0.54 pkgrel=1 pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" arch=('any') @@ -23,7 +23,7 @@ source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" 'discord-launcher.sh' 'LICENSE.html::https://discord.com/terms' 'OSS-LICENSES.html::https://discord.com/licenses') -sha512sums=('dfc92d477397324383a4656a770c0aac153527002b07bac56ec5e3947443f2ab6d0958b2c508d6cf5ed2ecaff83b64616387b7a2459d340b438c3d73ab0f6f83' +sha512sums=('ceb6265e846fafd27e3c2941f00f0a2d4e045abe5471a2691b070bedb330ef345edee838a706b27ff65ecce40aec46b1a1dd9c4bb9763dadaa907ec181c1a222' 'd398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc' SKIP SKIP) From f1b9162b231d337476cb9ec048fa9bac9d43968d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 15 May 2024 19:42:02 +0200 Subject: [PATCH 10/10] upgpkg: discord 0.0.54-2: refactor, fix autostart, add deps, use wayland * Slightly refactor PKGBUILD * Fix autostart desktop file * Add optional dependency used in official arch package * Include patch to allow Krisp noise suppression support * Add install file to inform user about this change * Use Wayland instead of Xwayland in a Wayland session by setting Electron flag `ozone-platform-hint` to auto (default is X11) --- .SRCINFO | 9 ++-- PKGBUILD | 86 +++++++++++++++++++++++------------ discord-launcher.sh | 34 ++++++++++---- discord_arch_electron.install | 19 ++++++++ 4 files changed, 107 insertions(+), 41 deletions(-) create mode 100644 discord_arch_electron.install diff --git a/.SRCINFO b/.SRCINFO index e0ee6c6..fb82f2f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,15 +1,18 @@ pkgbase = discord_arch_electron - pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance + pkgdesc = Discord using system provided electron (v29) for increased security and performance pkgver = 0.0.54 - pkgrel = 1 + pkgrel = 2 url = https://discord.com + install = discord_arch_electron.install arch = any license = custom makedepends = asar depends = electron29 depends = libxss optdepends = libpulse: Pulseaudio support + optdepends = libappindicator-gtk3: Systray indicator support optdepends = xdg-utils: Open files + optdepends = rizin: Allow patching Krisp support provides = discord conflicts = discord options = !strip @@ -18,7 +21,7 @@ pkgbase = discord_arch_electron source = LICENSE.html::https://discord.com/terms source = OSS-LICENSES.html::https://discord.com/licenses sha512sums = ceb6265e846fafd27e3c2941f00f0a2d4e045abe5471a2691b070bedb330ef345edee838a706b27ff65ecce40aec46b1a1dd9c4bb9763dadaa907ec181c1a222 - sha512sums = d398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc + sha512sums = eb5043d09174b3e0dcb899ba5835e863ffdefe5f7e379ce4d01cfb7408a8727e7b0f58e405008f3d35c7675804fb051ee1517aa7ca20efc59610d9b93a664c35 sha512sums = SKIP sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 186d4f2..5583ebc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,60 +1,86 @@ # Maintainer: Zoddo # Contributor: Thaodan +# Contributor: Manuel Hüsers # Contributor: huyizheng # Contributor: johnnyapol + # Based off the discord community repo PKGBUILD by Filipe Laíns (FFY00) + _pkgname=discord -_electron=electron29 +_electronver=29 +_electronname="electron${_electronver}" pkgname=${_pkgname}_arch_electron pkgver=0.0.54 -pkgrel=1 -pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" +pkgrel=2 +pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" arch=('any') provides=("${_pkgname}") conflicts=("${_pkgname}") url='https://discord.com' license=('custom') -options=(!strip) -depends=("${_electron}" 'libxss') +options=('!strip') +install="$pkgname.install" +depends=("${_electronname}" 'libxss') makedepends=('asar') optdepends=('libpulse: Pulseaudio support' - 'xdg-utils: Open files') -source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" + 'libappindicator-gtk3: Systray indicator support' + 'xdg-utils: Open files' + 'rizin: Allow patching Krisp support') +source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh' 'LICENSE.html::https://discord.com/terms' 'OSS-LICENSES.html::https://discord.com/licenses') sha512sums=('ceb6265e846fafd27e3c2941f00f0a2d4e045abe5471a2691b070bedb330ef345edee838a706b27ff65ecce40aec46b1a1dd9c4bb9763dadaa907ec181c1a222' - 'd398351b209cd89432d8e9cebe9122f152484236d8ca4dd91e5679d3853fe2f082625d35a9ac3f450f1f08250736bf3a23db9926311e8271730d884b57d12dbc' - SKIP - SKIP) + 'eb5043d09174b3e0dcb899ba5835e863ffdefe5f7e379ce4d01cfb7408a8727e7b0f58e405008f3d35c7675804fb051ee1517aa7ca20efc59610d9b93a664c35' + 'SKIP' + 'SKIP') + +_krisp_b2sum='c4e49b1a0be64cacd23474c5e474130084755f2de36af01686ce94c6eceea67426b6d6aa81889a418f9d08476476e99d63479b6131d1f7eaef987ecf4d779cf9' prepare() { - sed -i "s|@PKGNAME@|${_pkgname}|;s|@ELECTRON@|${_electron}|" discord-launcher.sh - sed -i "s|Exec=.*|Exec=/usr/bin/$_pkgname|" Discord/discord.desktop + # prepare launcher script + sed -i -e "s|@PKGNAME@|${_pkgname}|" \ + -e "s|@PKGVER@|${pkgver}|" \ + -e "s|@ELECTRON@|${_electronname}|" \ + -e "s|@KRISPB2@|${_krisp_b2sum}|" \ + discord-launcher.sh - # HACKS FOR SYSTEM ELECTRON - asar e Discord/resources/app.asar Discord/resources/app - rm Discord/resources/app.asar - sed -i "s|process.resourcesPath|'/usr/share/${_pkgname}/resources'|" Discord/resources/app/app_bootstrap/buildInfo.js - sed -i "s|exeDir,|'/usr/share/pixmaps',|" Discord/resources/app/app_bootstrap/autoStart/linux.js - sed -i -E "s|resourcesPath = _path.+;|resourcesPath = '/usr/share/${_pkgname}/resources';|" Discord/resources/app/common/paths.js - asar p Discord/resources/app Discord/resources/app.asar - rm -rf Discord/resources/app + # fix the .desktop file + sed -i -e "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" ${_pkgname^}/$_pkgname.desktop +} + +build() { + cd "${srcdir}"/${_pkgname^} + + # use system electron + asar e resources/app.asar resources/app + rm resources/app.asar + sed -i -e "s|resourcesPath = _path.*;|resourcesPath = '/usr/share/${_pkgname}/resources';|" resources/app/common/paths.js + sed -i -e "s|process.resourcesPath|'/usr/share/${_pkgname}/resources'|" resources/app/app_bootstrap/buildInfo.js + sed -i -e "/^const appName/d" -e "/^const exePath/d" -e "/^const exeDir/d" -e "/^const iconPath/d" \ + -e "s|^Exec=\${exePath}$|Exec=/usr/bin/${_pkgname}|" \ + -e "s|^Name=\${appName}$|Name=${_pkgname^}|" \ + -e "s|^Icon=\${iconPath}$|Icon=/usr/share/pixmaps/${_pkgname}.png|" \ + resources/app/app_bootstrap/autoStart/linux.js + asar p resources/app resources/app.asar + rm -rf resources/app } package() { - # Install the app - install -d "${pkgdir}/usr/share/${_pkgname}/resources" + # create necessary directories + install -d "${pkgdir}"/usr/share/$_pkgname - # Copy Relevanat data - cp -r Discord/resources/* "${pkgdir}/usr/share/${_pkgname}/resources/" + # copy relevant data + cp -r ${_pkgname^}/resources "${pkgdir}"/usr/share/$_pkgname/ - install -Dm 755 "${srcdir}/discord-launcher.sh" "${pkgdir}/usr/bin/${_pkgname}" + # intall icon and desktop file + install -Dm 644 ${_pkgname^}/$_pkgname.png "${pkgdir}"/usr/share/pixmaps/$_pkgname.png + install -Dm 644 ${_pkgname^}/$_pkgname.desktop "${pkgdir}"/usr/share/applications/$_pkgname.desktop - install -Dm 644 Discord/discord.png "${pkgdir}/usr/share/pixmaps/${_pkgname}.png" - install -Dm 644 Discord/discord.desktop "${pkgdir}/usr/share/applications/${_pkgname}.desktop" + # install the launch script + install -Dm 755 discord-launcher.sh "${pkgdir}"/usr/bin/$_pkgname - # Licenses - install -Dm 644 LICENSE.html "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.html - install -Dm 644 OSS-LICENSES.html "$pkgdir"/usr/share/licenses/$pkgname/OSS-LICENSES.html + # install licenses + install -Dm 644 LICENSE.html "${pkgdir}"/usr/share/licenses/$_pkgname/LICENSE.html + install -Dm 644 OSS-LICENSES.html "${pkgdir}"/usr/share/licenses/$_pkgname/OSS-LICENSES.html } diff --git a/discord-launcher.sh b/discord-launcher.sh index 6e6f47e..a398944 100755 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -1,21 +1,39 @@ -#!/usr/bin/bash +#!/usr/bin/env bash set -euo pipefail name=@PKGNAME@ +ver=@PKGVER@ electron=@ELECTRON@ -flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/${name}-flags.conf" +krisp_b2=@KRISPB2@ declare -a flags +declare PATCH_KRISP -if [[ -f "${flags_file}" ]]; then - mapfile -t < "${flags_file}" +[[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/${name}.conf" ]] && source "${XDG_CONFIG_HOME:-$HOME/.config}/${name}.conf" + +flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/${name}-flags.conf" +krisp_bin="${DISCORD_USER_DATA_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/${name}}/${ver}/modules/${name}_krisp/${name}_krisp.node" + +if hash rizin &> /dev/null && [[ "${PATCH_KRISP}" == true ]]; then + # Patch Krisp binary to ignore signature check + if [[ -w "${krisp_bin}" && $(b2sum "${krisp_bin}" | head -c 128) == $krisp_b2 ]]; then + addr=$(rz-find -x '4881ec00010000' "${krisp_bin}" | head -n1) + rizin -q -w -c "s $addr + 0x30 ; wao nop" "${krisp_bin}" &> /dev/null + fi +fi + +if [[ -r "${flags_file}" ]]; then + mapfile -t < "${flags_file}" fi for line in "${MAPFILE[@]}"; do - if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then - flags+=("${line}") - fi + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then + flags+=("${line}") + fi done -exec /usr/bin/${electron} /usr/share/${name}/resources/app.asar "${flags[@]}" "$@" +exec /usr/bin/${electron} \ + /usr/share/${name}/resources/app.asar \ + --ozone-platform-hint=auto \ + "${flags[@]}" "$@" diff --git a/discord_arch_electron.install b/discord_arch_electron.install new file mode 100644 index 0000000..a2c4dbf --- /dev/null +++ b/discord_arch_electron.install @@ -0,0 +1,19 @@ +post_upgrade() { + # return if old package version is greater than or equal to 0.0.54-2... + (( $(vercmp $2 '0.0.54-2') >= 0 )) && return + + cat < In order to patch Krisp noise suppression support set 'PATCH_KRISP=true' + in '~/.config/discord.conf' in addition to having 'rizin' installed. +EOF +} + +post_install() { + cat < For Krisp noise suppression support consider installing 'rizin' and + setting 'PATCH_KRISP=true' in '~/.config/discord.conf'. Restart your + Discord client afterwards to apply the patch. +==> In case of performance problems consider setting additional flags + in '~/.config/discord-flags.conf'. +EOF +}