upgpkg: hyper 3.4.0-1

upstream release
remove duplicated electron dependencies

Signed-off-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>

2 files changed, 57 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7973dcaa778..d74f9523711b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
 pkgbase = hyper
 	pkgdesc = A terminal built on web technologies
-	pkgver = 3.3.0
-	pkgrel = 2
+	pkgver = 3.4.0
+	pkgrel = 1
 	url = https://hyper.is/
 	arch = x86_64
 	license = MIT
-	makedepends = electron
 	makedepends = yarn
 	makedepends = npm
 	depends = alsa-lib
+	depends = electron20
 	depends = gtk3
 	depends = libxss
-	depends = nodejs
 	depends = nss
 	conflicts = hyperterm
 	replaces = hyperterm
-	source = hyper-3.3.0.tar.gz::https://github.com/vercel/hyper/archive/v3.3.0.tar.gz
+	source = hyper-3.4.0.tar.gz::https://github.com/vercel/hyper/archive/v3.4.0.tar.gz
 	source = hyper.desktop
-	sha256sums = 01bd48fb3d8035782c36f409c997e21a1adbdedc8a56e03367683765d1b532a6
-	sha256sums = ae29bd930c822c3144817a0e2fe2e2a8253fde90d31b0e19ad7880cd35609ebf
+	b2sums = 783b51d317d1560f9bcb69582a32f1b2342b874b1fce5beaf9de3d8a04c6a21407807cf9278b5659d4f366bd7f9fcc064618e3a6764c7fcbd4b914722acd7a3d
+	b2sums = 3e204a5417c0c0b5d0de4b25013657e4f27ec951c4c23ad9c5bf661890bcf6e6b7f81454373c5740fc424c6af022a45e6b7f204dffb67afa678cf098c545b590
 
 pkgname = hyper
diff --git a/PKGBUILD b/PKGBUILD
index 1f8814838990..5188299c3e18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,76 +6,79 @@
 # Contributor: blind
 
 pkgname=hyper
-pkgver=3.3.0
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
 pkgdesc="A terminal built on web technologies"
 arch=('x86_64')
 url="https://hyper.is/"
 license=('MIT')
-depends=('alsa-lib' 'gtk3' 'libxss' 'nodejs' 'nss')
-makedepends=('electron' 'yarn' 'npm')
+depends=('alsa-lib' 'electron20' 'gtk3' 'libxss' 'nss')
+makedepends=('yarn' 'npm')
 conflicts=('hyperterm')
 replaces=('hyperterm')
-
-source=(
-    "$pkgname-$pkgver.tar.gz::https://github.com/vercel/$pkgname/archive/v$pkgver.tar.gz"
-    "$pkgname.desktop"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/vercel/$pkgname/archive/v$pkgver.tar.gz"
+        "$pkgname.desktop")
+b2sums=('783b51d317d1560f9bcb69582a32f1b2342b874b1fce5beaf9de3d8a04c6a21407807cf9278b5659d4f366bd7f9fcc064618e3a6764c7fcbd4b914722acd7a3d'
+        '3e204a5417c0c0b5d0de4b25013657e4f27ec951c4c23ad9c5bf661890bcf6e6b7f81454373c5740fc424c6af022a45e6b7f204dffb67afa678cf098c545b590')
+
+_electron_file_list=(
+	chrome-sandbox
+	chrome_{1,2}00_percent.pak
+	chrome_crashpad_handler
+	libEGL.so
+	libGLESv2.so
+	libvk_swiftshader.so
+	libvulkan.so.1
 )
-sha256sums=('01bd48fb3d8035782c36f409c997e21a1adbdedc8a56e03367683765d1b532a6'
-            'ae29bd930c822c3144817a0e2fe2e2a8253fde90d31b0e19ad7880cd35609ebf')
-
-_hyper_src_dir="$pkgname-$pkgver"
 
 prepare() {
-    cd "$_hyper_src_dir"
+	cd $pkgname-$pkgver
 
-    # delete husky install from postinstall
-    sed -i 's/\ \&\& husky install//g' package.json
+	# delete husky install from postinstall
+	sed -i 's/\ \&\& husky install//g' package.json
 
-    yarn install
+	yarn install
 }
 
 build() {
-    cd "$_hyper_src_dir"
+	cd $pkgname-$pkgver
+
+	# This build command is the same as the one defined in package.json via
+	# npm run dist except that it doesn't build for debian, rpm, etc. and
+	# doesn't require some other dependencies
 
-    # This build command is the same as the one defined in package.json via
-    # npm run dist except that it doesn't build for debian, rpm, etc. and
-    # doesn't require some other dependencies
+	# add node_modules binaries to PATH
+	oldpath="$PATH"
+	PATH="$(pwd)/node_modules/.bin:$PATH"
 
-    # add node_modules binaries to PATH
-    oldpath="$PATH"
-    PATH="$(pwd)/node_modules/.bin:$PATH"
+	yarn run build &&
+	cross-env BABEL_ENV=production babel target/renderer/bundle.js \
+		--out-file target/renderer/bundle.js \
+		--no-comments \
+		--minified target/renderer/bundle.js &&
+	electron-builder --linux --dir
 
-    yarn run build &&
-    cross-env BABEL_ENV=production babel target/renderer/bundle.js \
-        --out-file target/renderer/bundle.js \
-        --no-comments \
-        --minified target/renderer/bundle.js && 
-    electron-builder --linux --dir
+	PATH="$oldpath"
 
-    PATH="$oldpath"
+	# clean up bundled electron files
+	for i in ${_electron_file_list[@]}; do
+		rm dist/linux-unpacked/$i
+	done
 }
 
 package() {
-    cd "$_hyper_src_dir"
-
-    _appdir="/usr/lib/$pkgname"
-    _libinstall="${pkgdir}${_appdir}"
-
-    mkdir -p "$pkgdir/usr/bin" "$_libinstall"
-    cp -R dist/linux-unpacked/* "$_libinstall"
-
-    # link the binary to /usr/bin
-    cd "$pkgdir/usr/bin"
-    ln -s "../lib/$pkgname/hyper" hyper
+	install -Dm644 $pkgname.desktop -t "$pkgdir/usr/share/applications/"
 
-    # # TODO: remove included electron libs and use the system ones by symlink
-    # cd "$_libinstall"
-    # rm libnode.so libffmpeg.so
-    # ln -s /usr/share/electron/lib{node,ffmpeg}.so .
+	cd $pkgname-$pkgver
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm644 app/static/icon.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
 
-    install -Dm644 -t "$pkgdir/usr/share/applications/"      "$srcdir/$pkgname.desktop"
-    install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" "$srcdir/$_hyper_src_dir/LICENSE"
+	install -dm755 "$pkgdir/usr/lib/$pkgname/"
+	cp -R dist/linux-unpacked/* "$pkgdir/usr/lib/$pkgname/"
+	for i in ${_electron_file_list[@]}; do
+		ln -s /usr/lib/electron/$i "$pkgdir/usr/lib/$pkgname/"
+	done
 
-    install -Dm644 "$srcdir/$_hyper_src_dir/app/static/icon.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+	install -dm755 "$pkgdir/usr/bin/"
+	ln -s /usr/lib/$pkgname/$pkgname "$pkgdir/usr/bin/$pkgname"
 }