From cdb3c4c5214dbe2cb11c8efa09c9fb05c745603b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 3 Apr 2023 08:32:00 +0200 Subject: [PATCH 01/41] Rename package to discord-electron, PKGBUILD refactor --- .SRCINFO | 27 ++++------- .gitignore | 6 --- PKGBUILD | 132 ++++++++++++++++++++++++++++++++++------------------- discord.sh | 2 - 4 files changed, 95 insertions(+), 72 deletions(-) delete mode 100644 .gitignore delete mode 100644 discord.sh diff --git a/.SRCINFO b/.SRCINFO index 0b75bf1..3eb5b1c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,27 +1,20 @@ pkgbase = discord-electron - pkgdesc = All-in-one voice and text chat for gamers that's free and secure. - pkgver = 0.0.15 + pkgdesc = Discord using system provided electron (v22) for increased security and performance + pkgver = 0.0.26 pkgrel = 1 - url = https://discordapp.com + url = https://discord.com arch = x86_64 license = custom makedepends = asar - depends = electron - depends = libnotify - depends = libxss - depends = nspr - depends = nss - depends = gtk3 + makedepends = curl + makedepends = python-html2text + depends = electron22 optdepends = libpulse: Pulseaudio support optdepends = xdg-utils: Open files + provides = discord conflicts = discord - source = https://dl.discordapp.net/apps/linux/0.0.15/discord-0.0.15.tar.gz - source = discord.sh - source = LICENSE.html::https://discordapp.com/terms - source = OSS-LICENSES.html::https://discordapp.com/licenses - sha512sums = 4f220ecd0e0c9fcd793ed065055479391506d9401b75ca541cde4136d0290f2720fccca87139091faf269fdb2c020adb5b7333710a31ca603ce8552f3dd4841b - sha512sums = b5fe7bfd31ae1867f3392605bd52ac155c6c02c4a2a132419d9806c08e61715461818919c2e480ba8e7f14b51aefcd588dcaa247f15d24286e177e45f43e17f9 - sha512sums = 6a2ebf7aadf06ba804c1c6f10677a014b2b9eb17a2bb34538426bf4c76686c4c11976bd682610965535f7a5d4a2f6b36dfa5aa875578defef1213ed866acb530 - sha512sums = f6d46b7a2dd6c8475625a988f36419788ab90149317c9a4e5e8ffea8613f27d0746c1557467332770c033349abd370bf721990ecadc383b4aee63cb8b74a280c + options = !strip + source = https://dl.discordapp.net/apps/linux/0.0.26/discord-0.0.26.tar.gz + sha512sums = 65477c2c033f30850a699706a6502ff4f4af8838185716d968d641fdab3033555139b04bf91a111a847aca14113e33ba6248d49ba317fd43cbacb099e974117b pkgname = discord-electron diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 11fb5a8..0000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -pkg -src -*.tar.gz -*.pkg.tar.zst -LICENSE.html -OSS-LICENSES.html diff --git a/PKGBUILD b/PKGBUILD index 77301fa..3e5f331 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,65 +1,103 @@ -# Maintainer: Dušan Simić +# Maintainer: Manuel Hüsers +# Contributor: Stick +# Contributor: johnnyapol +# Contributor: huyizheng +# Contributor: Filipe Laíns (FFY00) +# Contributor: Morgan + +# Based off the discord_arch_electron_wayland PKGBUILD from Stick +# Based off the discord_arch_electron PKGBUILD from johnnyapol and huyizheng +# Based off the discord community repo PKGBUILD by Filipe Laíns (FFY00) -_electron=electron pkgname=discord-electron _pkgname=discord -_Pkgname=Discord -pkgver=0.0.15 +_electron=22 +pkgver=0.0.26 pkgrel=1 -pkgdesc="All-in-one voice and text chat for gamers that's free and secure." +pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') -url='https://discordapp.com' +provides=("${_pkgname}") +conflicts=("${_pkgname}") +url='https://discord.com' license=('custom') -depends=("$_electron" 'libnotify' 'libxss' 'nspr' 'nss' 'gtk3') -makedepends=('asar') -optdepends=('libpulse: Pulseaudio support' - 'xdg-utils: Open files') -conflicts=(discord) -source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" - 'discord.sh' - 'LICENSE.html::https://discordapp.com/terms' - 'OSS-LICENSES.html::https://discordapp.com/licenses') -sha512sums=('4f220ecd0e0c9fcd793ed065055479391506d9401b75ca541cde4136d0290f2720fccca87139091faf269fdb2c020adb5b7333710a31ca603ce8552f3dd4841b' - 'b5fe7bfd31ae1867f3392605bd52ac155c6c02c4a2a132419d9806c08e61715461818919c2e480ba8e7f14b51aefcd588dcaa247f15d24286e177e45f43e17f9' - '6a2ebf7aadf06ba804c1c6f10677a014b2b9eb17a2bb34538426bf4c76686c4c11976bd682610965535f7a5d4a2f6b36dfa5aa875578defef1213ed866acb530' - 'f6d46b7a2dd6c8475625a988f36419788ab90149317c9a4e5e8ffea8613f27d0746c1557467332770c033349abd370bf721990ecadc383b4aee63cb8b74a280c') +options=('!strip') +depends=("electron${_electron}") +makedepends=('asar' 'curl' 'python-html2text') +optdepends=( + 'libpulse: Pulseaudio support' + 'xdg-utils: Open files' +) +source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz") +sha512sums=('65477c2c033f30850a699706a6502ff4f4af8838185716d968d641fdab3033555139b04bf91a111a847aca14113e33ba6248d49ba317fd43cbacb099e974117b') prepare() { - cd "$_Pkgname" + # create launcher script + cat >> "${srcdir}"/discord-launcher.sh <> "$_pkgname.desktop" +if [ "\$XDG_SESSION_TYPE" = wayland ]; then + # Using wayland + exec electron${_electron} \\ + --enable-features=UseOzonePlatform \\ + --ozone-platform=wayland \\ + --enable-accelerated-mjpeg-decode \\ + --enable-accelerated-video \\ + --ignore-gpu-blacklist \\ + --enable-native-gpu-memory-buffers \\ + --enable-gpu-rasterization \\ + --enable-gpu \\ + --enable-features=WebRTCPipeWireCapturer \\ + /usr/lib/discord/app.asar \$@ +else + # Using x11 + exec electron${_electron} \\ + --enable-accelerated-mjpeg-decode \\ + --enable-accelerated-video \\ + --ignore-gpu-blacklist \\ + --enable-native-gpu-memory-buffers \\ + --enable-gpu-rasterization \\ + --enable-gpu \\ + /usr/lib/discord/app.asar \$@ +fi +EOF - # Change resource path in asar archive - asar extract resources/app.asar resources/app.asar.dest - sed -i "s|process\.resourcesPath|'/', 'opt', '$pkgname'|" resources/app.asar.dest/app_bootstrap/buildInfo.js - asar pack resources/app.asar.dest resources/app.asar - # Cleanup unpacked files - rm -r resources/app.asar.dest + # fix the .desktop file + sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop + echo 'Path=/usr/bin' >> Discord/$_pkgname.desktop - cd "$srcdir" - - # Set electron version in startup script - sed -i "s|@ELECTRON@|$_electron|" "$_pkgname.sh" + # create the license files + curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md + curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md } package() { - # Install the app - install -d "$pkgdir/opt/$pkgname" - cp -a "$_Pkgname/resources/." "$pkgdir/opt/$pkgname" + # create necessary directories + install -d "${pkgdir}"/usr/{lib/$_pkgname,bin} + install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname} - # Install startup script - install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$pkgname" - ln -s "/usr/bin/$pkgname" "$pkgdir/usr/bin/$_pkgname" + cd "${srcdir}/Discord" - # Install icon and desktop file - install -Dm644 "$_Pkgname/$_pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "$_Pkgname/$_pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + # use system electron + asar e resources/app.asar resources/app + rm resources/app.asar + sed -i "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" resources/app/app_bootstrap/buildInfo.js + sed -i "s|exeDir,|'/usr/share/pixmaps',|" resources/app/app_bootstrap/autoStart/linux.js + asar p resources/app resources/app.asar + rm -rf resources/app - # Licenses - install -Dm644 LICENSE.html "$pkgdir/usr/share/licenses/$pkgname/LICENSE.html" - install -Dm644 OSS-LICENSES.html "$pkgdir/usr/share/licenses/$pkgname/OSS-LICENSES.html" + # copy relevant data + cp -r resources/* "${pkgdir}"/usr/lib/$_pkgname/ + cp $_pkgname.png \ + "${pkgdir}"/usr/share/pixmaps/$_pkgname.png + cp $_pkgname.desktop \ + "${pkgdir}"/usr/share/applications/$_pkgname.desktop + + cd "${srcdir}" + + # install the launch script + install -Dm 755 discord-launcher.sh "${pkgdir}"/usr/bin/$_pkgname + + # install licenses + install -Dm 644 LICENSE.md "${pkgdir}"/usr/share/licenses/$_pkgname/ + install -Dm 644 OSS-LICENSES.md "${pkgdir}"/usr/share/licenses/$_pkgname/ } - diff --git a/discord.sh b/discord.sh deleted file mode 100644 index 87f5542..0000000 --- a/discord.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec @ELECTRON@ /opt/discord-electron/app.asar --disable-dev-mode "$@" From 3a61d93bdcf2ca5e920b00f7f332da00b4492152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sat, 29 Apr 2023 14:53:06 +0200 Subject: [PATCH 02/41] upgpkg: discord-electron 0.0.27-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3eb5b1c..9e5707f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v22) for increased security and performance - pkgver = 0.0.26 + pkgver = 0.0.27 pkgrel = 1 url = https://discord.com arch = x86_64 @@ -14,7 +14,7 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.26/discord-0.0.26.tar.gz - sha512sums = 65477c2c033f30850a699706a6502ff4f4af8838185716d968d641fdab3033555139b04bf91a111a847aca14113e33ba6248d49ba317fd43cbacb099e974117b + source = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz + sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 3e5f331..4dd62cd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=discord-electron _pkgname=discord _electron=22 -pkgver=0.0.26 +pkgver=0.0.27 pkgrel=1 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') @@ -28,7 +28,7 @@ optdepends=( 'xdg-utils: Open files' ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz") -sha512sums=('65477c2c033f30850a699706a6502ff4f4af8838185716d968d641fdab3033555139b04bf91a111a847aca14113e33ba6248d49ba317fd43cbacb099e974117b') +sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f') prepare() { # create launcher script From 8e5c1e134dfe60a637f321f1a2fbdaee264a7b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sat, 27 May 2023 20:10:10 +0200 Subject: [PATCH 03/41] upgpkg: discord-electron 0.0.27-2 Update Discord launcher script (Original by Zoddo) Add libxss as dependency to fix Discord corruption warning Add install script to notify user about discord-flags.conf Remove duplicate Path variable in .desktop file Update contributor list --- .SRCINFO | 6 ++++- PKGBUILD | 47 ++++++++++------------------------------ discord-electron.install | 18 +++++++++++++++ discord-launcher.sh | 28 ++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 36 deletions(-) create mode 100644 discord-electron.install create mode 100644 discord-launcher.sh diff --git a/.SRCINFO b/.SRCINFO index 9e5707f..9975a49 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,20 +1,24 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v22) for increased security and performance pkgver = 0.0.27 - pkgrel = 1 + pkgrel = 2 url = https://discord.com + install = discord-electron.install arch = x86_64 license = custom makedepends = asar makedepends = curl makedepends = python-html2text depends = electron22 + depends = libxss optdepends = libpulse: Pulseaudio support optdepends = xdg-utils: Open files provides = discord conflicts = discord options = !strip source = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz + source = discord-launcher.sh sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f + sha512sums = d8c531d23014611b1e9dfa2d268747ba601f647c2cbfc26c15c9eebcec6f9feb454d10c6f603b9938e8da568da3080372b14309e966e0d00c0e1284a14591a83 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 4dd62cd..7ed6943 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,6 @@ # Maintainer: Manuel Hüsers +# Contributor: Zoddo +# Contributor: Thaodan # Contributor: Stick # Contributor: johnnyapol # Contributor: huyizheng @@ -6,14 +8,14 @@ # Contributor: Morgan # Based off the discord_arch_electron_wayland PKGBUILD from Stick -# Based off the discord_arch_electron PKGBUILD from johnnyapol and huyizheng +# Based off the discord_arch_electron PKGBUILD from johnnyapol, huyizheng, Thaodan and Zoddo # Based off the discord community repo PKGBUILD by Filipe Laíns (FFY00) pkgname=discord-electron _pkgname=discord _electron=22 pkgver=0.0.27 -pkgrel=1 +pkgrel=2 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -21,49 +23,24 @@ conflicts=("${_pkgname}") url='https://discord.com' license=('custom') options=('!strip') -depends=("electron${_electron}") +install="$pkgname.install" +depends=("electron${_electron}" 'libxss') makedepends=('asar' 'curl' 'python-html2text') optdepends=( 'libpulse: Pulseaudio support' 'xdg-utils: Open files' ) -source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz") -sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f') +source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz" + 'discord-launcher.sh') +sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f' + 'd8c531d23014611b1e9dfa2d268747ba601f647c2cbfc26c15c9eebcec6f9feb454d10c6f603b9938e8da568da3080372b14309e966e0d00c0e1284a14591a83') prepare() { - # create launcher script - cat >> "${srcdir}"/discord-launcher.sh <> Discord/$_pkgname.desktop # create the license files curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md diff --git a/discord-electron.install b/discord-electron.install new file mode 100644 index 0000000..3947c77 --- /dev/null +++ b/discord-electron.install @@ -0,0 +1,18 @@ +post_upgrade() { + # return if old package version is greater than or equal to 0.0.27-2... + (( $(vercmp $2 '0.0.27-2') >= 0 )) && return + + cat < You can now add or uncomment additional Electron flags in + '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set) + +EOF +} + +post_install() { + cat < In case of performance problems consider adding or uncommenting Electron + flags in '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set) + +EOF +} diff --git a/discord-launcher.sh b/discord-launcher.sh new file mode 100644 index 0000000..398e61d --- /dev/null +++ b/discord-launcher.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +set -euo pipefail + +flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf" + +declare -a flags + +if [[ -f "${flags_file}" ]]; then + mapfile -t < "${flags_file}" +else + cat > "${flags_file}" < Date: Sat, 27 May 2023 21:55:10 +0200 Subject: [PATCH 04/41] upgpkg: discord-electron 0.0.27-3 Fix whitespace indentation in install file Replace ignore-gpu-blacklist with ignore-gpu-blocklist as the former does not work anymore --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- discord-electron.install | 4 ++-- discord-launcher.sh | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9975a49..09b64df 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v22) for increased security and performance pkgver = 0.0.27 - pkgrel = 2 + pkgrel = 3 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -19,6 +19,6 @@ pkgbase = discord-electron source = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz source = discord-launcher.sh sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f - sha512sums = d8c531d23014611b1e9dfa2d268747ba601f647c2cbfc26c15c9eebcec6f9feb454d10c6f603b9938e8da568da3080372b14309e966e0d00c0e1284a14591a83 + sha512sums = ad2c16b6fc539f4315755df10c969822a38879558badfbd2ff9bf53558e755a7b215ce7415e35d7f294539a971ebc5c283f9293b79891893d5f28cd441ca6279 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 7ed6943..217c477 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ pkgname=discord-electron _pkgname=discord _electron=22 pkgver=0.0.27 -pkgrel=2 +pkgrel=3 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -33,7 +33,7 @@ optdepends=( source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz" 'discord-launcher.sh') sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f' - 'd8c531d23014611b1e9dfa2d268747ba601f647c2cbfc26c15c9eebcec6f9feb454d10c6f603b9938e8da568da3080372b14309e966e0d00c0e1284a14591a83') + 'ad2c16b6fc539f4315755df10c969822a38879558badfbd2ff9bf53558e755a7b215ce7415e35d7f294539a971ebc5c283f9293b79891893d5f28cd441ca6279') prepare() { # prepare launcher and install script diff --git a/discord-electron.install b/discord-electron.install index 3947c77..797b262 100644 --- a/discord-electron.install +++ b/discord-electron.install @@ -4,7 +4,7 @@ post_upgrade() { cat < You can now add or uncomment additional Electron flags in - '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set) + '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set) EOF } @@ -12,7 +12,7 @@ EOF post_install() { cat < In case of performance problems consider adding or uncommenting Electron - flags in '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set) + flags in '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set) EOF } diff --git a/discord-launcher.sh b/discord-launcher.sh index 398e61d..492dac7 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -7,10 +7,11 @@ flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf" declare -a flags if [[ -f "${flags_file}" ]]; then + sed -i "s|--ignore-gpu-blacklist|--ignore-gpu-blocklist|" "${flags_file}" mapfile -t < "${flags_file}" else cat > "${flags_file}" < Date: Sun, 28 May 2023 23:55:25 +0200 Subject: [PATCH 05/41] upgpkg: discord-electron 0.0.27-4 Update launch script to not touch the flags file with sed on no match --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- discord-launcher.sh | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 09b64df..734d978 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v22) for increased security and performance pkgver = 0.0.27 - pkgrel = 3 + pkgrel = 4 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -19,6 +19,6 @@ pkgbase = discord-electron source = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz source = discord-launcher.sh sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f - sha512sums = ad2c16b6fc539f4315755df10c969822a38879558badfbd2ff9bf53558e755a7b215ce7415e35d7f294539a971ebc5c283f9293b79891893d5f28cd441ca6279 + sha512sums = 6337d1f40c9ac97f180862ed0bcf1ec6fb6d4ecf3cb215369550768a4a3600a9546c43f467855a77e95b0f314348a833de40f4284b5b8924d101b4a456b073f5 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 217c477..7cbd556 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ pkgname=discord-electron _pkgname=discord _electron=22 pkgver=0.0.27 -pkgrel=3 +pkgrel=4 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -33,7 +33,7 @@ optdepends=( source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz" 'discord-launcher.sh') sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f' - 'ad2c16b6fc539f4315755df10c969822a38879558badfbd2ff9bf53558e755a7b215ce7415e35d7f294539a971ebc5c283f9293b79891893d5f28cd441ca6279') + '6337d1f40c9ac97f180862ed0bcf1ec6fb6d4ecf3cb215369550768a4a3600a9546c43f467855a77e95b0f314348a833de40f4284b5b8924d101b4a456b073f5') prepare() { # prepare launcher and install script diff --git a/discord-launcher.sh b/discord-launcher.sh index 492dac7..42e6f82 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -7,7 +7,8 @@ flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf" declare -a flags if [[ -f "${flags_file}" ]]; then - sed -i "s|--ignore-gpu-blacklist|--ignore-gpu-blocklist|" "${flags_file}" + grep -q '\--ignore-gpu-blacklist' "${flags_file}" && \ + sed -i "s|--ignore-gpu-blacklist|--ignore-gpu-blocklist|" "${flags_file}" mapfile -t < "${flags_file}" else cat > "${flags_file}" < Date: Fri, 2 Jun 2023 21:52:11 +0200 Subject: [PATCH 06/41] upgpkg: discord-electron 0.0.27-5 Include rudimentary patch to allow Krisp noise suppression support --- .SRCINFO | 5 +++-- PKGBUILD | 11 +++++++---- discord-electron.install | 13 +++++++++++-- discord-launcher.sh | 12 +++++++++++- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 734d978..6e84783 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v22) for increased security and performance pkgver = 0.0.27 - pkgrel = 4 + pkgrel = 5 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -13,12 +13,13 @@ pkgbase = discord-electron depends = libxss optdepends = libpulse: Pulseaudio support optdepends = xdg-utils: Open files + optdepends = rizin: Allow patching Krisp support provides = discord conflicts = discord options = !strip source = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz source = discord-launcher.sh sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f - sha512sums = 6337d1f40c9ac97f180862ed0bcf1ec6fb6d4ecf3cb215369550768a4a3600a9546c43f467855a77e95b0f314348a833de40f4284b5b8924d101b4a456b073f5 + sha512sums = 1da218eb240901ed48c392c154d061b02024daeb02ee7d991cdbc97ecba30a6f06af25abb602880872d89dcc63a8cd4d149c12414086b081035938deff8fe26d pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 7cbd556..ac3a63d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ pkgname=discord-electron _pkgname=discord _electron=22 pkgver=0.0.27 -pkgrel=4 +pkgrel=5 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -29,15 +29,18 @@ makedepends=('asar' 'curl' 'python-html2text') optdepends=( 'libpulse: Pulseaudio support' 'xdg-utils: Open files' + 'rizin: Allow patching Krisp support' ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz" 'discord-launcher.sh') sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f' - '6337d1f40c9ac97f180862ed0bcf1ec6fb6d4ecf3cb215369550768a4a3600a9546c43f467855a77e95b0f314348a833de40f4284b5b8924d101b4a456b073f5') + '1da218eb240901ed48c392c154d061b02024daeb02ee7d991cdbc97ecba30a6f06af25abb602880872d89dcc63a8cd4d149c12414086b081035938deff8fe26d') + +_krisp_b2sum='592f55259500afc0d7fd334a10d3c1991fae05db870bf12437edc43cf693988195341f2cb827aba333c0e65fb4cb40dccfcc5d6a84dea4a1645f9563505b6496' prepare() { - # prepare launcher and install script - sed -i "s|@PKGNAME@|${_pkgname}|;s|@ELECTRON@|${_electron}|" discord-launcher.sh + # prepare launcher script + sed -i "s|@PKGNAME@|${_pkgname}|g;s|@PKGVER@|${_pkgver}|g;s|@ELECTRON@|${_electron}|g;s|@KRISPB2@|${_krisp_b2sum}|g" discord-launcher.sh # fix the .desktop file sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop diff --git a/discord-electron.install b/discord-electron.install index 797b262..5516bf2 100644 --- a/discord-electron.install +++ b/discord-electron.install @@ -1,18 +1,27 @@ post_upgrade() { + # return if old package version is greater than or equal to 0.0.27-5... + (( $(vercmp $2 '0.0.27-5') >= 0 )) && return + + cat < The launch script will now patch Krisp noise suppression support + if 'rizin' is installed. Restart your Discord client after update + to apply the patch +EOF + # return if old package version is greater than or equal to 0.0.27-2... (( $(vercmp $2 '0.0.27-2') >= 0 )) && return cat < You can now add or uncomment additional Electron flags in '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set) - EOF } post_install() { cat < For Krisp noise suppression support consider installing 'rizin'. Restart + your Discord client after installation or update to apply the patch ==> In case of performance problems consider adding or uncommenting Electron flags in '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set) - EOF } diff --git a/discord-launcher.sh b/discord-launcher.sh index 42e6f82..7e50f72 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -3,12 +3,22 @@ set -euo pipefail flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf" +krisp_bin="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@/@PKGVER@/modules/@PKGNAME@_krisp/@PKGNAME@_krisp.node" declare -a flags +if hash rizin &> /dev/null; then + # Patch Krisp binary to ignore signature check + if [[ -f "${krisp_bin}" && $(b2sum "${krisp_bin}" | head -c 128) == @KRISPB2@ ]]; then + addr=$(rz-find -x '4889dfe8........4889dfe8' "${krisp_bin}" | head -n1) + rizin -q -w -c "s $addr + 0x12 ; wao nop" "${krisp_bin}" &> /dev/null + fi +fi + if [[ -f "${flags_file}" ]]; then - grep -q '\--ignore-gpu-blacklist' "${flags_file}" && \ + if grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then sed -i "s|--ignore-gpu-blacklist|--ignore-gpu-blocklist|" "${flags_file}" + fi mapfile -t < "${flags_file}" else cat > "${flags_file}" < Date: Mon, 3 Jul 2023 22:56:16 +0200 Subject: [PATCH 07/41] upgpkg: discord-electron 0.0.27-6 Fix use of wrong pkgver variable (Thanks to @rsa) Unset not needed variables in launch script Rewording install file text --- .SRCINFO | 4 ++-- PKGBUILD | 6 +++--- discord-electron.install | 9 ++++----- discord-launcher.sh | 11 ++++++++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6e84783..0790f4b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v22) for increased security and performance pkgver = 0.0.27 - pkgrel = 5 + pkgrel = 6 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -20,6 +20,6 @@ pkgbase = discord-electron source = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz source = discord-launcher.sh sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f - sha512sums = 1da218eb240901ed48c392c154d061b02024daeb02ee7d991cdbc97ecba30a6f06af25abb602880872d89dcc63a8cd4d149c12414086b081035938deff8fe26d + sha512sums = 4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index ac3a63d..57b1983 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ pkgname=discord-electron _pkgname=discord _electron=22 pkgver=0.0.27 -pkgrel=5 +pkgrel=6 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -34,13 +34,13 @@ optdepends=( source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz" 'discord-launcher.sh') sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f' - '1da218eb240901ed48c392c154d061b02024daeb02ee7d991cdbc97ecba30a6f06af25abb602880872d89dcc63a8cd4d149c12414086b081035938deff8fe26d') + '4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0') _krisp_b2sum='592f55259500afc0d7fd334a10d3c1991fae05db870bf12437edc43cf693988195341f2cb827aba333c0e65fb4cb40dccfcc5d6a84dea4a1645f9563505b6496' prepare() { # prepare launcher script - sed -i "s|@PKGNAME@|${_pkgname}|g;s|@PKGVER@|${_pkgver}|g;s|@ELECTRON@|${_electron}|g;s|@KRISPB2@|${_krisp_b2sum}|g" discord-launcher.sh + sed -i "s|@PKGNAME@|${_pkgname}|g;s|@PKGVER@|${pkgver}|g;s|@ELECTRON@|${_electron}|g;s|@KRISPB2@|${_krisp_b2sum}|g" discord-launcher.sh # fix the .desktop file sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop diff --git a/discord-electron.install b/discord-electron.install index 5516bf2..3d13381 100644 --- a/discord-electron.install +++ b/discord-electron.install @@ -5,23 +5,22 @@ post_upgrade() { cat < The launch script will now patch Krisp noise suppression support if 'rizin' is installed. Restart your Discord client after update - to apply the patch + to apply the patch. EOF # return if old package version is greater than or equal to 0.0.27-2... (( $(vercmp $2 '0.0.27-2') >= 0 )) && return cat < You can now add or uncomment additional Electron flags in - '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set) +==> You can now set additional Electron flags in '~/.config/discord-flags.conf'. EOF } post_install() { cat < For Krisp noise suppression support consider installing 'rizin'. Restart - your Discord client after installation or update to apply the patch + your Discord client after installation or update to apply the patch. ==> In case of performance problems consider adding or uncommenting Electron - flags in '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set) + flags in '~/.config/discord-flags.conf'. EOF } diff --git a/discord-launcher.sh b/discord-launcher.sh index 7e50f72..898e51e 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -2,14 +2,16 @@ set -euo pipefail +declare -a flags + + flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf" krisp_bin="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@/@PKGVER@/modules/@PKGNAME@_krisp/@PKGNAME@_krisp.node" - -declare -a flags +krisp_b2=@KRISPB2@ if hash rizin &> /dev/null; then # Patch Krisp binary to ignore signature check - if [[ -f "${krisp_bin}" && $(b2sum "${krisp_bin}" | head -c 128) == @KRISPB2@ ]]; then + if [[ -f "${krisp_bin}" && $(b2sum "${krisp_bin}" | head -c 128) == $krisp_b2 ]]; then addr=$(rz-find -x '4889dfe8........4889dfe8' "${krisp_bin}" | head -n1) rizin -q -w -c "s $addr + 0x12 ; wao nop" "${krisp_bin}" &> /dev/null fi @@ -34,6 +36,9 @@ for line in "${MAPFILE[@]}"; do fi done +unset flags_file krisp_bin krisp_b2 + + exec /usr/bin/electron@ELECTRON@ \ /usr/lib/@PKGNAME@/app.asar \ --ozone-platform-hint=auto \ From 7012eb240650d91d1e3c2b37ae4e524278a7f473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Fri, 7 Jul 2023 22:58:39 +0200 Subject: [PATCH 08/41] upgpkg: discord-electron 0.0.27-7 Update optdepends --- .SRCINFO | 3 ++- PKGBUILD | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0790f4b..3253d47 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v22) for increased security and performance pkgver = 0.0.27 - pkgrel = 6 + pkgrel = 7 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -12,6 +12,7 @@ pkgbase = discord-electron depends = electron22 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 diff --git a/PKGBUILD b/PKGBUILD index 57b1983..6daa64b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ pkgname=discord-electron _pkgname=discord _electron=22 pkgver=0.0.27 -pkgrel=6 +pkgrel=7 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -28,6 +28,7 @@ depends=("electron${_electron}" 'libxss') makedepends=('asar' 'curl' 'python-html2text') optdepends=( 'libpulse: Pulseaudio support' + 'libappindicator-gtk3: Systray indicator support' 'xdg-utils: Open files' 'rizin: Allow patching Krisp support' ) From f5e1003ea25a4a286b52de470912cf1f528d1ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 13 Jul 2023 06:40:03 +0200 Subject: [PATCH 09/41] upgpkg: discord-electron 0.0.28-1 upstream release Refactor PKGBUILD slightly Update Krisp checksum Check for empty lines when parsing flags --- .SRCINFO | 10 +++++----- PKGBUILD | 36 ++++++++++++++++++------------------ discord-launcher.sh | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3253d47..95cab16 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v22) for increased security and performance - pkgver = 0.0.27 - pkgrel = 7 + pkgver = 0.0.28 + pkgrel = 1 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.28/discord-0.0.28.tar.gz source = discord-launcher.sh - sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f - sha512sums = 4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0 + sha512sums = 763fe47a0fb21a13e852bcc818d4e0e2ea4faf23fcfdc02fddfe06e8c829499e028e27b45d807d3b3edcc36788990f3f21c0460b9b8efc538b62f3b41aeb744d + sha512sums = f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 6daa64b..f631a5b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,8 +14,8 @@ pkgname=discord-electron _pkgname=discord _electron=22 -pkgver=0.0.27 -pkgrel=7 +pkgver=0.0.28 +pkgrel=1 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -32,31 +32,27 @@ optdepends=( 'xdg-utils: Open files' 'rizin: Allow patching Krisp support' ) -source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz" +source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f' - '4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0') +sha512sums=('763fe47a0fb21a13e852bcc818d4e0e2ea4faf23fcfdc02fddfe06e8c829499e028e27b45d807d3b3edcc36788990f3f21c0460b9b8efc538b62f3b41aeb744d' + 'f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826') -_krisp_b2sum='592f55259500afc0d7fd334a10d3c1991fae05db870bf12437edc43cf693988195341f2cb827aba333c0e65fb4cb40dccfcc5d6a84dea4a1645f9563505b6496' +_krisp_b2sum='56c8c5167e3c4b51720accf0acfe46e7e073b015600088b6bb4d2b7a259cd788c4facba2d7332b535cfa39b91ee94840d6ea905c5d0c9cca43fa0a26f5185cc9' prepare() { # prepare launcher script sed -i "s|@PKGNAME@|${_pkgname}|g;s|@PKGVER@|${pkgver}|g;s|@ELECTRON@|${_electron}|g;s|@KRISPB2@|${_krisp_b2sum}|g" discord-launcher.sh # fix the .desktop file - sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop + sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" ${_pkgname^}/$_pkgname.desktop # create the license files curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md } -package() { - # create necessary directories - install -d "${pkgdir}"/usr/{lib/$_pkgname,bin} - install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname} - - cd "${srcdir}/Discord" +build() { + cd "${srcdir}"/${_pkgname^} # use system electron asar e resources/app.asar resources/app @@ -65,16 +61,20 @@ package() { sed -i "s|exeDir,|'/usr/share/pixmaps',|" resources/app/app_bootstrap/autoStart/linux.js asar p resources/app resources/app.asar rm -rf resources/app +} + +package() { + # create necessary directories + install -d "${pkgdir}"/usr/{lib/$_pkgname,bin} + install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname} # copy relevant data - cp -r resources/* "${pkgdir}"/usr/lib/$_pkgname/ - cp $_pkgname.png \ + cp -r ${_pkgname^}/resources/* "${pkgdir}"/usr/lib/$_pkgname/ + cp ${_pkgname^}/$_pkgname.png \ "${pkgdir}"/usr/share/pixmaps/$_pkgname.png - cp $_pkgname.desktop \ + cp ${_pkgname^}/$_pkgname.desktop \ "${pkgdir}"/usr/share/applications/$_pkgname.desktop - cd "${srcdir}" - # install the launch script install -Dm 755 discord-launcher.sh "${pkgdir}"/usr/bin/$_pkgname diff --git a/discord-launcher.sh b/discord-launcher.sh index 898e51e..6012a36 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -31,7 +31,7 @@ EOF fi for line in "${MAPFILE[@]}"; do - if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then flags+=("${line}") fi done From 9f775b6cda4ad5d3ebf1ec8272c8df77eb608acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 30 Aug 2023 19:22:50 +0200 Subject: [PATCH 10/41] upgpkg: discord-electron 0.0.29-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 95cab16..a192c38 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v22) for increased security and performance - pkgver = 0.0.28 + pkgver = 0.0.29 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.28/discord-0.0.28.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.29/discord-0.0.29.tar.gz source = discord-launcher.sh - sha512sums = 763fe47a0fb21a13e852bcc818d4e0e2ea4faf23fcfdc02fddfe06e8c829499e028e27b45d807d3b3edcc36788990f3f21c0460b9b8efc538b62f3b41aeb744d + sha512sums = 38e4c21872fdf7b7716680b70e6f677274be50fce04d16831ed180d894965ca2f8cc8814148e16ca540f8dcba2bb749788f6980180f51d8b1f1556e1a8a368e0 sha512sums = f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index f631a5b..360c1a3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,7 @@ pkgname=discord-electron _pkgname=discord _electron=22 -pkgver=0.0.28 +pkgver=0.0.29 pkgrel=1 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') @@ -34,10 +34,11 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('763fe47a0fb21a13e852bcc818d4e0e2ea4faf23fcfdc02fddfe06e8c829499e028e27b45d807d3b3edcc36788990f3f21c0460b9b8efc538b62f3b41aeb744d' +sha512sums=('38e4c21872fdf7b7716680b70e6f677274be50fce04d16831ed180d894965ca2f8cc8814148e16ca540f8dcba2bb749788f6980180f51d8b1f1556e1a8a368e0' 'f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826') -_krisp_b2sum='56c8c5167e3c4b51720accf0acfe46e7e073b015600088b6bb4d2b7a259cd788c4facba2d7332b535cfa39b91ee94840d6ea905c5d0c9cca43fa0a26f5185cc9' +# Krisp patch stopped working, will update later +_krisp_b2sum='' prepare() { # prepare launcher script From b7dfaeb935ef76586d911bb3d69b5350f872590b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 30 Aug 2023 23:55:45 +0200 Subject: [PATCH 11/41] upgpkg: discord-electron 0.0.29-2 Update Electron version to 24 Update Krisp patch --- .SRCINFO | 8 ++++---- PKGBUILD | 9 ++++----- discord-launcher.sh | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a192c38..ba4e272 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron - pkgdesc = Discord using system provided electron (v22) for increased security and performance + pkgdesc = Discord using system provided electron (v24) for increased security and performance pkgver = 0.0.29 - pkgrel = 1 + pkgrel = 2 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -9,7 +9,7 @@ pkgbase = discord-electron makedepends = asar makedepends = curl makedepends = python-html2text - depends = electron22 + depends = electron24 depends = libxss optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support @@ -21,6 +21,6 @@ pkgbase = discord-electron source = https://dl.discordapp.net/apps/linux/0.0.29/discord-0.0.29.tar.gz source = discord-launcher.sh sha512sums = 38e4c21872fdf7b7716680b70e6f677274be50fce04d16831ed180d894965ca2f8cc8814148e16ca540f8dcba2bb749788f6980180f51d8b1f1556e1a8a368e0 - sha512sums = f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826 + sha512sums = b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 360c1a3..d1c1db7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,9 +13,9 @@ pkgname=discord-electron _pkgname=discord -_electron=22 +_electron=24 pkgver=0.0.29 -pkgrel=1 +pkgrel=2 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -35,10 +35,9 @@ optdepends=( source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') sha512sums=('38e4c21872fdf7b7716680b70e6f677274be50fce04d16831ed180d894965ca2f8cc8814148e16ca540f8dcba2bb749788f6980180f51d8b1f1556e1a8a368e0' - 'f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826') + 'b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab') -# Krisp patch stopped working, will update later -_krisp_b2sum='' +_krisp_b2sum='09db0a3b1e736049f39d8fb6c726b6468e725e503dc9109ebb17930d68007cc3818c7123ad836c36df704da9c803f944b77b3412a1b0418552c87be56ed11604' prepare() { # prepare launcher script diff --git a/discord-launcher.sh b/discord-launcher.sh index 6012a36..86fc394 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -12,8 +12,8 @@ krisp_b2=@KRISPB2@ if hash rizin &> /dev/null; then # Patch Krisp binary to ignore signature check if [[ -f "${krisp_bin}" && $(b2sum "${krisp_bin}" | head -c 128) == $krisp_b2 ]]; then - addr=$(rz-find -x '4889dfe8........4889dfe8' "${krisp_bin}" | head -n1) - rizin -q -w -c "s $addr + 0x12 ; wao nop" "${krisp_bin}" &> /dev/null + addr=$(rz-find -x '4881ec00010000' "${krisp_bin}" | head -n1) + rizin -q -w -c "s $addr + 0x30 ; wao nop" "${krisp_bin}" &> /dev/null fi fi From ab38230d80923d62dbbd6a211f58a2789f93efd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 18 Sep 2023 23:29:20 +0200 Subject: [PATCH 12/41] upgpkg: discord-electron 0.0.30-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ba4e272..1f5fcf4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance - pkgver = 0.0.29 - pkgrel = 2 + pkgver = 0.0.30 + pkgrel = 1 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.29/discord-0.0.29.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.30/discord-0.0.30.tar.gz source = discord-launcher.sh - sha512sums = 38e4c21872fdf7b7716680b70e6f677274be50fce04d16831ed180d894965ca2f8cc8814148e16ca540f8dcba2bb749788f6980180f51d8b1f1556e1a8a368e0 + sha512sums = 2da18ea98c429345b97e6168cebf8b3422f1f1d8a60e5e2ab0154732cc033774a75b94f85e5b834acbdf7362c13f3707bb767ad6c19290fc39a2a10997aff554 sha512sums = b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index d1c1db7..ee93680 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,8 +14,8 @@ pkgname=discord-electron _pkgname=discord _electron=24 -pkgver=0.0.29 -pkgrel=2 +pkgver=0.0.30 +pkgrel=1 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") @@ -34,10 +34,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('38e4c21872fdf7b7716680b70e6f677274be50fce04d16831ed180d894965ca2f8cc8814148e16ca540f8dcba2bb749788f6980180f51d8b1f1556e1a8a368e0' +sha512sums=('2da18ea98c429345b97e6168cebf8b3422f1f1d8a60e5e2ab0154732cc033774a75b94f85e5b834acbdf7362c13f3707bb767ad6c19290fc39a2a10997aff554' 'b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab') -_krisp_b2sum='09db0a3b1e736049f39d8fb6c726b6468e725e503dc9109ebb17930d68007cc3818c7123ad836c36df704da9c803f944b77b3412a1b0418552c87be56ed11604' +_krisp_b2sum='7781ec747f539dbdb800b178273e8e63fb0ed19e80fa3372444dec60db0dcb2f414400b0b31a850ae9e663731cb11fe0589501634a316e9a3315de3d0b99269a' prepare() { # prepare launcher script From de35c03252634f10c480711cf06bbabf9f5377d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 5 Oct 2023 22:29:25 +0200 Subject: [PATCH 13/41] upgpkg: discord-electron 0.0.31-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1f5fcf4..e8ef457 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance - pkgver = 0.0.30 + pkgver = 0.0.31 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.30/discord-0.0.30.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.31/discord-0.0.31.tar.gz source = discord-launcher.sh - sha512sums = 2da18ea98c429345b97e6168cebf8b3422f1f1d8a60e5e2ab0154732cc033774a75b94f85e5b834acbdf7362c13f3707bb767ad6c19290fc39a2a10997aff554 + sha512sums = 596f0e2271e61798594d97a85728eea2bfa851db7f1e8b7fa65e1631dfeb347fa8d6087556854c0e775b88678a03b8ece97d0c1293b156e7ea908f6570645248 sha512sums = b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index ee93680..8a8262f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,7 @@ pkgname=discord-electron _pkgname=discord _electron=24 -pkgver=0.0.30 +pkgver=0.0.31 pkgrel=1 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') @@ -34,10 +34,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('2da18ea98c429345b97e6168cebf8b3422f1f1d8a60e5e2ab0154732cc033774a75b94f85e5b834acbdf7362c13f3707bb767ad6c19290fc39a2a10997aff554' +sha512sums=('596f0e2271e61798594d97a85728eea2bfa851db7f1e8b7fa65e1631dfeb347fa8d6087556854c0e775b88678a03b8ece97d0c1293b156e7ea908f6570645248' 'b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab') -_krisp_b2sum='7781ec747f539dbdb800b178273e8e63fb0ed19e80fa3372444dec60db0dcb2f414400b0b31a850ae9e663731cb11fe0589501634a316e9a3315de3d0b99269a' +_krisp_b2sum='d164c2ee27826c97fc18bd1bce1351b4199daf0bdc4be635666ab146a56a09106af241f34fa1f5c123bc86d9c27503bded9a015835d6040b17c238a9aab699a5' prepare() { # prepare launcher script From 7f99746eb7fb7e14a934facce82cae5928409f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 17 Oct 2023 02:53:35 +0200 Subject: [PATCH 14/41] upgpkg: discord-electron 0.0.32-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e8ef457..e20f1a3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance - pkgver = 0.0.31 + pkgver = 0.0.32 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.31/discord-0.0.31.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.32/discord-0.0.32.tar.gz source = discord-launcher.sh - sha512sums = 596f0e2271e61798594d97a85728eea2bfa851db7f1e8b7fa65e1631dfeb347fa8d6087556854c0e775b88678a03b8ece97d0c1293b156e7ea908f6570645248 + sha512sums = e3ca9075e4a66c7c4358bdccb748f8f849de24cf3036b85d2c42dd15f8e56125fc42e86e73920751126b0e4fa73596a1d7af1f21ac9903911d6c843637c46813 sha512sums = b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 8a8262f..cc88b18 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,7 @@ pkgname=discord-electron _pkgname=discord _electron=24 -pkgver=0.0.31 +pkgver=0.0.32 pkgrel=1 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') @@ -34,10 +34,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('596f0e2271e61798594d97a85728eea2bfa851db7f1e8b7fa65e1631dfeb347fa8d6087556854c0e775b88678a03b8ece97d0c1293b156e7ea908f6570645248' +sha512sums=('e3ca9075e4a66c7c4358bdccb748f8f849de24cf3036b85d2c42dd15f8e56125fc42e86e73920751126b0e4fa73596a1d7af1f21ac9903911d6c843637c46813' 'b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab') -_krisp_b2sum='d164c2ee27826c97fc18bd1bce1351b4199daf0bdc4be635666ab146a56a09106af241f34fa1f5c123bc86d9c27503bded9a015835d6040b17c238a9aab699a5' +_krisp_b2sum='90c3fbf6aab16638995fe21c49d4b8f93dbec9a9147cc7b1424c591c630aae84c362ee2b1a81507311b31e442e6b2706e6f48e1df8edd7248f5659108bbb3711' prepare() { # prepare launcher script From e6d87d913f93a098d1365b4bf0e6f9e286ff20c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 31 Oct 2023 18:51:45 +0100 Subject: [PATCH 15/41] upgpkg: discord-electron 0.0.33-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e20f1a3..6fc7fe9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance - pkgver = 0.0.32 + pkgver = 0.0.33 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.32/discord-0.0.32.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.33/discord-0.0.33.tar.gz source = discord-launcher.sh - sha512sums = e3ca9075e4a66c7c4358bdccb748f8f849de24cf3036b85d2c42dd15f8e56125fc42e86e73920751126b0e4fa73596a1d7af1f21ac9903911d6c843637c46813 + sha512sums = 83e848d12137a2576f70834fcf612cdd0a0f3216916d450830813b7492efa53f7baaeefd37cd58091a0ed8303e3b037f32e995b51a35c416388c1a6d6998036f sha512sums = b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index cc88b18..56b510a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,7 @@ pkgname=discord-electron _pkgname=discord _electron=24 -pkgver=0.0.32 +pkgver=0.0.33 pkgrel=1 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') @@ -34,10 +34,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('e3ca9075e4a66c7c4358bdccb748f8f849de24cf3036b85d2c42dd15f8e56125fc42e86e73920751126b0e4fa73596a1d7af1f21ac9903911d6c843637c46813' +sha512sums=('83e848d12137a2576f70834fcf612cdd0a0f3216916d450830813b7492efa53f7baaeefd37cd58091a0ed8303e3b037f32e995b51a35c416388c1a6d6998036f' 'b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab') -_krisp_b2sum='90c3fbf6aab16638995fe21c49d4b8f93dbec9a9147cc7b1424c591c630aae84c362ee2b1a81507311b31e442e6b2706e6f48e1df8edd7248f5659108bbb3711' +_krisp_b2sum='e36c3308b34e96f4c33425bb1d7ac0d8130fa5450c9db2ee3fbdbfa10887ab15f3ec06f9fdbd446553f9224052af0705a0eebfc92b55776a33a9cfdf0c3c53e4' prepare() { # prepare launcher script From a1dffff277b331ab4522fe60c57caf76b9a9df1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 7 Nov 2023 00:09:09 +0100 Subject: [PATCH 16/41] upgpkg: discord-electron 0.0.34-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6fc7fe9..cbe92db 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance - pkgver = 0.0.33 + pkgver = 0.0.34 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.33/discord-0.0.33.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.34/discord-0.0.34.tar.gz source = discord-launcher.sh - sha512sums = 83e848d12137a2576f70834fcf612cdd0a0f3216916d450830813b7492efa53f7baaeefd37cd58091a0ed8303e3b037f32e995b51a35c416388c1a6d6998036f + sha512sums = 28ab59e18ca3c800030c7c4b4f016efed033e741ad42f18b993e8493d51a78d430a4ff3c0a3457fdf8b43907a013f3145e67748e7a896d440af56074226c5c46 sha512sums = b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 56b510a..8adad78 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,7 @@ pkgname=discord-electron _pkgname=discord _electron=24 -pkgver=0.0.33 +pkgver=0.0.34 pkgrel=1 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') @@ -34,7 +34,7 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('83e848d12137a2576f70834fcf612cdd0a0f3216916d450830813b7492efa53f7baaeefd37cd58091a0ed8303e3b037f32e995b51a35c416388c1a6d6998036f' +sha512sums=('28ab59e18ca3c800030c7c4b4f016efed033e741ad42f18b993e8493d51a78d430a4ff3c0a3457fdf8b43907a013f3145e67748e7a896d440af56074226c5c46' 'b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab') _krisp_b2sum='e36c3308b34e96f4c33425bb1d7ac0d8130fa5450c9db2ee3fbdbfa10887ab15f3ec06f9fdbd446553f9224052af0705a0eebfc92b55776a33a9cfdf0c3c53e4' From 939bda022436094dcc97bb9f77317050ae5b1229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 9 Nov 2023 16:57:04 +0100 Subject: [PATCH 17/41] upgpkg: discord-electron 0.0.34-2: fix autostart * Fix autostart as suggested by @LRitzdorf * Improve use of sed commands * Directly execute electron binary --- .SRCINFO | 4 ++-- PKGBUILD | 27 ++++++++++++++++++--------- discord-launcher.sh | 2 +- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cbe92db..a131066 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance pkgver = 0.0.34 - pkgrel = 1 + pkgrel = 2 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -21,6 +21,6 @@ pkgbase = discord-electron source = https://dl.discordapp.net/apps/linux/0.0.34/discord-0.0.34.tar.gz source = discord-launcher.sh sha512sums = 28ab59e18ca3c800030c7c4b4f016efed033e741ad42f18b993e8493d51a78d430a4ff3c0a3457fdf8b43907a013f3145e67748e7a896d440af56074226c5c46 - sha512sums = b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab + sha512sums = 723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 8adad78..0b3864e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,10 +13,11 @@ pkgname=discord-electron _pkgname=discord -_electron=24 pkgver=0.0.34 -pkgrel=1 -pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" +pkgrel=2 +_electronver=24 +_electronname="electron${_electronver}" +pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" arch=('x86_64') provides=("${_pkgname}") conflicts=("${_pkgname}") @@ -24,7 +25,7 @@ url='https://discord.com' license=('custom') options=('!strip') install="$pkgname.install" -depends=("electron${_electron}" 'libxss') +depends=("${_electronname}" 'libxss') makedepends=('asar' 'curl' 'python-html2text') optdepends=( 'libpulse: Pulseaudio support' @@ -35,16 +36,20 @@ optdepends=( source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') sha512sums=('28ab59e18ca3c800030c7c4b4f016efed033e741ad42f18b993e8493d51a78d430a4ff3c0a3457fdf8b43907a013f3145e67748e7a896d440af56074226c5c46' - 'b0961f546a4016e24d516c6d1125c1af0e8ca84ab960f6abe10ec98c2c18543da2168ffb2676189ed110e9abbdb889abfb2c610954019250041a0a89b0b03bab') + '723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5') _krisp_b2sum='e36c3308b34e96f4c33425bb1d7ac0d8130fa5450c9db2ee3fbdbfa10887ab15f3ec06f9fdbd446553f9224052af0705a0eebfc92b55776a33a9cfdf0c3c53e4' prepare() { # prepare launcher script - sed -i "s|@PKGNAME@|${_pkgname}|g;s|@PKGVER@|${pkgver}|g;s|@ELECTRON@|${_electron}|g;s|@KRISPB2@|${_krisp_b2sum}|g" discord-launcher.sh + sed -i -e "s|@PKGNAME@|${_pkgname}|g" \ + -e "s|@PKGVER@|${pkgver}|g" \ + -e "s|@ELECTRON@|${_electronname}|g" \ + -e "s|@KRISPB2@|${_krisp_b2sum}|g" \ + discord-launcher.sh # fix the .desktop file - sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" ${_pkgname^}/$_pkgname.desktop + sed -i -e "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" ${_pkgname^}/$_pkgname.desktop # create the license files curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md @@ -57,8 +62,12 @@ build() { # use system electron asar e resources/app.asar resources/app rm resources/app.asar - sed -i "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" resources/app/app_bootstrap/buildInfo.js - sed -i "s|exeDir,|'/usr/share/pixmaps',|" resources/app/app_bootstrap/autoStart/linux.js + sed -i -e "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" 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 } diff --git a/discord-launcher.sh b/discord-launcher.sh index 86fc394..1d29967 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -39,7 +39,7 @@ done unset flags_file krisp_bin krisp_b2 -exec /usr/bin/electron@ELECTRON@ \ +exec /usr/lib/@ELECTRON@/electron \ /usr/lib/@PKGNAME@/app.asar \ --ozone-platform-hint=auto \ "${flags[@]}" "$@" From ac2d35ef29debf6a8730507ba06c4284c6e6eeea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 13 Nov 2023 19:50:30 +0100 Subject: [PATCH 18/41] upgpkg: discord-electron 0.0.35-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a131066..6d4ebdb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance - pkgver = 0.0.34 - pkgrel = 2 + pkgver = 0.0.35 + pkgrel = 1 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.34/discord-0.0.34.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.35/discord-0.0.35.tar.gz source = discord-launcher.sh - sha512sums = 28ab59e18ca3c800030c7c4b4f016efed033e741ad42f18b993e8493d51a78d430a4ff3c0a3457fdf8b43907a013f3145e67748e7a896d440af56074226c5c46 + sha512sums = a0f1db24e38a2d48ea8521a7e8e638a401bdfc407b64e21c7a0dde241eb10e4988fcdc916ed13d45012ae4ce25b3c53d36bf97b011cf569cb81e9f1b7c2d6eeb sha512sums = 723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 0b3864e..9a9735c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,8 +13,8 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.34 -pkgrel=2 +pkgver=0.0.35 +pkgrel=1 _electronver=24 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" @@ -35,7 +35,7 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('28ab59e18ca3c800030c7c4b4f016efed033e741ad42f18b993e8493d51a78d430a4ff3c0a3457fdf8b43907a013f3145e67748e7a896d440af56074226c5c46' +sha512sums=('a0f1db24e38a2d48ea8521a7e8e638a401bdfc407b64e21c7a0dde241eb10e4988fcdc916ed13d45012ae4ce25b3c53d36bf97b011cf569cb81e9f1b7c2d6eeb' '723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5') _krisp_b2sum='e36c3308b34e96f4c33425bb1d7ac0d8130fa5450c9db2ee3fbdbfa10887ab15f3ec06f9fdbd446553f9224052af0705a0eebfc92b55776a33a9cfdf0c3c53e4' From fe6568de7cdf242a721ac9ff557584e503d7cb04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 29 Nov 2023 01:17:45 +0100 Subject: [PATCH 19/41] upgpkg: discord-electron 0.0.36-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6d4ebdb..fc0f23a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance - pkgver = 0.0.35 + pkgver = 0.0.36 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.35/discord-0.0.35.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.36/discord-0.0.36.tar.gz source = discord-launcher.sh - sha512sums = a0f1db24e38a2d48ea8521a7e8e638a401bdfc407b64e21c7a0dde241eb10e4988fcdc916ed13d45012ae4ce25b3c53d36bf97b011cf569cb81e9f1b7c2d6eeb + sha512sums = e72ed0e559ebc8ad24c3aa41011af408aa5d3d1c4561cca3f16345aa3a5e18326017564ff2f4a3c1bf1e84f00333e206557cebad2f483c6a1c71bf48df23546b sha512sums = 723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 9a9735c..42a28f1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.35 +pkgver=0.0.36 pkgrel=1 _electronver=24 _electronname="electron${_electronver}" @@ -35,7 +35,7 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('a0f1db24e38a2d48ea8521a7e8e638a401bdfc407b64e21c7a0dde241eb10e4988fcdc916ed13d45012ae4ce25b3c53d36bf97b011cf569cb81e9f1b7c2d6eeb' +sha512sums=('e72ed0e559ebc8ad24c3aa41011af408aa5d3d1c4561cca3f16345aa3a5e18326017564ff2f4a3c1bf1e84f00333e206557cebad2f483c6a1c71bf48df23546b' '723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5') _krisp_b2sum='e36c3308b34e96f4c33425bb1d7ac0d8130fa5450c9db2ee3fbdbfa10887ab15f3ec06f9fdbd446553f9224052af0705a0eebfc92b55776a33a9cfdf0c3c53e4' From 9fe5631265608ffee8f397ad876c59e0629980d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 5 Dec 2023 21:28:13 +0100 Subject: [PATCH 20/41] upgpkg: discord-electron 0.0.37-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fc0f23a..27e4e30 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance - pkgver = 0.0.36 + pkgver = 0.0.37 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.36/discord-0.0.36.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.37/discord-0.0.37.tar.gz source = discord-launcher.sh - sha512sums = e72ed0e559ebc8ad24c3aa41011af408aa5d3d1c4561cca3f16345aa3a5e18326017564ff2f4a3c1bf1e84f00333e206557cebad2f483c6a1c71bf48df23546b + sha512sums = 495969155a99364a22fef5d830adec5c03c25ac118d560b1e346fa9190866f9a038c07664124f8f835b77ba4e4d2a268a8eab86dea54274de4904ec374a2c005 sha512sums = 723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 42a28f1..3147662 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.36 +pkgver=0.0.37 pkgrel=1 _electronver=24 _electronname="electron${_electronver}" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('e72ed0e559ebc8ad24c3aa41011af408aa5d3d1c4561cca3f16345aa3a5e18326017564ff2f4a3c1bf1e84f00333e206557cebad2f483c6a1c71bf48df23546b' +sha512sums=('495969155a99364a22fef5d830adec5c03c25ac118d560b1e346fa9190866f9a038c07664124f8f835b77ba4e4d2a268a8eab86dea54274de4904ec374a2c005' '723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5') -_krisp_b2sum='e36c3308b34e96f4c33425bb1d7ac0d8130fa5450c9db2ee3fbdbfa10887ab15f3ec06f9fdbd446553f9224052af0705a0eebfc92b55776a33a9cfdf0c3c53e4' +_krisp_b2sum='189a812d6947da0cc1998de9f4e7f9ed98f145dd0b53261d0cc6c2a9c463a8b978eed0ea92b7c01a861d5ee1a0e503dde7b637b35859b041536f7f2820f11da7' prepare() { # prepare launcher script From bbb6ca0bb68fef044ebfcec51be5ac29dc0407f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 12 Dec 2023 23:46:26 +0100 Subject: [PATCH 21/41] upgpkg: discord-electron 0.0.38-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 27e4e30..5ee5d02 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance - pkgver = 0.0.37 + pkgver = 0.0.38 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.37/discord-0.0.37.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.38/discord-0.0.38.tar.gz source = discord-launcher.sh - sha512sums = 495969155a99364a22fef5d830adec5c03c25ac118d560b1e346fa9190866f9a038c07664124f8f835b77ba4e4d2a268a8eab86dea54274de4904ec374a2c005 + sha512sums = b526231453bd2eabacd8fd353a8cd33fbc2a3992f5a29a4f21dd32ad79a4caa16cda21652b7d7b261b3a0bf6276a8d443e75d4deca5f47fc25540dbe23996598 sha512sums = 723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 3147662..54018ef 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.37 +pkgver=0.0.38 pkgrel=1 _electronver=24 _electronname="electron${_electronver}" @@ -35,7 +35,7 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('495969155a99364a22fef5d830adec5c03c25ac118d560b1e346fa9190866f9a038c07664124f8f835b77ba4e4d2a268a8eab86dea54274de4904ec374a2c005' +sha512sums=('b526231453bd2eabacd8fd353a8cd33fbc2a3992f5a29a4f21dd32ad79a4caa16cda21652b7d7b261b3a0bf6276a8d443e75d4deca5f47fc25540dbe23996598' '723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5') _krisp_b2sum='189a812d6947da0cc1998de9f4e7f9ed98f145dd0b53261d0cc6c2a9c463a8b978eed0ea92b7c01a861d5ee1a0e503dde7b637b35859b041536f7f2820f11da7' From f2b0a557e7d8c7ba41da362a1c6e827606cbccea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 19 Dec 2023 21:47:13 +0100 Subject: [PATCH 22/41] upgpkg: discord-electron 0.0.39-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5ee5d02..25317d8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v24) for increased security and performance - pkgver = 0.0.38 + pkgver = 0.0.39 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.38/discord-0.0.38.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.39/discord-0.0.39.tar.gz source = discord-launcher.sh - sha512sums = b526231453bd2eabacd8fd353a8cd33fbc2a3992f5a29a4f21dd32ad79a4caa16cda21652b7d7b261b3a0bf6276a8d443e75d4deca5f47fc25540dbe23996598 + sha512sums = 9f18aea5d82f5db4efa9db9babbc440b24e47dc80df18df5cc58d99d677f1c0863df21ed96d69896785f8fbe0dc0ff1f7317398b8f39606289da79f5a38074f1 sha512sums = 723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 54018ef..a9bcffd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.38 +pkgver=0.0.39 pkgrel=1 _electronver=24 _electronname="electron${_electronver}" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('b526231453bd2eabacd8fd353a8cd33fbc2a3992f5a29a4f21dd32ad79a4caa16cda21652b7d7b261b3a0bf6276a8d443e75d4deca5f47fc25540dbe23996598' +sha512sums=('9f18aea5d82f5db4efa9db9babbc440b24e47dc80df18df5cc58d99d677f1c0863df21ed96d69896785f8fbe0dc0ff1f7317398b8f39606289da79f5a38074f1' '723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5') -_krisp_b2sum='189a812d6947da0cc1998de9f4e7f9ed98f145dd0b53261d0cc6c2a9c463a8b978eed0ea92b7c01a861d5ee1a0e503dde7b637b35859b041536f7f2820f11da7' +_krisp_b2sum='310e3d5ad2311ceace91d20004a677c1a1e49fa1cd5c0458ee5bdb31c01c49df68cac625e66dadcaddf90c67568cde22c2cec3c0b6bca8385225141a8d8d53c1' prepare() { # prepare launcher script From e87075530d2a6132e4e473f0f740807007c051f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 4 Jan 2024 15:07:13 +0100 Subject: [PATCH 23/41] upgpkg: discord-electron 0.0.39-2: update electron * Update Electron version to 27 * Update launch script to require config variable set in order to patch Krisp binary --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- discord-electron.install | 17 +++++++++++++---- discord-launcher.sh | 15 ++++++--------- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 25317d8..27ae8eb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron - pkgdesc = Discord using system provided electron (v24) for increased security and performance + pkgdesc = Discord using system provided electron (v27) for increased security and performance pkgver = 0.0.39 - pkgrel = 1 + pkgrel = 2 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -9,7 +9,7 @@ pkgbase = discord-electron makedepends = asar makedepends = curl makedepends = python-html2text - depends = electron24 + depends = electron27 depends = libxss optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support @@ -21,6 +21,6 @@ pkgbase = discord-electron source = https://dl.discordapp.net/apps/linux/0.0.39/discord-0.0.39.tar.gz source = discord-launcher.sh sha512sums = 9f18aea5d82f5db4efa9db9babbc440b24e47dc80df18df5cc58d99d677f1c0863df21ed96d69896785f8fbe0dc0ff1f7317398b8f39606289da79f5a38074f1 - sha512sums = 723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5 + sha512sums = e68467468e9ebfe7aae873442998bda03212598a87d9af1b9ac976fdbafc81eb376e7770dccca6eb943d579f39717a0473fa4f0a46a0c3e436460688827a2dc7 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index a9bcffd..b31630a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,8 +14,8 @@ pkgname=discord-electron _pkgname=discord pkgver=0.0.39 -pkgrel=1 -_electronver=24 +pkgrel=2 +_electronver=27 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" arch=('x86_64') @@ -36,7 +36,7 @@ optdepends=( source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') sha512sums=('9f18aea5d82f5db4efa9db9babbc440b24e47dc80df18df5cc58d99d677f1c0863df21ed96d69896785f8fbe0dc0ff1f7317398b8f39606289da79f5a38074f1' - '723250b70c7f5367701675c6581e9eac2143263910c4ffc35957a6ab858492c5febe89ea0d46fce19ac1416c23d9ca3953e48b9db5aa174b4a401fb6efa5daf5') + 'e68467468e9ebfe7aae873442998bda03212598a87d9af1b9ac976fdbafc81eb376e7770dccca6eb943d579f39717a0473fa4f0a46a0c3e436460688827a2dc7') _krisp_b2sum='310e3d5ad2311ceace91d20004a677c1a1e49fa1cd5c0458ee5bdb31c01c49df68cac625e66dadcaddf90c67568cde22c2cec3c0b6bca8385225141a8d8d53c1' diff --git a/discord-electron.install b/discord-electron.install index 3d13381..893fcd9 100644 --- a/discord-electron.install +++ b/discord-electron.install @@ -1,4 +1,12 @@ post_upgrade() { + # return if old package version is greater than or equal to 0.0.39-1... + (( $(vercmp $2 '0.0.39-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 + # return if old package version is greater than or equal to 0.0.27-5... (( $(vercmp $2 '0.0.27-5') >= 0 )) && return @@ -18,9 +26,10 @@ EOF post_install() { cat < For Krisp noise suppression support consider installing 'rizin'. Restart - your Discord client after installation or update to apply the patch. -==> In case of performance problems consider adding or uncommenting Electron - flags in '~/.config/discord-flags.conf'. +==> 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 } diff --git a/discord-launcher.sh b/discord-launcher.sh index 1d29967..33d525c 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -5,29 +5,26 @@ set -euo pipefail declare -a flags +[[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@.conf" ]] && source "${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@.conf" + flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf" krisp_bin="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@/@PKGVER@/modules/@PKGNAME@_krisp/@PKGNAME@_krisp.node" krisp_b2=@KRISPB2@ -if hash rizin &> /dev/null; then +if hash rizin &> /dev/null && [[ "${PATCH_KRISP}" == true ]]; then # Patch Krisp binary to ignore signature check - if [[ -f "${krisp_bin}" && $(b2sum "${krisp_bin}" | head -c 128) == $krisp_b2 ]]; then + 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 [[ -f "${flags_file}" ]]; then +if [[ -w "${flags_file}" ]]; then + # Replacing because old flag does not work if grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then sed -i "s|--ignore-gpu-blacklist|--ignore-gpu-blocklist|" "${flags_file}" fi mapfile -t < "${flags_file}" -else - cat > "${flags_file}" < Date: Thu, 4 Jan 2024 22:47:25 +0100 Subject: [PATCH 24/41] upgpkg: discord-electron 0.0.39-3: fix launcher * Fix launcher error if config variable not set but rizin is installed * Fix typo --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- discord-electron.install | 2 +- discord-launcher.sh | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 27ae8eb..e8b5291 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v27) for increased security and performance pkgver = 0.0.39 - pkgrel = 2 + pkgrel = 3 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -21,6 +21,6 @@ pkgbase = discord-electron source = https://dl.discordapp.net/apps/linux/0.0.39/discord-0.0.39.tar.gz source = discord-launcher.sh sha512sums = 9f18aea5d82f5db4efa9db9babbc440b24e47dc80df18df5cc58d99d677f1c0863df21ed96d69896785f8fbe0dc0ff1f7317398b8f39606289da79f5a38074f1 - sha512sums = e68467468e9ebfe7aae873442998bda03212598a87d9af1b9ac976fdbafc81eb376e7770dccca6eb943d579f39717a0473fa4f0a46a0c3e436460688827a2dc7 + sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index b31630a..5be444e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,7 @@ pkgname=discord-electron _pkgname=discord pkgver=0.0.39 -pkgrel=2 +pkgrel=3 _electronver=27 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" @@ -36,7 +36,7 @@ optdepends=( source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') sha512sums=('9f18aea5d82f5db4efa9db9babbc440b24e47dc80df18df5cc58d99d677f1c0863df21ed96d69896785f8fbe0dc0ff1f7317398b8f39606289da79f5a38074f1' - 'e68467468e9ebfe7aae873442998bda03212598a87d9af1b9ac976fdbafc81eb376e7770dccca6eb943d579f39717a0473fa4f0a46a0c3e436460688827a2dc7') + 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') _krisp_b2sum='310e3d5ad2311ceace91d20004a677c1a1e49fa1cd5c0458ee5bdb31c01c49df68cac625e66dadcaddf90c67568cde22c2cec3c0b6bca8385225141a8d8d53c1' diff --git a/discord-electron.install b/discord-electron.install index 893fcd9..193b455 100644 --- a/discord-electron.install +++ b/discord-electron.install @@ -1,5 +1,5 @@ post_upgrade() { - # return if old package version is greater than or equal to 0.0.39-1... + # return if old package version is greater than or equal to 0.0.39-2... (( $(vercmp $2 '0.0.39-2') >= 0 )) && return cat < /dev/null && [[ "${PATCH_KRISP}" == true ]]; then fi fi -if [[ -w "${flags_file}" ]]; then +if [[ -r "${flags_file}" ]]; then # Replacing because old flag does not work - if grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then + if [[ -w "${flags_file}" ]] && grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then sed -i "s|--ignore-gpu-blacklist|--ignore-gpu-blocklist|" "${flags_file}" fi mapfile -t < "${flags_file}" From e0bdcd102a1162e24d4f413fb9d60712f9e0910c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 9 Jan 2024 20:38:00 +0100 Subject: [PATCH 25/41] upgpkg: discord-electron 0.0.40-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e8b5291..c57b98b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v27) for increased security and performance - pkgver = 0.0.39 - pkgrel = 3 + pkgver = 0.0.40 + pkgrel = 1 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.39/discord-0.0.39.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.40/discord-0.0.40.tar.gz source = discord-launcher.sh - sha512sums = 9f18aea5d82f5db4efa9db9babbc440b24e47dc80df18df5cc58d99d677f1c0863df21ed96d69896785f8fbe0dc0ff1f7317398b8f39606289da79f5a38074f1 + sha512sums = 64fd9cf5c8ebb55cd5cd7c1fc0ae04a7e7cb9df6cc18a7c992f1156f46dac5415d87003622078e5d4aa0e48234c3d69d0d12633a57d55291e359cbb40511ca3a sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 5be444e..533e08e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,8 +13,8 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.39 -pkgrel=3 +pkgver=0.0.40 +pkgrel=1 _electronver=27 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" @@ -35,7 +35,7 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('9f18aea5d82f5db4efa9db9babbc440b24e47dc80df18df5cc58d99d677f1c0863df21ed96d69896785f8fbe0dc0ff1f7317398b8f39606289da79f5a38074f1' +sha512sums=('64fd9cf5c8ebb55cd5cd7c1fc0ae04a7e7cb9df6cc18a7c992f1156f46dac5415d87003622078e5d4aa0e48234c3d69d0d12633a57d55291e359cbb40511ca3a' 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') _krisp_b2sum='310e3d5ad2311ceace91d20004a677c1a1e49fa1cd5c0458ee5bdb31c01c49df68cac625e66dadcaddf90c67568cde22c2cec3c0b6bca8385225141a8d8d53c1' From a0f532b74ce02234bda1fd5410d4b9147bab22fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 23 Jan 2024 21:03:56 +0100 Subject: [PATCH 26/41] upgpkg: discord-electron 0.0.41-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c57b98b..0313ed5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v27) for increased security and performance - pkgver = 0.0.40 + pkgver = 0.0.41 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.40/discord-0.0.40.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.41/discord-0.0.41.tar.gz source = discord-launcher.sh - sha512sums = 64fd9cf5c8ebb55cd5cd7c1fc0ae04a7e7cb9df6cc18a7c992f1156f46dac5415d87003622078e5d4aa0e48234c3d69d0d12633a57d55291e359cbb40511ca3a + sha512sums = 4442fcff4eadc84ce9ec325c4209dccd07a361dd925418ef0f58e0a059ae906314dd538dfc10f5763aac994beecfa70a6628fb445b244f6f9aab21f73973b80c sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 533e08e..adb9fc6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.40 +pkgver=0.0.41 pkgrel=1 _electronver=27 _electronname="electron${_electronver}" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('64fd9cf5c8ebb55cd5cd7c1fc0ae04a7e7cb9df6cc18a7c992f1156f46dac5415d87003622078e5d4aa0e48234c3d69d0d12633a57d55291e359cbb40511ca3a' +sha512sums=('4442fcff4eadc84ce9ec325c4209dccd07a361dd925418ef0f58e0a059ae906314dd538dfc10f5763aac994beecfa70a6628fb445b244f6f9aab21f73973b80c' 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') -_krisp_b2sum='310e3d5ad2311ceace91d20004a677c1a1e49fa1cd5c0458ee5bdb31c01c49df68cac625e66dadcaddf90c67568cde22c2cec3c0b6bca8385225141a8d8d53c1' +_krisp_b2sum='7001c22b01e6f64203b0f9a0ce6d693c1fba212492a0c551befa3a875e688f2efc24ceae21c91949a5e1d813746b55931856e46450a2f203c7a29a9ef483b914' prepare() { # prepare launcher script From 0e255cff1399877d1ca3b1eaa0fb436dce25f2a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 29 Jan 2024 21:34:18 +0100 Subject: [PATCH 27/41] upgpkg: discord-electron 0.0.42-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0313ed5..3dc1a38 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v27) for increased security and performance - pkgver = 0.0.41 + pkgver = 0.0.42 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.41/discord-0.0.41.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.42/discord-0.0.42.tar.gz source = discord-launcher.sh - sha512sums = 4442fcff4eadc84ce9ec325c4209dccd07a361dd925418ef0f58e0a059ae906314dd538dfc10f5763aac994beecfa70a6628fb445b244f6f9aab21f73973b80c + sha512sums = ec11acfe3f96762cd7c230eb38e098818d9ebf32ff530f061ed3dbb5d08c3303bb4d20206510e3621f21ba89c08474367c13e7fd3c46f80b7229db37fb81db6c sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index adb9fc6..3de3c2e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.41 +pkgver=0.0.42 pkgrel=1 _electronver=27 _electronname="electron${_electronver}" @@ -35,7 +35,7 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('4442fcff4eadc84ce9ec325c4209dccd07a361dd925418ef0f58e0a059ae906314dd538dfc10f5763aac994beecfa70a6628fb445b244f6f9aab21f73973b80c' +sha512sums=('ec11acfe3f96762cd7c230eb38e098818d9ebf32ff530f061ed3dbb5d08c3303bb4d20206510e3621f21ba89c08474367c13e7fd3c46f80b7229db37fb81db6c' 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') _krisp_b2sum='7001c22b01e6f64203b0f9a0ce6d693c1fba212492a0c551befa3a875e688f2efc24ceae21c91949a5e1d813746b55931856e46450a2f203c7a29a9ef483b914' From 0efa91f6a1c4f8483f6ddb0516fa64ae4b4a3115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 11 Feb 2024 06:22:39 +0100 Subject: [PATCH 28/41] upgpkg: discord-electron 0.0.42-2: update electron * Patch app.asar to support Electron version 28 --- .SRCINFO | 6 +++--- PKGBUILD | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3dc1a38..675e335 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron - pkgdesc = Discord using system provided electron (v27) for increased security and performance + pkgdesc = Discord using system provided electron (v28) for increased security and performance pkgver = 0.0.42 - pkgrel = 1 + pkgrel = 2 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -9,7 +9,7 @@ pkgbase = discord-electron makedepends = asar makedepends = curl makedepends = python-html2text - depends = electron27 + depends = electron28 depends = libxss optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support diff --git a/PKGBUILD b/PKGBUILD index 3de3c2e..61e554f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,8 +14,8 @@ pkgname=discord-electron _pkgname=discord pkgver=0.0.42 -pkgrel=1 -_electronver=27 +pkgrel=2 +_electronver=28 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" arch=('x86_64') @@ -62,6 +62,7 @@ build() { # use system electron asar e resources/app.asar resources/app rm resources/app.asar + sed -i -e "/resourcesPath = .*;$/d" -e "s|return resourcesPath|return '/usr/lib/${_pkgname}'|" resources/app/common/paths.js sed -i -e "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" 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}|" \ From 803cfc282faff7353ec333f901bb40737e81e712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 12 Feb 2024 23:30:37 +0100 Subject: [PATCH 29/41] upgpkg: discord-electron 0.0.43-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 675e335..da13c7a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v28) for increased security and performance - pkgver = 0.0.42 - pkgrel = 2 + pkgver = 0.0.43 + pkgrel = 1 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.42/discord-0.0.42.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.43/discord-0.0.43.tar.gz source = discord-launcher.sh - sha512sums = ec11acfe3f96762cd7c230eb38e098818d9ebf32ff530f061ed3dbb5d08c3303bb4d20206510e3621f21ba89c08474367c13e7fd3c46f80b7229db37fb81db6c + sha512sums = 2780079975c144ff510973d6149b34c691d1cb0784ef4b8ac6663280263d3b10ca900c9966728579973be377f6b42f8c17ed1038fdef9b699672dddc53e08055 sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 61e554f..1980a16 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,8 +13,8 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.42 -pkgrel=2 +pkgver=0.0.43 +pkgrel=1 _electronver=28 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('ec11acfe3f96762cd7c230eb38e098818d9ebf32ff530f061ed3dbb5d08c3303bb4d20206510e3621f21ba89c08474367c13e7fd3c46f80b7229db37fb81db6c' +sha512sums=('2780079975c144ff510973d6149b34c691d1cb0784ef4b8ac6663280263d3b10ca900c9966728579973be377f6b42f8c17ed1038fdef9b699672dddc53e08055' 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') -_krisp_b2sum='7001c22b01e6f64203b0f9a0ce6d693c1fba212492a0c551befa3a875e688f2efc24ceae21c91949a5e1d813746b55931856e46450a2f203c7a29a9ef483b914' +_krisp_b2sum='f87b6004f1efa0608b4a4c5d996226bd414bd14a93a1adcb21d6a8415e1ff57b1010b76ba2d8c4c765fcb222a4625439299a56f520d5af3124111cafcfb45ec7' prepare() { # prepare launcher script From 1791100ce6fab58f55cc8883eb1c621a494e1ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 7 Mar 2024 06:50:54 +0100 Subject: [PATCH 30/41] upgpkg: discord-electron 0.0.44-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index da13c7a..9e1598e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v28) for increased security and performance - pkgver = 0.0.43 + pkgver = 0.0.44 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.43/discord-0.0.43.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.44/discord-0.0.44.tar.gz source = discord-launcher.sh - sha512sums = 2780079975c144ff510973d6149b34c691d1cb0784ef4b8ac6663280263d3b10ca900c9966728579973be377f6b42f8c17ed1038fdef9b699672dddc53e08055 + sha512sums = fece1f1ab30c089f569eb31a8990da813382ce15ec13dbe0394539921a76f3c6ac22cde98264da429e81a817f1e89861fb4185e8cc5f2875b1d103b4b245652c sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 1980a16..0fce252 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.43 +pkgver=0.0.44 pkgrel=1 _electronver=28 _electronname="electron${_electronver}" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('2780079975c144ff510973d6149b34c691d1cb0784ef4b8ac6663280263d3b10ca900c9966728579973be377f6b42f8c17ed1038fdef9b699672dddc53e08055' +sha512sums=('fece1f1ab30c089f569eb31a8990da813382ce15ec13dbe0394539921a76f3c6ac22cde98264da429e81a817f1e89861fb4185e8cc5f2875b1d103b4b245652c' 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') -_krisp_b2sum='f87b6004f1efa0608b4a4c5d996226bd414bd14a93a1adcb21d6a8415e1ff57b1010b76ba2d8c4c765fcb222a4625439299a56f520d5af3124111cafcfb45ec7' +_krisp_b2sum='2d4bfad1d64643dfa8f5643ce050affc0e3b7b7e49eba96a876fcedb797d4fb2945151664f07cf32eba89d59956c17aa3ef2699f9c0b369f697775f6853f0492' prepare() { # prepare launcher script From 5939db92e09096345681eff78cafcbe18d05231f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 12 Mar 2024 19:22:50 +0100 Subject: [PATCH 31/41] upgpkg: discord-electron 0.0.45-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9e1598e..bfcb05e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v28) for increased security and performance - pkgver = 0.0.44 + pkgver = 0.0.45 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.44/discord-0.0.44.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.45/discord-0.0.45.tar.gz source = discord-launcher.sh - sha512sums = fece1f1ab30c089f569eb31a8990da813382ce15ec13dbe0394539921a76f3c6ac22cde98264da429e81a817f1e89861fb4185e8cc5f2875b1d103b4b245652c + sha512sums = e2a64eed20267e40b1bc068166a8bfcb76211da12381ff43dfddcb250050901f0a4dd1db2f4c9ed4fc5618fcddef02a13d3cefc452801d7c8f674cf029dd7422 sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 0fce252..e93e3ca 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.44 +pkgver=0.0.45 pkgrel=1 _electronver=28 _electronname="electron${_electronver}" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('fece1f1ab30c089f569eb31a8990da813382ce15ec13dbe0394539921a76f3c6ac22cde98264da429e81a817f1e89861fb4185e8cc5f2875b1d103b4b245652c' +sha512sums=('e2a64eed20267e40b1bc068166a8bfcb76211da12381ff43dfddcb250050901f0a4dd1db2f4c9ed4fc5618fcddef02a13d3cefc452801d7c8f674cf029dd7422' 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') -_krisp_b2sum='2d4bfad1d64643dfa8f5643ce050affc0e3b7b7e49eba96a876fcedb797d4fb2945151664f07cf32eba89d59956c17aa3ef2699f9c0b369f697775f6853f0492' +_krisp_b2sum='8b2f34f116c35eaa417bf2585f7d80bd394791c01ffc4a5761670fe3c6323c9560e6357d787f29adb56c20342b5b400e1103bc28257fb0a70e207e1d2070f2d4' prepare() { # prepare launcher script From 777a3a85ee6deab70b869338f95d93e9f3dbad83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 18 Mar 2024 19:47:28 +0100 Subject: [PATCH 32/41] upgpkg: discord-electron 0.0.46-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index bfcb05e..7024594 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v28) for increased security and performance - pkgver = 0.0.45 + pkgver = 0.0.46 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-electron provides = discord conflicts = discord options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.45/discord-0.0.45.tar.gz + source = https://dl.discordapp.net/apps/linux/0.0.46/discord-0.0.46.tar.gz source = discord-launcher.sh - sha512sums = e2a64eed20267e40b1bc068166a8bfcb76211da12381ff43dfddcb250050901f0a4dd1db2f4c9ed4fc5618fcddef02a13d3cefc452801d7c8f674cf029dd7422 + sha512sums = 7f88a1f5281beb5bcdb9741ae4d984ec71c09931f31c4265e15f63b5710baff0124b38421971e45e217e20d7de14e4b5ab9e0b7da6afc3eb8ff3456643f692e8 sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index e93e3ca..35ce9fc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.45 +pkgver=0.0.46 pkgrel=1 _electronver=28 _electronname="electron${_electronver}" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('e2a64eed20267e40b1bc068166a8bfcb76211da12381ff43dfddcb250050901f0a4dd1db2f4c9ed4fc5618fcddef02a13d3cefc452801d7c8f674cf029dd7422' +sha512sums=('7f88a1f5281beb5bcdb9741ae4d984ec71c09931f31c4265e15f63b5710baff0124b38421971e45e217e20d7de14e4b5ab9e0b7da6afc3eb8ff3456643f692e8' 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') -_krisp_b2sum='8b2f34f116c35eaa417bf2585f7d80bd394791c01ffc4a5761670fe3c6323c9560e6357d787f29adb56c20342b5b400e1103bc28257fb0a70e207e1d2070f2d4' +_krisp_b2sum='7d0a17a9c43c84c87b494c79af56325b3498f1d136708167adf53a0bab67cb152e746a804e18434153b9ee0ad889af0886ff1d55e7ad5bc09e7bd9c4f3db0d10' prepare() { # prepare launcher script From 97dbd2e60b5aa8cdd9a12ce28cbfe997fdb2a7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 25 Mar 2024 20:29:29 +0100 Subject: [PATCH 33/41] upgpkg: discord-electron 0.0.47-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7024594..079d7c8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v28) for increased security and performance - pkgver = 0.0.46 + pkgver = 0.0.47 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-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 - sha512sums = 7f88a1f5281beb5bcdb9741ae4d984ec71c09931f31c4265e15f63b5710baff0124b38421971e45e217e20d7de14e4b5ab9e0b7da6afc3eb8ff3456643f692e8 + sha512sums = da08bd801210d7194f8c5de1b43948e018dfccffc7685adbc28d0710351fbf9161f77ccb1e8c0c34b13d1955f53f8dd58f15470415b05d2e22057fe7ae73c703 sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 35ce9fc..fe7eae1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.46 +pkgver=0.0.47 pkgrel=1 _electronver=28 _electronname="electron${_electronver}" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('7f88a1f5281beb5bcdb9741ae4d984ec71c09931f31c4265e15f63b5710baff0124b38421971e45e217e20d7de14e4b5ab9e0b7da6afc3eb8ff3456643f692e8' +sha512sums=('da08bd801210d7194f8c5de1b43948e018dfccffc7685adbc28d0710351fbf9161f77ccb1e8c0c34b13d1955f53f8dd58f15470415b05d2e22057fe7ae73c703' 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') -_krisp_b2sum='7d0a17a9c43c84c87b494c79af56325b3498f1d136708167adf53a0bab67cb152e746a804e18434153b9ee0ad889af0886ff1d55e7ad5bc09e7bd9c4f3db0d10' +_krisp_b2sum='61e6a4b2a28c83eb0ea99b9c5eaa4c6552f0549e004dcc86967ec560b86f2975b3023cde6bfcba8ee9fd758b07a49d9a6028096e6fe8c2d6489ea713b38049ef' prepare() { # prepare launcher script From 0350ae8c2a9b5811b4244d6a7a9d54721904fdcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 8 Apr 2024 20:50:38 +0200 Subject: [PATCH 34/41] upgpkg: discord-electron 0.0.48-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 079d7c8..bfcd37d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v28) for increased security and performance - pkgver = 0.0.47 + pkgver = 0.0.48 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-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 - sha512sums = da08bd801210d7194f8c5de1b43948e018dfccffc7685adbc28d0710351fbf9161f77ccb1e8c0c34b13d1955f53f8dd58f15470415b05d2e22057fe7ae73c703 + sha512sums = 3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index fe7eae1..144d29d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.47 +pkgver=0.0.48 pkgrel=1 _electronver=28 _electronname="electron${_electronver}" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('da08bd801210d7194f8c5de1b43948e018dfccffc7685adbc28d0710351fbf9161f77ccb1e8c0c34b13d1955f53f8dd58f15470415b05d2e22057fe7ae73c703' +sha512sums=('3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b' 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') -_krisp_b2sum='61e6a4b2a28c83eb0ea99b9c5eaa4c6552f0549e004dcc86967ec560b86f2975b3023cde6bfcba8ee9fd758b07a49d9a6028096e6fe8c2d6489ea713b38049ef' +_krisp_b2sum='5f72dcddf45a680d16a49961d1756ac26ca555a94771ff5ece43c66783f9f311948e070f57d60c562675d993b69fc4f3375dd22e2f0d1692c1094258d71bb162' prepare() { # prepare launcher script From 70d7d062d3336942288a8c1a6ec5e20e517f5e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 9 Apr 2024 12:07:40 +0200 Subject: [PATCH 35/41] upgpkg: discord-electron 0.0.48-2: update electron, mod compat * Update Electron version to 29 * Move asar to resources subfolder for Discord client mod compatibility --- .SRCINFO | 8 ++++---- PKGBUILD | 10 +++++----- discord-launcher.sh | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index bfcd37d..359e633 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron - pkgdesc = Discord using system provided electron (v28) for increased security and performance + pkgdesc = Discord using system provided electron (v29) for increased security and performance pkgver = 0.0.48 - pkgrel = 1 + pkgrel = 2 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -9,7 +9,7 @@ pkgbase = discord-electron makedepends = asar makedepends = curl makedepends = python-html2text - depends = electron28 + depends = electron29 depends = libxss optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support @@ -21,6 +21,6 @@ pkgbase = discord-electron source = https://dl.discordapp.net/apps/linux/0.0.48/discord-0.0.48.tar.gz source = discord-launcher.sh sha512sums = 3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b - sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566 + sha512sums = 9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 144d29d..acfbd3b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,8 +14,8 @@ pkgname=discord-electron _pkgname=discord pkgver=0.0.48 -pkgrel=1 -_electronver=28 +pkgrel=2 +_electronver=29 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" arch=('x86_64') @@ -36,7 +36,7 @@ optdepends=( source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') sha512sums=('3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b' - 'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566') + '9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40') _krisp_b2sum='5f72dcddf45a680d16a49961d1756ac26ca555a94771ff5ece43c66783f9f311948e070f57d60c562675d993b69fc4f3375dd22e2f0d1692c1094258d71bb162' @@ -63,7 +63,7 @@ build() { asar e resources/app.asar resources/app rm resources/app.asar sed -i -e "/resourcesPath = .*;$/d" -e "s|return resourcesPath|return '/usr/lib/${_pkgname}'|" resources/app/common/paths.js - sed -i -e "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" resources/app/app_bootstrap/buildInfo.js + sed -i -e "s|process.resourcesPath|'/usr/lib/${_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^}|" \ @@ -79,7 +79,7 @@ package() { install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname} # copy relevant data - cp -r ${_pkgname^}/resources/* "${pkgdir}"/usr/lib/$_pkgname/ + cp -r ${_pkgname^}/resources "${pkgdir}"/usr/lib/$_pkgname/ cp ${_pkgname^}/$_pkgname.png \ "${pkgdir}"/usr/share/pixmaps/$_pkgname.png cp ${_pkgname^}/$_pkgname.desktop \ diff --git a/discord-launcher.sh b/discord-launcher.sh index 55ff2a0..c63b91c 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -37,6 +37,6 @@ unset flags_file krisp_bin krisp_b2 exec /usr/lib/@ELECTRON@/electron \ - /usr/lib/@PKGNAME@/app.asar \ + /usr/lib/@PKGNAME@/resources/app.asar \ --ozone-platform-hint=auto \ "${flags[@]}" "$@" From 324e43eb6518fdca53165199cf0e707703d7ea43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 9 Apr 2024 20:16:20 +0200 Subject: [PATCH 36/41] upgpkg: discord-electron 0.0.49-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 359e633..04ac3f1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v29) for increased security and performance - pkgver = 0.0.48 - pkgrel = 2 + pkgver = 0.0.49 + pkgrel = 1 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -18,9 +18,9 @@ pkgbase = discord-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 - sha512sums = 3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b + sha512sums = b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce sha512sums = 9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index acfbd3b..49a8b40 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,8 +13,8 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.48 -pkgrel=2 +pkgver=0.0.49 +pkgrel=1 _electronver=29 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('3cffb469283de46a234f09fc42bf9963d4497ae28f71637db1230d5f8531c0d9fe00ceb6002e5f65f085a1a9511fd3ac8dd48e23431e190555d6cf8e62519f2b' +sha512sums=('b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce' '9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40') -_krisp_b2sum='5f72dcddf45a680d16a49961d1756ac26ca555a94771ff5ece43c66783f9f311948e070f57d60c562675d993b69fc4f3375dd22e2f0d1692c1094258d71bb162' +_krisp_b2sum='f0452620769e3a53c25b4cea257fb1a3d7be4740e77d583b6998f162dae1db1c63eabd7989adecb5b423421a6373b0ef164e23a7cff0edd8a5df3108bce938f4' prepare() { # prepare launcher script From ca015698fc23cbbcb3712387cbad47079033b6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 10 Apr 2024 19:50:11 +0200 Subject: [PATCH 37/41] upgpkg: discord-electron 0.0.49-2: fix error on launch * Fix mistake when I moved asar into resources subfolder --- .SRCINFO | 2 +- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 04ac3f1..4195385 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v29) for increased security and performance pkgver = 0.0.49 - pkgrel = 1 + pkgrel = 2 url = https://discord.com install = discord-electron.install arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index 49a8b40..5186a35 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,7 @@ pkgname=discord-electron _pkgname=discord pkgver=0.0.49 -pkgrel=1 +pkgrel=2 _electronver=29 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" @@ -62,7 +62,7 @@ build() { # use system electron asar e resources/app.asar resources/app rm resources/app.asar - sed -i -e "/resourcesPath = .*;$/d" -e "s|return resourcesPath|return '/usr/lib/${_pkgname}'|" resources/app/common/paths.js + sed -i -e "/resourcesPath = .*;$/d" -e "s|return resourcesPath|return '/usr/lib/${_pkgname}/resources'|" resources/app/common/paths.js sed -i -e "s|process.resourcesPath|'/usr/lib/${_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}|" \ From 1375d647a3017a3137ea208e4fe981e93cc2fd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 16 Apr 2024 22:56:54 +0200 Subject: [PATCH 38/41] upgpkg: discord-electron 0.0.50-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4195385..42f1879 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v29) for increased security and performance - pkgver = 0.0.49 - pkgrel = 2 + pkgver = 0.0.50 + pkgrel = 1 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -18,9 +18,9 @@ pkgbase = discord-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 - sha512sums = b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce + sha512sums = 8e745436645ab8aa3fae582e125224b81c8556b74b40476ead337594f377fab95684a96287c53510d3838e948a64e0397f07ca8a76f6d99cd243af6a06080873 sha512sums = 9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 5186a35..0021fe8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,8 +13,8 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.49 -pkgrel=2 +pkgver=0.0.50 +pkgrel=1 _electronver=29 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('b8b1509c31e4c237255d678bbc3e8c4d0cd8b3731050b732e149399f8dda8abb12a46ad9ea3e718016f430ebfe17f88629d0964fe1266efe8b4cd20a2f9abbce' +sha512sums=('8e745436645ab8aa3fae582e125224b81c8556b74b40476ead337594f377fab95684a96287c53510d3838e948a64e0397f07ca8a76f6d99cd243af6a06080873' '9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40') -_krisp_b2sum='f0452620769e3a53c25b4cea257fb1a3d7be4740e77d583b6998f162dae1db1c63eabd7989adecb5b423421a6373b0ef164e23a7cff0edd8a5df3108bce938f4' +_krisp_b2sum='13fc5dfed0e3a6a6cff67e9308a7c907e53ac7dc09301bd995dc4c7f470c452097df18c9c9f14f5072daabeb15bc648e7f8a483850b7738d1b8caba87b877d5d' prepare() { # prepare launcher script From a2f1891c6b8ac41406b53294a862a956c6c3768c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 21 Apr 2024 09:39:59 +0200 Subject: [PATCH 39/41] upgpkg: discord-electron 0.0.50-2: update electron * Update Electron version to 30 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 42f1879..a5dc0e8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron - pkgdesc = Discord using system provided electron (v29) for increased security and performance + pkgdesc = Discord using system provided electron (v30) for increased security and performance pkgver = 0.0.50 - pkgrel = 1 + pkgrel = 2 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -9,7 +9,7 @@ pkgbase = discord-electron makedepends = asar makedepends = curl makedepends = python-html2text - depends = electron29 + depends = electron30 depends = libxss optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support diff --git a/PKGBUILD b/PKGBUILD index 0021fe8..9de3ceb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,8 +14,8 @@ pkgname=discord-electron _pkgname=discord pkgver=0.0.50 -pkgrel=1 -_electronver=29 +pkgrel=2 +_electronver=30 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" arch=('x86_64') From 3a281d18254fbbb85bfcb493308aad0c2377aa00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 23 Apr 2024 06:55:37 +0200 Subject: [PATCH 40/41] upgpkg: discord-electron 0.0.51-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a5dc0e8..19aed40 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v30) for increased security and performance - pkgver = 0.0.50 - pkgrel = 2 + pkgver = 0.0.51 + pkgrel = 1 url = https://discord.com install = discord-electron.install arch = x86_64 @@ -18,9 +18,9 @@ pkgbase = discord-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 - sha512sums = 8e745436645ab8aa3fae582e125224b81c8556b74b40476ead337594f377fab95684a96287c53510d3838e948a64e0397f07ca8a76f6d99cd243af6a06080873 + sha512sums = b98072a64cfb593176e7e057b926fcf2d9e1a4aa555a659cebb8abe20fe463ff135a8028fd0fc36dc6c1bd40235da98c7c055c372e707cae00b882c8b0462dd9 sha512sums = 9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index 9de3ceb..acceeed 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,8 +13,8 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.50 -pkgrel=2 +pkgver=0.0.51 +pkgrel=1 _electronver=30 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('8e745436645ab8aa3fae582e125224b81c8556b74b40476ead337594f377fab95684a96287c53510d3838e948a64e0397f07ca8a76f6d99cd243af6a06080873' +sha512sums=('b98072a64cfb593176e7e057b926fcf2d9e1a4aa555a659cebb8abe20fe463ff135a8028fd0fc36dc6c1bd40235da98c7c055c372e707cae00b882c8b0462dd9' '9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40') -_krisp_b2sum='13fc5dfed0e3a6a6cff67e9308a7c907e53ac7dc09301bd995dc4c7f470c452097df18c9c9f14f5072daabeb15bc648e7f8a483850b7738d1b8caba87b877d5d' +_krisp_b2sum='80f55a743d307567516e83021681dda9100f0f8f8881e30fd539bd2c84a4825d2e4aedef6e8d403945956b5edb4c788bade6c38954e797fdd32cd6a21f2bea09' prepare() { # prepare launcher script From 80976a162c516d91d6f2e602c246dc70f280dfd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 30 Apr 2024 18:45:00 +0200 Subject: [PATCH 41/41] upgpkg: discord-electron 0.0.52-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 19aed40..cc89bf7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = discord-electron pkgdesc = Discord using system provided electron (v30) for increased security and performance - pkgver = 0.0.51 + pkgver = 0.0.52 pkgrel = 1 url = https://discord.com install = discord-electron.install @@ -18,9 +18,9 @@ pkgbase = discord-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 - sha512sums = b98072a64cfb593176e7e057b926fcf2d9e1a4aa555a659cebb8abe20fe463ff135a8028fd0fc36dc6c1bd40235da98c7c055c372e707cae00b882c8b0462dd9 + sha512sums = 42ff4b59a0dd846f06a297a1a8b5a1e28f37daa6951b4ce597d103492458c5ae90f69545908cd41238c5ed91b249ad2dd9b9cec3ef4feeb9ad22245c692eaa72 sha512sums = 9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40 pkgname = discord-electron diff --git a/PKGBUILD b/PKGBUILD index acceeed..e07fa4a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=discord-electron _pkgname=discord -pkgver=0.0.51 +pkgver=0.0.52 pkgrel=1 _electronver=30 _electronname="electron${_electronver}" @@ -35,10 +35,10 @@ optdepends=( ) source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz" 'discord-launcher.sh') -sha512sums=('b98072a64cfb593176e7e057b926fcf2d9e1a4aa555a659cebb8abe20fe463ff135a8028fd0fc36dc6c1bd40235da98c7c055c372e707cae00b882c8b0462dd9' +sha512sums=('42ff4b59a0dd846f06a297a1a8b5a1e28f37daa6951b4ce597d103492458c5ae90f69545908cd41238c5ed91b249ad2dd9b9cec3ef4feeb9ad22245c692eaa72' '9d00f9d2e05c2ba31c930c066f247954700bb0f96f2fc605e61c3973d7dacf962bf372659b71e05e5d8d4e152cc884bf12ec1fb5ecbfc4da55d22ab2591c4c40') -_krisp_b2sum='80f55a743d307567516e83021681dda9100f0f8f8881e30fd539bd2c84a4825d2e4aedef6e8d403945956b5edb4c788bade6c38954e797fdd32cd6a21f2bea09' +_krisp_b2sum='ef14b1dc86613fdac87e3cd975f020192d9fd4dd5a88e685c3edbb245e343924c75179acb7724d81ae3e5b0b7b5f52d208f3f1a9b1ccd73a7fe06e96662c4e81' prepare() { # prepare launcher script