upgpkg: hyper 3.3.0-1

upstream release

correct dependencies, quotation, licenses; clean up sources

3 files changed, 35 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8982b7653b1e..6ba02563cfec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = hyper
 	pkgdesc = A terminal built on web technologies
-	pkgver = 3.2.3
-	pkgrel = 2
+	pkgver = 3.3.0
+	pkgrel = 1
 	url = https://hyper.is/
-	arch = any
+	arch = x86_64
 	license = MIT
-	makedepends = nodejs
 	makedepends = electron
 	makedepends = yarn
-	makedepends = python2
 	makedepends = npm
-	depends = gconf
+	depends = alsa-lib
+	depends = gtk3
+	depends = libxss
+	depends = nodejs
+	depends = nss
 	conflicts = hyperterm
 	replaces = hyperterm
-	source = https://github.com/vercel/hyper/archive/v3.2.3.tar.gz
-	source = https://github.com/bnb/awesome-hyper/raw/master/hyper-3-color-logo.svg
-	source = Hyper.desktop
-	md5sums = fb365705e6c0a7142379131af82a4ce8
-	md5sums = c770d64996561d98fa41a8d88963a074
-	md5sums = e5a0ef01f23708d9bd2d6a7f094095f2
+	source = hyper-3.3.0.tar.gz::https://github.com/vercel/hyper/archive/v3.3.0.tar.gz
+	source = hyper.desktop
+	sha256sums = 01bd48fb3d8035782c36f409c997e21a1adbdedc8a56e03367683765d1b532a6
+	sha256sums = bcdfdc24e3af1df76fc5fadb195ef914eec060bb49bcad33fd5a74836c19ad20
 
 pkgname = hyper
diff --git a/PKGBUILD b/PKGBUILD
index 43a5faa9155e..e4529a305fd3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,52 @@
-# Maintainer: Constantine Fedotov <zenflak@gmail.com>
+# Maintainer: éclairevoyant
+# Contributor: Constantine Fedotov <zenflak@gmail.com>
 # Contributor: aureolebigben <aureolebigben@gmail.com>
 # Contributor: fleischie
 # Contributor: auk
 # Contributor: blind
 
 pkgname=hyper
-pkgver=3.2.3
-pkgrel=2
-epoch=
+pkgver=3.3.0
+pkgrel=1
 pkgdesc="A terminal built on web technologies"
-arch=('any')
+arch=('x86_64')
 url="https://hyper.is/"
 license=('MIT')
-groups=()
-depends=('gconf')
-makedepends=('nodejs' 'electron' 'yarn' 'python2' 'npm')
-checkdepends=()
-optdepends=()
-provides=()
-
+depends=('alsa-lib' 'gtk3' 'libxss' 'nodejs' 'nss')
+makedepends=('electron' 'yarn' 'npm')
 conflicts=('hyperterm')
 replaces=('hyperterm')
 backup=()
-options=()
-install=
 changelog=
 
-_pkgver_project=${pkgver/\.canary/-canary}
-
 source=(
-    "https://github.com/vercel/$pkgname/archive/v${_pkgver_project}.tar.gz"
-    "https://github.com/bnb/awesome-hyper/raw/master/hyper-3-color-logo.svg"
-    "Hyper.desktop"
+    "$pkgname-$pkgver.tar.gz::https://github.com/vercel/$pkgname/archive/v$pkgver.tar.gz"
+    "$pkgname.desktop"
 )
-noextract=()
-md5sums=('fb365705e6c0a7142379131af82a4ce8'
-         'c770d64996561d98fa41a8d88963a074'
-         'e5a0ef01f23708d9bd2d6a7f094095f2')
-validpgpkeys=()
+sha256sums=('01bd48fb3d8035782c36f409c997e21a1adbdedc8a56e03367683765d1b532a6'
+            'bcdfdc24e3af1df76fc5fadb195ef914eec060bb49bcad33fd5a74836c19ad20')
+
+_hyper_src_dir="$pkgname-$pkgver"
 
 prepare() {
-    cd "$pkgname-$_pkgver_project"
+    cd "$_hyper_src_dir"
 
     # delete husky install from postinstall
     sed -i 's/\ \&\& husky install//g' package.json
 
-    # yarn is a build-dep according to the README
     yarn install
 }
 
 build() {
-    cd "$pkgname-$_pkgver_project"
+    cd "$_hyper_src_dir"
 
     # 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
+    oldpath="$PATH"
+    PATH="$(pwd)/node_modules/.bin:$PATH"
 
     yarn run build &&
     cross-env BABEL_ENV=production babel target/renderer/bundle.js \
@@ -67,11 +55,11 @@ build() {
         --minified target/renderer/bundle.js && 
     electron-builder --linux --dir
 
-    PATH=$oldpath
+    PATH="$oldpath"
 }
 
 package() {
-    cd "$pkgname-$_pkgver_project"
+    cd "$_hyper_src_dir"
 
     _appdir="/usr/lib/$pkgname"
     _libinstall="${pkgdir}${_appdir}"
@@ -80,7 +68,7 @@ package() {
     cp -R dist/linux-unpacked/* "$_libinstall"
 
     # link the binary to /usr/bin
-    cd $pkgdir/usr/bin
+    cd "$pkgdir/usr/bin"
     ln -s "../lib/$pkgname/hyper" hyper
 
     # # TODO: remove included electron libs and use the system ones by symlink
@@ -88,7 +76,8 @@ package() {
     # rm libnode.so libffmpeg.so
     # ln -s /usr/share/electron/lib{node,ffmpeg}.so .
 
+    install -Dm644 -t "$pkgdir/usr/share/applications/"      "$srcdir/$pkgname.desktop"
+    install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" "$srcdir/$_hyper_src_dir/LICENSE"
 
-    install -Dm644 "$srcdir/Hyper.desktop" "$pkgdir/usr/share/applications/Hyper.desktop"
-    install -Dm644 "$srcdir/hyper-3-color-logo.svg" "$pkgdir/usr/share/pixmaps/hyper.svg"
+    install -Dm644 "$srcdir/$_hyper_src_dir/app/static/icon.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }
diff --git a/Hyper.desktop b/hyper.desktop
index b96bbbe7b2a9..b96bbbe7b2a9 100644
--- a/Hyper.desktop
+++ b/hyper.desktop