summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2020-06-02 15:49:19 +0200
committerDaniel Peukert2020-06-02 15:49:19 +0200
commit4e8fe50ac847932523e9e0f81d8dba912296f286 (patch)
tree982ae1211d7e4ab1f0c40e4a977a36a500f75a0e
parent5659b8ae5245f3b11bf67685eddca00284e83bc6 (diff)
downloadaur-4e8fe50ac847932523e9e0f81d8dba912296f286.tar.gz
Switched ferdi to electron8-bin
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
2 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4a64536c9687..c7a7fb070c9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ferdi-git
pkgdesc = A messaging browser that allows you to combine your favorite messaging services into one application - git version
- pkgver = 5.5.0.gm.2.r26.gea4e0c87
- pkgrel = 2
+ pkgver = 5.5.0.gm.2.r44.g6999476b
+ pkgrel = 1
url = https://getferdi.com
arch = x86_64
arch = i686
@@ -12,7 +12,7 @@ pkgbase = ferdi-git
makedepends = npm
makedepends = python
makedepends = python2
- depends = electron
+ depends = electron8-bin
depends = libxkbfile
provides = ferdi
conflicts = ferdi
diff --git a/PKGBUILD b/PKGBUILD
index 493378a02c16..538a9d79a8ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@
# Contributor: Pieter Goetschalckx <3.14.e.ter <at> gmail <dot> com>
_pkgname='ferdi'
pkgname="$_pkgname-git"
-pkgver='5.5.0.gm.2.r26.gea4e0c87'
-pkgrel='2'
+pkgver='5.5.0.gm.2.r44.g6999476b'
+pkgrel='1'
pkgdesc='A messaging browser that allows you to combine your favorite messaging services into one application - git version'
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')
provides=("$_pkgname")
conflicts=("$_pkgname")
@@ -54,7 +54,7 @@ prepare() {
git submodule update --init --recursive
# Set system Electron version for ABI compatibility
- sed -E -i 's|("electron": ").*"|\1'"$(cat '/usr/lib/electron/version')"'"|' 'package.json'
+ sed -E -i 's|("electron": ").*"|\1'"$(cat '/usr/lib/electron8/version')"'"|' 'package.json'
# Prevent Ferdi from being launched in dev mode
sed -i "s|import isDevMode from 'electron-is-dev'|const isDevMode = false|g" 'src/index.js' 'src/config.js'
@@ -81,7 +81,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() {
@@ -100,7 +100,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"