summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2020-04-27 09:36:46 +0200
committerDaniel Peukert2020-04-27 09:36:46 +0200
commita27d7b17b3afd4dad6e229fffb4af5968b316def (patch)
treedbb5e9efd76f090c108ccf4c21576182e61a578f
parent81e341dae823caf8ceeae47188e15419903d0788 (diff)
downloadaur-a27d7b17b3afd4dad6e229fffb4af5968b316def.tar.gz
Fixed ferdi node-sass version
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
2 files changed, 9 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 560cb6d5474c..b4a018e63b55 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 = 1
+ pkgrel = 2
url = https://getferdi.com
arch = x86_64
arch = i686
@@ -13,9 +13,9 @@ pkgbase = ferdi
makedepends = python
depends = electron
depends = libxkbfile
- source = ferdi-5.5.0-1.tar.gz::https://github.com/getferdi/ferdi/archive/v5.5.0.tar.gz
- source = ferdi-5.5.0-1-recipes.tar.gz::https://github.com/getferdi/recipes/archive/3054fd4c362b5be81b5cdd48535a0e7078fcd0a6.tar.gz
- source = ferdi-5.5.0-1-internal-server.tar.gz::https://github.com/getferdi/internal-server/archive/95ae59926dbd88d55a5377be997558a9e112ab49.tar.gz
+ source = ferdi-5.5.0-2.tar.gz::https://github.com/getferdi/ferdi/archive/v5.5.0.tar.gz
+ source = ferdi-5.5.0-2-recipes.tar.gz::https://github.com/getferdi/recipes/archive/3054fd4c362b5be81b5cdd48535a0e7078fcd0a6.tar.gz
+ source = ferdi-5.5.0-2-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 eea7aa2651c7..c0e3ff01f7f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ferdi'
pkgver='5.5.0'
_recipescommit='3054fd4c362b5be81b5cdd48535a0e7078fcd0a6'
_internalservercommit='95ae59926dbd88d55a5377be997558a9e112ab49'
-pkgrel='1'
+pkgrel='2'
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"
@@ -38,6 +38,9 @@ prepare() {
# Set system Electron version for ABI compatibility
sed -E -i -e 's|("electron": ").*"|\1'"$(cat '/usr/lib/electron/version')"'"|' 'package.json'
+ # Set node-sass version for node 14 compatibility
+ sed -E -i 's|("node-sass": ").*"|\14.14.0"|' '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'
sed -i "s|import isDev from 'electron-is-dev'|const isDev = false|g" 'src/environment.js'
@@ -50,6 +53,7 @@ prepare() {
export XDG_CACHE_HOME="$srcdir/$pkgname-$pkgver-$pkgrel-cache"
export npm_config_devdir="$srcdir/$pkgname-$pkgver-$pkgrel-npm-dev"
export npm_config_cache="$srcdir/$pkgname-$pkgver-$pkgrel-npm-cache"
+ # export NODE_GYP_FORCE_PYTHON='/usr/bin/python' - when https://github.com/sass/node-sass/issues/2877 is fixed
npx lerna bootstrap
}