Switch to upstream release package && build:upgrade v1.35.0 to v1.36.0

3 files changed, 18 insertions, 104 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42c3ca9c7731..599ef32d1eca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,12 @@
 pkgbase = sqlectron-gui
 	pkgdesc = A simple and lightweight SQL client with cross database and platform support
-	pkgver = 1.35.0
+	pkgver = 1.36.0
 	pkgrel = 1
 	url = https://sqlectron.github.io/
 	arch = x86_64
 	license = MIT
-	makedepends = asar
-	makedepends = git
-	makedepends = libsass
-	makedepends = npm
-	makedepends = python2
-	depends = electron9
-	source = git+https://github.com/sqlectron/sqlectron-gui.git#tag=v1.35.0
-	source = sqlectron-gui.desktop
-	sha1sums = SKIP
-	sha1sums = b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f
-
+	depends = electron
+	source = git+https://github.com/sqlectron/sqlectron-gui.git#tag=v1.36.0
+	sha256sums = 13c91f0ab6e72217be221d5f61f5e277f0c3d01c2cc23011c46426c898593c24
 pkgname = sqlectron-gui
 
diff --git a/PKGBUILD b/PKGBUILD
index dfaed08f8db1..0c1b5d93bbd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,96 +1,27 @@
-# Maintainer: surefire@cryptomile.net
+# Maintainer: JinguTech <xiuluo.android at gmail dot com>
 # Contributor: Edison Ibañez <edison@opmbx.org>
 
 pkgname=sqlectron-gui
-_electron=electron9
-pkgver=1.35.0
+pkgver=1.36.0
 pkgrel=1
 pkgdesc="A simple and lightweight SQL client with cross database and platform support"
-arch=('x86_64')
+arch=('x86_64' 'i686')
 url="https://sqlectron.github.io/"
 license=('MIT')
-depends=($_electron)
-makedepends=(
-	'asar'
-	'git'
-	'libsass'
-	'npm'
-	'python2'
-)
-source=(
-	"git+https://github.com/sqlectron/sqlectron-gui.git#tag=v${pkgver}"
-	'sqlectron-gui.desktop'
-)
-
-sha1sums=('SKIP'
-          'b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f')
-
+depends=('electron')
 case "$CARCH" in
-	i686)    _arch=ia32;;
-	x86_64)  _arch=x64;;
-	aarch64) _arch=arm64;;
-	*)       _arch=DUMMY;;
+	i686)    _arch=-i686;;
+	x86_64)  _arch=;;
 esac
 
-prepare() {
-	cd "$pkgname"
-
-	# remove extra dependencies
-	sed -i package.json \
-		-e '/"postinstall":/            d' \
-		-e '/"electron":/               d' \
-		-e '/"electron-builder":/       d' \
-		-e '/"electron-devtools-installer":/  d' \
-		-e '/"spawn-auto-restart":/     d' \
-		-e '/"webpack-dev-middleware":/ d' \
-		-e '/"webpack-dev-server":/     d' \
-		-e '/"webpack-cli":/ s/,$//'
-}
-
-build() {
-	cd "$pkgname"
-
-	export PATH="$srcdir/bin:$PATH"
-	export SKIP_SASS_BINARY_DOWNLOAD_FOR_CI=1
-	export SASS_FORCE_BUILD=1
-	export LIBSASS_EXT=auto
-	export npm_config_optional=false
-	export npm_config_build_from_source=true
-	export npm_config_sqlite=/usr
-
-	npm install
-
-	npm run compile:browser
-	npm run compile:renderer
-
-	mkdir app
-	mv -t  app out
-	cp -rt app build package.json
-
-	cd app
-
-	export npm_config_arch=$_arch
-	export npm_config_target_arch=$_arch
-	export npm_config_runtime=electron
-	export npm_config_target=$(</usr/lib/$_electron/version)
-	export npm_config_disturl=https://electronjs.org/headers
-
-	HOME="$srcdir/.electron-gyp" npm install --production
-
-	cat <<-EOF > ../sqlectron-gui
-		#!/usr/bin/sh
-		exec $_electron /usr/lib/sqlectron-gui/app.asar "\$@"
-	EOF
-}
+source=(
+	"${pkgname}-${pkgver}.pacman::https://github.com/sqlectron/sqlectron-gui/releases/download/v${pkgver}/sqlectron-${pkgver}${_arch}.pacman"
+)
 
+sha256sums=('13c91f0ab6e72217be221d5f61f5e277f0c3d01c2cc23011c46426c898593c24')
 package() {
-	cd "$pkgname"
-
-	asar p app app.asar
-
-	install -Dm0755 -t "${pkgdir}/usr/bin" sqlectron-gui
-	install -Dm0644 -t "${pkgdir}/usr/share/applications" ../sqlectron-gui.desktop
-	install -Dm0644 -t "${pkgdir}/usr/lib/sqlectron-gui" app.asar
-	install -Dm0644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-	install -Dm0644 build/app.png "${pkgdir}/usr/share/pixmaps/sqlectron-gui.png"
+	cd "${srcdir}"
+	tar -xvf ${pkgname}-${pkgver}.pacman -C ${pkgdir}
+	# Remove exsiting files
+    rm -f ${pkgdir}/.PKGINFO ${pkgdir}/.MTREE ${pkgdir}/.INSTALL
 }
diff --git a/sqlectron-gui.desktop b/sqlectron-gui.desktop
deleted file mode 100644
index 0e5427603847..000000000000
--- a/sqlectron-gui.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sqlectron-gui
-Comment=A simple and lightweight SQL client with cross database and platform support
-Icon=sqlectron-gui
-Exec=sqlectron-gui %U
-Categories=Development;Utility;
-StartupNotify=false
-Terminal=false