summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD14
-rw-r--r--remove-mac-screen-capture-permissions.diff4
3 files changed, 13 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e34fb281b3d6..7cfda963c480 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.6.0.beta.5.r124.ge3898e2f
- pkgrel = 2
+ pkgver = 5.6.0.beta.5.r136.gcced2638
+ pkgrel = 1
url = https://getferdi.com
arch = x86_64
arch = i686
@@ -12,7 +12,7 @@ pkgbase = ferdi-git
makedepends = npm6
makedepends = python
makedepends = python2
- depends = electron10
+ depends = electron11
depends = libxkbfile
provides = ferdi
conflicts = ferdi
@@ -25,6 +25,6 @@ pkgbase = ferdi-git
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 7eb846fe8242c78afcdef9c8e1fbce6fdcf100f59da85fee83a99690a57f60ea
- sha256sums = 7b969f94dfbdcbdf813118258a72963e7c472c92245560d3c4b8cea472e99737
+ sha256sums = 306321dfaa62710bff49fb289d192fea24b369f1d34845cc8db9d626b4b9b68f
pkgname = ferdi-git
diff --git a/PKGBUILD b/PKGBUILD
index 1ff53c218b13..39aab9757e41 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.beta.5.r124.ge3898e2f'
-pkgrel='2'
+pkgver='5.6.0.beta.5.r136.gcced2638'
+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=('electron10' 'libxkbfile')
+depends=('electron11' 'libxkbfile')
makedepends=('git' 'npm6' 'python' 'python2')
provides=("$_pkgname")
conflicts=("$_pkgname")
@@ -26,7 +26,7 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'7eb846fe8242c78afcdef9c8e1fbce6fdcf100f59da85fee83a99690a57f60ea'
- '7b969f94dfbdcbdf813118258a72963e7c472c92245560d3c4b8cea472e99737')
+ '306321dfaa62710bff49fb289d192fea24b369f1d34845cc8db9d626b4b9b68f')
_sourcedirectory="$pkgname"
_homedirectory="$pkgname-home"
@@ -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/electron10/version')"'"|' 'package.json'
+ sed -E -i 's|("electron": ").*"|\1'"$(cat '/usr/lib/electron11/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'
@@ -90,7 +90,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/electron10' -c.electronVersion="$(cat '/usr/lib/electron10/version')"
+ NODE_ENV='production' HOME="$srcdir/$_homedirectory" npx electron-builder --linux dir "--$_electronbuilderarch" -c.electronDist='/usr/lib/electron11' -c.electronVersion="$(cat '/usr/lib/electron11/version')"
}
package() {
@@ -109,7 +109,7 @@ package() {
install -dm755 "$pkgdir/usr/bin/"
cat << EOF > "$pkgdir/usr/bin/$_pkgname"
#!/bin/sh
-NODE_ENV=production exec electron10 '/usr/lib/$_pkgname/app.asar' "\$@"
+NODE_ENV=production exec electron11 '/usr/lib/$_pkgname/app.asar' "\$@"
EOF
chmod +x "$pkgdir/usr/bin/$_pkgname"
diff --git a/remove-mac-screen-capture-permissions.diff b/remove-mac-screen-capture-permissions.diff
index a724f5ef8f33..d264fdd29a20 100644
--- a/remove-mac-screen-capture-permissions.diff
+++ b/remove-mac-screen-capture-permissions.diff
@@ -10,13 +10,13 @@ index 7091dfb7..7400d348 100644
- ./assets/images/taskbar
\ No newline at end of file
diff --git a/package.json b/package.json
-index 63dabe5b..4c80e823 100644
+index 2eafe780..510356f4 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,6 @@
"hex-to-rgba": "1.0.2",
"jsonwebtoken": "8.5.1",
- "lodash": "^4.17.4",
+ "lodash": "4.17.21",
- "mac-screen-capture-permissions": "1.1.0",
"macos-version": "5.2.0",
"marked": "0.7.0",