From add7b077fa8bd41a44e9c10995a2211c30236f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 10 Jun 2024 20:30:20 +0200 Subject: [PATCH] upgpkg: discord 0.0.55-4: remove python dep * Check for Python availability in launcher script as it's only necessary for Krisp patcher --- .SRCINFO | 5 ++--- PKGBUILD | 6 +++--- discord-launcher.sh | 9 ++++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7446c9f..02a70ab 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord_arch_electron pkgdesc = Discord using system provided electron29 for increased security and performance pkgver = 0.0.55 - pkgrel = 3 + pkgrel = 4 url = https://discord.com install = discord_arch_electron.install arch = any @@ -10,7 +10,6 @@ pkgbase = discord_arch_electron makedepends = curl depends = electron29 depends = libxss - depends = python optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support optdepends = xdg-utils: Open files @@ -23,7 +22,7 @@ pkgbase = discord_arch_electron source = discord-launcher.sh source = krisp-patcher.py sha512sums = c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b - sha512sums = 6b7043d2e66b52a5f76b8d01813a7f4fd572b38bbd24087d618af7f2cc416c41074071fa738af5e6f31dacd0186d71eb841fa0c598bfa3ad444c5bbc911402af + sha512sums = e11a60419c6ee5944aefc1ac16a5b496518fae626627d37a5bf636975bd21b1d9b6118ec3f44e7f4283befe5fa14737ad28dc38d975967789247ac0e66c352f3 sha512sums = 3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f pkgname = discord_arch_electron diff --git a/PKGBUILD b/PKGBUILD index 7e1a185..9d904cb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ _pkgname=discord _electron=electron29 pkgname=${_pkgname}_arch_electron pkgver=0.0.55 -pkgrel=3 +pkgrel=4 pkgdesc="Discord using system provided ${_electron} for increased security and performance" arch=('any') provides=("${_pkgname}") @@ -19,7 +19,7 @@ url='https://discord.com' license=('custom') options=('!strip') install="$pkgname.install" -depends=("${_electron}" 'libxss' 'python') +depends=("${_electron}" 'libxss') makedepends=('asar' 'curl') optdepends=('libpulse: Pulseaudio support' 'libappindicator-gtk3: Systray indicator support' @@ -30,7 +30,7 @@ source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.ta 'discord-launcher.sh' 'krisp-patcher.py') # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py sha512sums=('c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b' - '6b7043d2e66b52a5f76b8d01813a7f4fd572b38bbd24087d618af7f2cc416c41074071fa738af5e6f31dacd0186d71eb841fa0c598bfa3ad444c5bbc911402af' + 'e11a60419c6ee5944aefc1ac16a5b496518fae626627d37a5bf636975bd21b1d9b6118ec3f44e7f4283befe5fa14737ad28dc38d975967789247ac0e66c352f3' '3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f') prepare() { diff --git a/discord-launcher.sh b/discord-launcher.sh index 81bc714..02a3479 100755 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -14,9 +14,12 @@ declare -l PATCH_KRISP flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/${name}-flags.conf" krisp_bin="${DISCORD_USER_DATA_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/${name}}/${ver}/modules/${name}_krisp/${name}_krisp.node" -if [[ "${PATCH_KRISP:-}" == true ]] && [[ -w "${krisp_bin}" ]] && python -c "import capstone; import elftools" &> /dev/null; then - # Patch Krisp binary to ignore signature check - python /usr/share/${name}/krisp-patcher.py "${krisp_bin}" +if [[ "${PATCH_KRISP:-}" == true ]] && [[ -w "${krisp_bin}" ]]; then + if hash python &> /dev/null && python -c 'import capstone; import elftools' &> /dev/null; then + # Patch Krisp binary to ignore signature check + echo -n 'Running Krisp patcher... ' + python /usr/share/${name}/krisp-patcher.py "${krisp_bin}" + fi fi if [[ -r "${flags_file}" ]]; then