upgpkg: sqlectron-gui 1.30.0

3 files changed, 30 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 513275fd0dbd..3019cb10a361 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = sqlectron-gui
 	pkgdesc = A simple and lightweight SQL client with cross database and platform support
-	pkgver = 1.29.0
+	pkgver = 1.30.0
 	pkgrel = 1
 	url = https://sqlectron.github.io/
 	arch = x86_64
 	license = MIT
-	makedepends = npm
 	makedepends = asar
-	depends = electron
-	source = https://github.com/sqlectron/sqlectron-gui/archive/v1.29.0.tar.gz
+	makedepends = libsass
+	makedepends = nodejs-lts-carbon
+	makedepends = npm
+	depends = electron2
+	source = https://github.com/sqlectron/sqlectron-gui/archive/v1.30.0.tar.gz
 	source = sqlectron-gui.sh
 	source = sqlectron-gui.desktop
-	sha1sums = 86d1a0be812eb636ba09eafadcf95c494423bd82
-	sha1sums = e0e7c83e47f368543a3c4505cf035d570e0d645b
+	sha1sums = 467869f0678cc0e99ca268c9c3d1aafc565c130f
+	sha1sums = 6ad81d34e04c1760d4be27f0e4ec25ff5267deca
 	sha1sums = b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f
 
 pkgname = sqlectron-gui
diff --git a/PKGBUILD b/PKGBUILD
index fde60fb876c8..341ce251d96f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,25 @@
 # Contributor: Edison Ibañez <edison@opmbx.org>
 
 pkgname=sqlectron-gui
-pkgver=1.29.0
+pkgver=1.30.0
 pkgrel=1
 pkgdesc="A simple and lightweight SQL client with cross database and platform support"
 arch=('x86_64')
 url="https://sqlectron.github.io/"
 license=('MIT')
-depends=('electron')
-makedepends=('npm' 'asar')
+depends=('electron2')
+makedepends=(
+	'asar'
+	'libsass'
+	'nodejs-lts-carbon'
+	'npm'
+)
 source=("https://github.com/sqlectron/sqlectron-gui/archive/v${pkgver}.tar.gz"
         'sqlectron-gui.sh'
 		'sqlectron-gui.desktop')
 
-sha1sums=('86d1a0be812eb636ba09eafadcf95c494423bd82'
-          'e0e7c83e47f368543a3c4505cf035d570e0d645b'
+sha1sums=('467869f0678cc0e99ca268c9c3d1aafc565c130f'
+          '6ad81d34e04c1760d4be27f0e4ec25ff5267deca'
           'b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f')
 
 prepare() {
@@ -23,6 +28,7 @@ prepare() {
 
 	# remove extra dependencies
 	sed -i package.json \
+		-e '/"node-sass":/  s/3\.4\.2/4.11.0/' \
 		-e '/"postinstall":/            d' \
 		-e '/"electron":/               d' \
 		-e '/"electron-builder":/       d' \
@@ -35,8 +41,14 @@ prepare() {
 build() {
 	cd "$pkgname-$pkgver"
 
-	CXXFLAGS+=" -I/usr/include/node" \
-		npm install --build-from-source --nodedir=/usr/include/node
+	export SASS_FORCE_BUILD=1
+	export LIBSASS_EXT=auto
+	export npm_config_optional=false
+
+	npm install \
+		--build-from-source \
+		--nodedir=/usr
+
 	npm run compile:browser
 	npm run compile:renderer
 
@@ -48,9 +60,9 @@ build() {
 	npm install \
 		--production \
 		--build-from-source \
-		--nodedir=/usr/lib/electron/node \
+		--nodedir=/usr/lib/electron2/node \
 		--runtime=electron \
-		--target=$(electron -v)
+		--target=$(</usr/lib/electron2/version)
 
 	popd
 	asar p app app.asar
diff --git a/sqlectron-gui.sh b/sqlectron-gui.sh
index c4a5ba8fe6c9..0370598e24fb 100644
--- a/sqlectron-gui.sh
+++ b/sqlectron-gui.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/sh
 
-exec electron /usr/lib/sqlectron-gui/app.asar "$@"
+exec electron2 /usr/lib/sqlectron-gui/app.asar "$@"