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
This commit is contained in:
Manuel 2024-06-30 20:50:37 +02:00
parent b0221e873a
commit fb248ffc24
Signed by: Manuel
GPG key ID: 4085037435E1F07A
2 changed files with 10 additions and 11 deletions

View file

@ -1,15 +1,14 @@
pkgbase = discord-electron 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 pkgver = 0.0.58
pkgrel = 1 pkgrel = 2
url = https://discord.com url = https://discord.com
install = discord-electron.install install = discord-electron.install
arch = x86_64 arch = x86_64
license = custom license = custom
makedepends = asar makedepends = asar
makedepends = curl makedepends = curl
makedepends = python-html2text depends = electron31
depends = electron30
depends = libxss depends = libxss
optdepends = libpulse: Pulseaudio support optdepends = libpulse: Pulseaudio support
optdepends = libappindicator-gtk3: Systray indicator support optdepends = libappindicator-gtk3: Systray indicator support

View file

@ -1,8 +1,8 @@
pkgname=discord-electron pkgname=discord-electron
_pkgname=discord _pkgname=discord
pkgver=0.0.58 pkgver=0.0.58
pkgrel=1 pkgrel=2
_electronver=30 _electronver=31
_electronname="electron${_electronver}" _electronname="electron${_electronver}"
pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance" pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance"
arch=('x86_64') arch=('x86_64')
@ -13,7 +13,7 @@ license=('custom')
options=('!strip') options=('!strip')
install="$pkgname.install" install="$pkgname.install"
depends=("${_electronname}" 'libxss') depends=("${_electronname}" 'libxss')
makedepends=('asar' 'curl' 'python-html2text') makedepends=('asar' 'curl')
optdepends=( optdepends=(
'libpulse: Pulseaudio support' 'libpulse: Pulseaudio support'
'libappindicator-gtk3: Systray indicator support' 'libappindicator-gtk3: Systray indicator support'
@ -39,8 +39,8 @@ prepare() {
sed -i -e "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 # create the license files
curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md curl -o LICENSE.html https://discord.com/terms
curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md curl -o OSS-LICENSES.html https://discord.com/licenses
} }
build() { build() {
@ -78,6 +78,6 @@ package() {
install -Dm 644 krisp-patcher.py "${pkgdir}"/usr/lib/${_pkgname}/ install -Dm 644 krisp-patcher.py "${pkgdir}"/usr/lib/${_pkgname}/
# install licenses # install licenses
install -Dm 644 LICENSE.md "${pkgdir}"/usr/share/licenses/$_pkgname/LICENSE.md install -Dm 644 LICENSE.html "${pkgdir}"/usr/share/licenses/$_pkgname/LICENSE.html
install -Dm 644 OSS-LICENSES.md "${pkgdir}"/usr/share/licenses/$_pkgname/OSS-LICENSES.md install -Dm 644 OSS-LICENSES.html "${pkgdir}"/usr/share/licenses/$_pkgname/OSS-LICENSES.html
} }