Compare commits

..

2 commits

Author SHA1 Message Date
f4f0b06930
upgpkg: discord-electron-openasar 0.0.42+827-2: fix resource path
* Patch app.asar to use correct resource path after latest Electron update
2024-02-11 06:25:22 +01:00
9250f543bc
upgpkg: discord-electron 0.0.42-2: update electron
* Patch app.asar to support Electron version 28
2024-02-11 06:22:39 +01:00
4 changed files with 9 additions and 7 deletions

View file

@ -1,7 +1,7 @@
pkgbase = discord-electron-openasar pkgbase = discord-electron-openasar
pkgdesc = Discord packaged with OpenAsar using system provided electron (v28) for increased security and performance pkgdesc = Discord packaged with OpenAsar using system provided electron (v28) for increased security and performance
pkgver = 0.0.42+827 pkgver = 0.0.42+827
pkgrel = 1 pkgrel = 2
url = https://discord.com url = https://discord.com
install = discord-electron-openasar.install install = discord-electron-openasar.install
arch = x86_64 arch = x86_64

View file

@ -8,7 +8,7 @@ pkgname=discord-electron-openasar
_pkgname=discord _pkgname=discord
pkgver=0.0.42+827 pkgver=0.0.42+827
_pkgver=${pkgver%%+*} _pkgver=${pkgver%%+*}
pkgrel=1 pkgrel=2
_electronver=28 _electronver=28
_electronname="electron${_electronver}" _electronname="electron${_electronver}"
pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance" pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance"
@ -63,6 +63,7 @@ build() {
# pack openasar # pack openasar
sed -i -e "s|nightly|nightly-$(git rev-parse HEAD | cut -c 1-7)|" src/index.js sed -i -e "s|nightly|nightly-$(git rev-parse HEAD | cut -c 1-7)|" src/index.js
sed -i -e "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" src/utils/buildInfo.js
sed -i -e "s|^Exec=\${exec}$|Exec=/usr/bin/${_pkgname}|" \ sed -i -e "s|^Exec=\${exec}$|Exec=/usr/bin/${_pkgname}|" \
-e "s|^Name=\${basename(exec)}$|Name=${_pkgname^}|" src/autoStart.js -e "s|^Name=\${basename(exec)}$|Name=${_pkgname^}|" src/autoStart.js
node scripts/strip.js node scripts/strip.js

View file

@ -1,7 +1,7 @@
pkgbase = discord-electron 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 pkgver = 0.0.42
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
@ -9,7 +9,7 @@ pkgbase = discord-electron
makedepends = asar makedepends = asar
makedepends = curl makedepends = curl
makedepends = python-html2text makedepends = python-html2text
depends = electron27 depends = electron28
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

@ -14,8 +14,8 @@
pkgname=discord-electron pkgname=discord-electron
_pkgname=discord _pkgname=discord
pkgver=0.0.42 pkgver=0.0.42
pkgrel=1 pkgrel=2
_electronver=27 _electronver=28
_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')
@ -62,6 +62,7 @@ build() {
# use system electron # use system electron
asar e resources/app.asar resources/app asar e resources/app.asar resources/app
rm resources/app.asar 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/app/app_bootstrap/buildInfo.js
sed -i -e "/^const appName/d" -e "/^const exePath/d" -e "/^const exeDir/d" -e "/^const iconPath/d" \ 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|^Exec=\${exePath}$|Exec=/usr/bin/${_pkgname}|" \