summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2021-09-07 11:06:45 +0200
committerDaniel Peukert2021-09-07 11:06:45 +0200
commit0cc362ab2bfb7f9cedcc5571da7c898b4b8b65e0 (patch)
tree2d2aa9b72ebecb5c0d506a5440ecb8573b3d9543
parent0cfaa2de568a0bf2a9fc2b96b9547b479ae81ecb (diff)
downloadaur-0cc362ab2bfb7f9cedcc5571da7c898b4b8b65e0.tar.gz
Update electron version for ferdi
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
2 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bfd580ae0250..7a770e1baf58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ferdi-git
pkgdesc = A messaging browser that allows you to combine your favorite messaging services into one application - git version
- pkgver = 5.6.0.r5.g1613fe66
+ pkgver = 5.6.1.nightly.52.r2.ge6ecd48a
pkgrel = 1
url = https://getferdi.com
arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = ferdi-git
makedepends = npm6
makedepends = python
makedepends = python2
- depends = electron
+ depends = electron13
depends = libxkbfile
provides = ferdi
conflicts = ferdi
diff --git a/PKGBUILD b/PKGBUILD
index 0d5330c52aa7..bf4e0217c891 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.6.0.r5.g1613fe66'
+pkgver='5.6.1.nightly.52.r2.ge6ecd48a'
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=('electron13' 'libxkbfile')
makedepends=('git' 'nodejs>=14.0.0' 'npm6' 'python' 'python2')
provides=("$_pkgname")
conflicts=("$_pkgname")
@@ -56,7 +56,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/electron13/version')"'"|' 'package.json'
# Loosen node version restriction
sed -E -i 's|("node": ").*"|\1'"$(node --version | sed 's/^v//')"'"|' 'package.json'
@@ -86,7 +86,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/electron13' -c.electronVersion="$(cat '/usr/lib/electron13/version')"
}
package() {
@@ -105,7 +105,7 @@ package() {
install -dm755 "$pkgdir/usr/bin/"
cat << EOF > "$pkgdir/usr/bin/$_pkgname"
#!/bin/sh
-NODE_ENV=production ELECTRON_IS_DEV=0 exec electron '/usr/lib/$_pkgname/app.asar' "\$@"
+NODE_ENV=production ELECTRON_IS_DEV=0 exec electron13 '/usr/lib/$_pkgname/app.asar' "\$@"
EOF
chmod +x "$pkgdir/usr/bin/$_pkgname"