From 6d5437d3af3c7be529b0c959810483b53a9f9aea Mon Sep 17 00:00:00 2001 From: Zoddo Date: Thu, 15 May 2025 23:48:43 +0200 Subject: [PATCH 1/4] upgpkg: discord 0.0.94-2: Upgrade again to electron36 with workaround for GTK bug Until the bug is fixed upstream, we force Discord to run on gtk3, as per the recommendation in the upstream issue: https://github.com/electron/electron/issues/46538#issuecomment-2790356082 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- discord-launcher.sh | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f3738a1..e599a01 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord_arch_electron - pkgdesc = Discord using system provided electron35 for increased security and performance + pkgdesc = Discord using system provided electron for increased security and performance pkgver = 0.0.94 - pkgrel = 1 + pkgrel = 2 epoch = 1 url = https://discord.com install = discord_arch_electron.install @@ -9,7 +9,7 @@ pkgbase = discord_arch_electron license = custom makedepends = asar makedepends = curl - depends = electron35 + depends = electron depends = libxss optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support @@ -23,7 +23,7 @@ pkgbase = discord_arch_electron source = discord-launcher.sh source = krisp-patcher.py sha512sums = de51af7e74a0e50f826719b37bd11dfdc82792266d8284fba050019a5993474149631a1a5a8fa4e061741e613ae2fd78ab6b50f4768d993281ee132fa60c0ec5 - sha512sums = e11a60419c6ee5944aefc1ac16a5b496518fae626627d37a5bf636975bd21b1d9b6118ec3f44e7f4283befe5fa14737ad28dc38d975967789247ac0e66c352f3 + sha512sums = f15a31adefac63914cf26a2404f706e7ccaa1b08a150eb3b20d8b21612f1a4be7d851f0150ea01d0425ce4a260cc3ae2483453f42b42a00e79123433ce43f722 sha512sums = 42cef68c1f7d574b4fbe859a4dc616e8994c7d16f62bcae3ff1f88e1edc58ac37b39c238d7defa9c97ceda417fcd6224cf0a0fd2608b8d18d0877e3c1befa59c pkgname = discord_arch_electron diff --git a/PKGBUILD b/PKGBUILD index 708c9f4..86b00d7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,10 +7,10 @@ # Based off the discord community repo PKGBUILD by Filipe Laíns (FFY00) _pkgname=discord -_electron=electron35 +_electron=electron pkgname=${_pkgname}_arch_electron pkgver=0.0.94 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Discord using system provided ${_electron} for increased security and performance" arch=('any') @@ -31,7 +31,7 @@ source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.ta 'discord-launcher.sh' 'krisp-patcher.py') # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py sha512sums=('de51af7e74a0e50f826719b37bd11dfdc82792266d8284fba050019a5993474149631a1a5a8fa4e061741e613ae2fd78ab6b50f4768d993281ee132fa60c0ec5' - 'e11a60419c6ee5944aefc1ac16a5b496518fae626627d37a5bf636975bd21b1d9b6118ec3f44e7f4283befe5fa14737ad28dc38d975967789247ac0e66c352f3' + 'f15a31adefac63914cf26a2404f706e7ccaa1b08a150eb3b20d8b21612f1a4be7d851f0150ea01d0425ce4a260cc3ae2483453f42b42a00e79123433ce43f722' '42cef68c1f7d574b4fbe859a4dc616e8994c7d16f62bcae3ff1f88e1edc58ac37b39c238d7defa9c97ceda417fcd6224cf0a0fd2608b8d18d0877e3c1befa59c') prepare() { diff --git a/discord-launcher.sh b/discord-launcher.sh index 02a3479..74adcb0 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -35,4 +35,5 @@ done exec /usr/bin/${electron} \ /usr/share/${name}/resources/app.asar \ --ozone-platform-hint=auto \ + --gtk-version=3 \ # Workaround for bug in electron36: https://github.com/electron/electron/issues/46538#issuecomment-2790356082 "${flags[@]}" "$@" From 15fae0087e0087b28b5dd2df9c6ba46c88918dba Mon Sep 17 00:00:00 2001 From: Zoddo Date: Fri, 16 May 2025 00:02:05 +0200 Subject: [PATCH 2/4] Remove libappindicator-gtk3 dependency which is no longer needed since electron22 https://gitlab.archlinux.org/archlinux/packaging/packages/electron/-/issues/2 --- .SRCINFO | 1 - PKGBUILD | 1 - 2 files changed, 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e599a01..4d6e940 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -12,7 +12,6 @@ pkgbase = discord_arch_electron depends = electron depends = libxss optdepends = libpulse: Pulseaudio support - optdepends = libappindicator-gtk3: Systray indicator support optdepends = xdg-utils: Open files optdepends = python-pyelftools: Required for Krisp patcher optdepends = python-capstone: Required for Krisp patcher diff --git a/PKGBUILD b/PKGBUILD index 86b00d7..cacc523 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -23,7 +23,6 @@ install="$pkgname.install" depends=("${_electron}" 'libxss') makedepends=('asar' 'curl') optdepends=('libpulse: Pulseaudio support' - 'libappindicator-gtk3: Systray indicator support' 'xdg-utils: Open files' 'python-pyelftools: Required for Krisp patcher' 'python-capstone: Required for Krisp patcher') From 2c75e61a9b9a66b4a190218eeb0cda2a243e957a Mon Sep 17 00:00:00 2001 From: Zoddo Date: Mon, 19 May 2025 21:44:39 +0200 Subject: [PATCH 3/4] upgpkg: discord 0.0.95 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4d6e940..fcb314d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord_arch_electron pkgdesc = Discord using system provided electron for increased security and performance - pkgver = 0.0.94 - pkgrel = 2 + pkgver = 0.0.95 + pkgrel = 1 epoch = 1 url = https://discord.com install = discord_arch_electron.install @@ -18,10 +18,10 @@ pkgbase = discord_arch_electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.94/discord-0.0.94.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.95/discord-0.0.95.tar.gz source = discord-launcher.sh source = krisp-patcher.py - sha512sums = de51af7e74a0e50f826719b37bd11dfdc82792266d8284fba050019a5993474149631a1a5a8fa4e061741e613ae2fd78ab6b50f4768d993281ee132fa60c0ec5 + sha512sums = 062125c0d331580f0bc7e34fb1b52926a2a3431e08939062738d2895a37e2836dad3e1f6a330d1d0fd3151859248061b3bf7da5ed4107932654ed44efbf57965 sha512sums = f15a31adefac63914cf26a2404f706e7ccaa1b08a150eb3b20d8b21612f1a4be7d851f0150ea01d0425ce4a260cc3ae2483453f42b42a00e79123433ce43f722 sha512sums = 42cef68c1f7d574b4fbe859a4dc616e8994c7d16f62bcae3ff1f88e1edc58ac37b39c238d7defa9c97ceda417fcd6224cf0a0fd2608b8d18d0877e3c1befa59c diff --git a/PKGBUILD b/PKGBUILD index cacc523..e660270 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,8 +9,8 @@ _pkgname=discord _electron=electron pkgname=${_pkgname}_arch_electron -pkgver=0.0.94 -pkgrel=2 +pkgver=0.0.95 +pkgrel=1 epoch=1 pkgdesc="Discord using system provided ${_electron} for increased security and performance" arch=('any') @@ -29,7 +29,7 @@ optdepends=('libpulse: Pulseaudio support' source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh' 'krisp-patcher.py') # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py -sha512sums=('de51af7e74a0e50f826719b37bd11dfdc82792266d8284fba050019a5993474149631a1a5a8fa4e061741e613ae2fd78ab6b50f4768d993281ee132fa60c0ec5' +sha512sums=('062125c0d331580f0bc7e34fb1b52926a2a3431e08939062738d2895a37e2836dad3e1f6a330d1d0fd3151859248061b3bf7da5ed4107932654ed44efbf57965' 'f15a31adefac63914cf26a2404f706e7ccaa1b08a150eb3b20d8b21612f1a4be7d851f0150ea01d0425ce4a260cc3ae2483453f42b42a00e79123433ce43f722' '42cef68c1f7d574b4fbe859a4dc616e8994c7d16f62bcae3ff1f88e1edc58ac37b39c238d7defa9c97ceda417fcd6224cf0a0fd2608b8d18d0877e3c1befa59c') From f638e986f5abca48efff47afda9ec30738743ece Mon Sep 17 00:00:00 2001 From: Zoddo Date: Mon, 2 Jun 2025 22:52:55 +0200 Subject: [PATCH 4/4] upgpkg: discord 0.0.96 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- discord-launcher.sh | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fcb314d..49ca5a8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord_arch_electron pkgdesc = Discord using system provided electron for increased security and performance - pkgver = 0.0.95 + pkgver = 0.0.96 pkgrel = 1 epoch = 1 url = https://discord.com @@ -18,11 +18,11 @@ pkgbase = discord_arch_electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.95/discord-0.0.95.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.96/discord-0.0.96.tar.gz source = discord-launcher.sh source = krisp-patcher.py - sha512sums = 062125c0d331580f0bc7e34fb1b52926a2a3431e08939062738d2895a37e2836dad3e1f6a330d1d0fd3151859248061b3bf7da5ed4107932654ed44efbf57965 - sha512sums = f15a31adefac63914cf26a2404f706e7ccaa1b08a150eb3b20d8b21612f1a4be7d851f0150ea01d0425ce4a260cc3ae2483453f42b42a00e79123433ce43f722 + sha512sums = 77d2fcd98ec9e6ac121eb56ddbe0dedb02211c79d69b345557c030b77f7666c7cb50900cb815a2868f6dbe70cfb3cb2467195404db78b3bb122e9d37baed75ec + sha512sums = e11a60419c6ee5944aefc1ac16a5b496518fae626627d37a5bf636975bd21b1d9b6118ec3f44e7f4283befe5fa14737ad28dc38d975967789247ac0e66c352f3 sha512sums = 42cef68c1f7d574b4fbe859a4dc616e8994c7d16f62bcae3ff1f88e1edc58ac37b39c238d7defa9c97ceda417fcd6224cf0a0fd2608b8d18d0877e3c1befa59c pkgname = discord_arch_electron diff --git a/PKGBUILD b/PKGBUILD index e660270..200dd1f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ _pkgname=discord _electron=electron pkgname=${_pkgname}_arch_electron -pkgver=0.0.95 +pkgver=0.0.96 pkgrel=1 epoch=1 pkgdesc="Discord using system provided ${_electron} for increased security and performance" @@ -29,8 +29,8 @@ optdepends=('libpulse: Pulseaudio support' source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh' 'krisp-patcher.py') # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py -sha512sums=('062125c0d331580f0bc7e34fb1b52926a2a3431e08939062738d2895a37e2836dad3e1f6a330d1d0fd3151859248061b3bf7da5ed4107932654ed44efbf57965' - 'f15a31adefac63914cf26a2404f706e7ccaa1b08a150eb3b20d8b21612f1a4be7d851f0150ea01d0425ce4a260cc3ae2483453f42b42a00e79123433ce43f722' +sha512sums=('77d2fcd98ec9e6ac121eb56ddbe0dedb02211c79d69b345557c030b77f7666c7cb50900cb815a2868f6dbe70cfb3cb2467195404db78b3bb122e9d37baed75ec' + 'e11a60419c6ee5944aefc1ac16a5b496518fae626627d37a5bf636975bd21b1d9b6118ec3f44e7f4283befe5fa14737ad28dc38d975967789247ac0e66c352f3' '42cef68c1f7d574b4fbe859a4dc616e8994c7d16f62bcae3ff1f88e1edc58ac37b39c238d7defa9c97ceda417fcd6224cf0a0fd2608b8d18d0877e3c1befa59c') prepare() { diff --git a/discord-launcher.sh b/discord-launcher.sh index 74adcb0..02a3479 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -35,5 +35,4 @@ done exec /usr/bin/${electron} \ /usr/share/${name}/resources/app.asar \ --ozone-platform-hint=auto \ - --gtk-version=3 \ # Workaround for bug in electron36: https://github.com/electron/electron/issues/46538#issuecomment-2790356082 "${flags[@]}" "$@"