Switched ferdi to electron8-bin

2 files changed, 10 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4938e731aa4f..b3b17f6c5be3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ferdi
 	pkgdesc = A messaging browser that allows you to combine your favorite messaging services into one application
 	pkgver = 5.5.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://getferdi.com
 	arch = x86_64
 	arch = i686
@@ -12,11 +12,11 @@ pkgbase = ferdi
 	makedepends = npm
 	makedepends = python
 	makedepends = python2
-	depends = electron
+	depends = electron8-bin
 	depends = libxkbfile
-	source = ferdi-5.5.0-4.tar.gz::https://github.com/getferdi/ferdi/archive/v5.5.0.tar.gz
-	source = ferdi-5.5.0-4-recipes.tar.gz::https://github.com/getferdi/recipes/archive/3054fd4c362b5be81b5cdd48535a0e7078fcd0a6.tar.gz
-	source = ferdi-5.5.0-4-internal-server.tar.gz::https://github.com/getferdi/internal-server/archive/95ae59926dbd88d55a5377be997558a9e112ab49.tar.gz
+	source = ferdi-5.5.0-5.tar.gz::https://github.com/getferdi/ferdi/archive/v5.5.0.tar.gz
+	source = ferdi-5.5.0-5-recipes.tar.gz::https://github.com/getferdi/recipes/archive/3054fd4c362b5be81b5cdd48535a0e7078fcd0a6.tar.gz
+	source = ferdi-5.5.0-5-internal-server.tar.gz::https://github.com/getferdi/internal-server/archive/95ae59926dbd88d55a5377be997558a9e112ab49.tar.gz
 	source = fix-autostart-path.diff
 	sha256sums = 319b02b565e34720c8ccefdb08cfe37219304c002e469fdf1a15c8971b573fc3
 	sha256sums = b72d06155d20292d90c5b9fc05f83b318080abf858669ca2c1a2a539890c3427
diff --git a/PKGBUILD b/PKGBUILD
index 77119d9a716e..65498d2930fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,12 @@ pkgname='ferdi'
 pkgver='5.5.0'
 _recipescommit='3054fd4c362b5be81b5cdd48535a0e7078fcd0a6'
 _internalservercommit='95ae59926dbd88d55a5377be997558a9e112ab49'
-pkgrel='4'
+pkgrel='5'
 pkgdesc='A messaging browser that allows you to combine your favorite messaging services into one application'
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url="https://get$pkgname.com"
 license=('Apache')
-depends=('electron' 'libxkbfile')
+depends=('electron8-bin' 'libxkbfile')
 makedepends=('git' 'npm' 'python' 'python2')
 source=(
 	"$pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/get$pkgname/$pkgname/archive/v$pkgver.tar.gz"
@@ -52,7 +52,7 @@ prepare() {
 	mv "../internal-server-$_internalservercommit/" 'src/internal-server/'
 
 	# Set system Electron version for ABI compatibility
-	sed -E -i -e 's|("electron": ").*"|\1'"$(cat '/usr/lib/electron/version')"'"|' 'package.json'
+	sed -E -i -e 's|("electron": ").*"|\1'"$(cat '/usr/lib/electron8/version')"'"|' 'package.json'
 
 	# Set node-sass version for node 14 compatibility
 	sed -E -i 's|("node-sass": ").*"|\14.14.0"|' 'package.json'
@@ -77,7 +77,7 @@ build() {
 	cd "$srcdir/$_sourcedirectory/"
 
 	NODE_ENV='production' HOME="$srcdir/$_homedirectory" npx gulp build
-	NODE_ENV='production' HOME="$srcdir/$_homedirectory" npx electron-builder --linux dir "--$_electronbuilderarch" -c.electronDist='/usr/lib/electron' -c.electronVersion="$(cat '/usr/lib/electron/version')"
+	NODE_ENV='production' HOME="$srcdir/$_homedirectory" npx electron-builder --linux dir "--$_electronbuilderarch" -c.electronDist='/usr/lib/electron8' -c.electronVersion="$(cat '/usr/lib/electron8/version')"
 }
 
 package() {
@@ -96,7 +96,7 @@ package() {
 	install -dm755 "$pkgdir/usr/bin/"
 	cat << EOF > "$pkgdir/usr/bin/$pkgname"
 #!/bin/sh
-NODE_ENV=production exec electron '/usr/lib/$pkgname/app.asar' "\$@"
+NODE_ENV=production exec electron8 '/usr/lib/$pkgname/app.asar' "\$@"
 EOF
 	chmod +x "$pkgdir/usr/bin/$pkgname"