summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKodehawa2024-04-22 13:28:40 -0400
committerKodehawa2024-04-22 13:28:40 -0400
commitcb3eef4c9f70e17bead7f9b77db62c72e19cbb6a (patch)
treed1293e7028562e8dd23fc33544f74a97aed774c8
parentdd019141285e2ae7c0a87664f78333e924c3a362 (diff)
downloadaur-cb3eef4c9f70e17bead7f9b77db62c72e19cbb6a.tar.gz
bump to latest electron
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 7 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bd0874e2eef2..d14deb199260 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
pkgbase = discord-canary-electron-bin
pkgdesc = Discord Canary (popular voice + video app) using the system provided electron for increased security and performance
pkgver = 0.0.358
- pkgrel = 1
+ pkgrel = 2
url = https://canary.discordapp.com
arch = x86_64
license = custom
makedepends = asar
- depends = electron26
+ depends = electron
depends = gtk3
depends = libnotify
depends = libxss
diff --git a/PKGBUILD b/PKGBUILD
index afe6892b952d..06f82c5814b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@
pkgname=discord-canary-electron-bin
_pkgname=discord-canary
pkgver=0.0.358
-pkgrel=1
+pkgrel=2
pkgdesc="Discord Canary (popular voice + video app) using the system provided electron for increased security and performance"
arch=('x86_64')
provides=('discord-canary')
@@ -25,7 +25,7 @@ conflicts=('discord-canary')
url='https://canary.discordapp.com'
license=('custom')
options=(!strip)
-depends=('electron26' 'gtk3' 'libnotify' 'libxss' 'glibc' 'alsa-lib' 'nspr' 'nss' 'xdg-utils' 'libcups' 'unzip')
+depends=('electron' 'gtk3' 'libnotify' 'libxss' 'glibc' 'alsa-lib' 'nspr' 'nss' 'xdg-utils' 'libcups' 'unzip')
makedepends=('asar')
optdepends=('libpulse: Pulseaudio support'
'xdg-utils: Open files'
@@ -62,6 +62,8 @@ package() {
asar e $_tarname/resources/app.asar $_tarname/resources/app
sed -i "s|process.resourcesPath|'/usr/lib/$_pkgname'|" $_tarname/resources/app/app_bootstrap/buildInfo.js
sed -i "s|exeDir,|'/usr/share/pixmaps',|" $_tarname/resources/app/app_bootstrap/autoStart/linux.js
+ # Hack for Electron 29+
+ sed -i -E "s|resourcesPath = _path.+;|resourcesPath = '/usr/share/${_pkgname}/resources';|" $_tarname/resources/app/common/paths.js
sed -i "s|module.paths = \[\]|module.paths = \[process.env.HOME + '/.config/discordcanary/$pkgver/modules'\]|" $_tarname/resources/app/app_bootstrap/requireNative.js
asar p $_tarname/resources/app $_tarname/resources/app.asar --unpack-dir '**'
rm -rf $_tarname/resources/app
@@ -71,7 +73,7 @@ package() {
# Create starter script for discord
echo "#!/bin/sh" > "$srcdir"/$_pkgname
- echo "exec electron26 /usr/lib/$_pkgname/app.asar \$@" >> "$srcdir"/$_pkgname
+ echo "exec electron /usr/lib/$_pkgname/app.asar \$@" >> "$srcdir"/$_pkgname
install -d "$pkgdir"/usr/{bin,share/{pixmaps,applications}}
install -Dm 755 $_pkgname "$pkgdir"/usr/bin/$_pkgname