From fb248ffc24f8140cf428b86a780a1addc32cd059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 30 Jun 2024 20:50:37 +0200 Subject: [PATCH] upgpkg: discord-electron 0.0.58-2: update electron, remove makedep * Update Electron version to 31 again as electron issue #42560 is fixed with 31.1.0 * Remove unnecessary make dependency and keep license files in html format --- discord-electron/.SRCINFO | 7 +++---- discord-electron/PKGBUILD | 14 +++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/discord-electron/.SRCINFO b/discord-electron/.SRCINFO index 6aad4da..3f7a570 100644 --- a/discord-electron/.SRCINFO +++ b/discord-electron/.SRCINFO @@ -1,15 +1,14 @@ pkgbase = discord-electron - pkgdesc = Discord using system provided electron (v30) for increased security and performance + pkgdesc = Discord using system provided electron (v31) for increased security and performance pkgver = 0.0.58 - 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 = electron30 + depends = electron31 depends = libxss optdepends = libpulse: Pulseaudio support optdepends = libappindicator-gtk3: Systray indicator support diff --git a/discord-electron/PKGBUILD b/discord-electron/PKGBUILD index e22d3c4..f9501e1 100644 --- a/discord-electron/PKGBUILD +++ b/discord-electron/PKGBUILD @@ -1,8 +1,8 @@ pkgname=discord-electron _pkgname=discord pkgver=0.0.58 -pkgrel=1 -_electronver=30 +pkgrel=2 +_electronver=31 _electronname="electron${_electronver}" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" arch=('x86_64') @@ -13,7 +13,7 @@ license=('custom') options=('!strip') install="$pkgname.install" depends=("${_electronname}" 'libxss') -makedepends=('asar' 'curl' 'python-html2text') +makedepends=('asar' 'curl') optdepends=( 'libpulse: Pulseaudio support' 'libappindicator-gtk3: Systray indicator support' @@ -39,8 +39,8 @@ prepare() { 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 - curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md + curl -o LICENSE.html https://discord.com/terms + curl -o OSS-LICENSES.html https://discord.com/licenses } build() { @@ -78,6 +78,6 @@ package() { install -Dm 644 krisp-patcher.py "${pkgdir}"/usr/lib/${_pkgname}/ # install licenses - install -Dm 644 LICENSE.md "${pkgdir}"/usr/share/licenses/$_pkgname/LICENSE.md - install -Dm 644 OSS-LICENSES.md "${pkgdir}"/usr/share/licenses/$_pkgname/OSS-LICENSES.md + install -Dm 644 LICENSE.html "${pkgdir}"/usr/share/licenses/$_pkgname/LICENSE.html + install -Dm 644 OSS-LICENSES.html "${pkgdir}"/usr/share/licenses/$_pkgname/OSS-LICENSES.html }