From 20605b3001597ac307551b2e7e03d8bdec8e3cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 10 Jun 2024 20:33:44 +0200 Subject: [PATCH] upgpkg: discord-electron-openasar 0.0.55+827-3: remove python dep * Check for Python availability in launcher script as it's only necessary for Krisp patcher --- discord-electron-openasar/.SRCINFO | 5 ++--- discord-electron-openasar/PKGBUILD | 6 +++--- discord-electron-openasar/discord-launcher.sh | 11 +++++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/discord-electron-openasar/.SRCINFO b/discord-electron-openasar/.SRCINFO index 7f10c2b..ccb3da7 100644 --- a/discord-electron-openasar/.SRCINFO +++ b/discord-electron-openasar/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord-electron-openasar pkgdesc = Discord packaged with OpenAsar using system provided electron (v30) for increased security and performance pkgver = 0.0.55+827 - pkgrel = 2 + pkgrel = 3 url = https://discord.com install = discord-electron-openasar.install arch = x86_64 @@ -14,7 +14,6 @@ pkgbase = discord-electron-openasar depends = electron30 depends = libxss depends = unzip - depends = python optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support optdepends = xdg-utils: Open files @@ -28,7 +27,7 @@ pkgbase = discord-electron-openasar source = krisp-patcher.py source = git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d sha512sums = c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b - sha512sums = 100fd089bd17dce7cbb05d4dd757cfa438e713edac02814d127a944814017e3e55afa28331826a420211544b1cd796255fe8bd92b9e07c9d17b12528a8099b8c + sha512sums = 4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666 sha512sums = 3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f sha512sums = 055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849 diff --git a/discord-electron-openasar/PKGBUILD b/discord-electron-openasar/PKGBUILD index 617169c..9a2c749 100644 --- a/discord-electron-openasar/PKGBUILD +++ b/discord-electron-openasar/PKGBUILD @@ -4,7 +4,7 @@ pkgname=discord-electron-openasar _pkgname=discord pkgver=0.0.55+827 _pkgver=${pkgver%%+*} -pkgrel=2 +pkgrel=3 _electronver=30 _electronname="electron${_electronver}" pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance" @@ -15,7 +15,7 @@ url='https://discord.com' license=('custom') options=('!strip') install="$pkgname.install" -depends=("${_electronname}" 'libxss' 'unzip' 'python') +depends=("${_electronname}" 'libxss' 'unzip') makedepends=('git' 'asar' 'nodejs' 'curl' 'python-html2text') optdepends=( 'libpulse: Pulseaudio support' @@ -29,7 +29,7 @@ source=("https://dl.discordapp.net/apps/linux/${_pkgver}/${_pkgname}-${_pkgver}. 'krisp-patcher.py' # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py "git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d") sha512sums=('c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b' - '100fd089bd17dce7cbb05d4dd757cfa438e713edac02814d127a944814017e3e55afa28331826a420211544b1cd796255fe8bd92b9e07c9d17b12528a8099b8c' + '4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666' '3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f' '055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849') diff --git a/discord-electron-openasar/discord-launcher.sh b/discord-electron-openasar/discord-launcher.sh index 58c27ba..87c66fb 100644 --- a/discord-electron-openasar/discord-launcher.sh +++ b/discord-electron-openasar/discord-launcher.sh @@ -10,15 +10,18 @@ declare -l PATCH_KRISP flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf" krisp_bin="${DISCORD_USER_DATA_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@}/@PKGVER@/modules/@PKGNAME@_krisp/@PKGNAME@_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/lib/@PKGNAME@/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/lib/@PKGNAME@/krisp-patcher.py "${krisp_bin}" + fi fi if [[ -r "${flags_file}" ]]; then # Replacing because old flag does not work if [[ -w "${flags_file}" ]] && grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then - sed -i "s|--ignore-gpu-blacklist|--ignore-gpu-blocklist|" "${flags_file}" + sed -i 's|--ignore-gpu-blacklist|--ignore-gpu-blocklist|' "${flags_file}" fi mapfile -t < "${flags_file}" fi