upgpkg: deskreen 2.0.3-3

3 files changed, 63 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index caed7c1669de..5daa9b7dd068 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,21 @@
 pkgbase = deskreen
 	pkgdesc = Turns any device with a web browser to a second screen for your computer
 	pkgver = 2.0.3
-	pkgrel = 2
+	pkgrel = 3
 	url = https://deskreen.com
 	arch = x86_64
+	arch = i686
+	arch = aarch64
+	arch = armv7h
 	license = AGPL3
-	depends = gtk3
+	makedepends = glibc
+	makedepends = libxcrypt-compat
+	makedepends = yarn
 	depends = nss
-	source = deskreen-2.0.3-x86_64.deb::https://github.com/pavlobu/deskreen/releases/download/v2.0.3/deskreen_2.0.3_amd64.deb
+	noextract = deskreen-source.tar.gz
+	source = deskreen-source.tar.gz::https://github.com/pavlobu/deskreen/archive/v2.0.3.tar.gz
 	source = deskreen.desktop
-	sha256sums = 4ee7f5c144dc9934ceff2401803af11329255cb081db1a621b96bed90c38f627
-	sha256sums = d54e49d2d012f5a5b95e0b4b7c5755b38d7e64c0ef3a9d4217d642c24631ca50
+	b2sums = 3e22d44be54b457507a5c0ea8534c70228a7bea92bd7c5b090118835854fe69d2a4c585675eb816c9642269fed95fbceb4ac576dd00d37d644f9c5c649b71fd6
+	b2sums = ba7d1537ead5757091ec51da21ad1751bb1dcad2fe90cb3b5377f0507f9484643f0d9d784b23d7dccc88fe5f54d9559fd2e945ad4c6170614f1b04979c64e802
 
 pkgname = deskreen
diff --git a/.gitignore b/.gitignore
index 9397a4647e02..c62390cd41d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
-# Ignore everything:
 *
-
-# ...except:
 !.gitignore
-!PKGBUILD
 !.SRCINFO
-!*.desktop
\ No newline at end of file
+!deskreen.desktop
+!PKGBUILD
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index d5a4749ead2b..65944cc40cd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,36 +3,66 @@
 
 pkgname=deskreen
 pkgver=2.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Turns any device with a web browser to a second screen for your computer'
-arch=('x86_64')
+arch=('x86_64' 'i686' 'aarch64' 'armv7h')
 url='https://deskreen.com'
 license=('AGPL3')
-depends=('gtk3' 'nss')
-source=("$pkgname-$pkgver-$arch.deb::https://github.com/pavlobu/$pkgname/releases/download/v$pkgver/${pkgname}_${pkgver}_amd64.deb"
+depends=('nss')
+makedepends=('glibc' 'libxcrypt-compat' 'yarn')
+source=("$pkgname-source.tar.gz::https://github.com/pavlobu/$pkgname/archive/v$pkgver.tar.gz"
         "$pkgname.desktop")
-sha256sums=('4ee7f5c144dc9934ceff2401803af11329255cb081db1a621b96bed90c38f627'
-            'd54e49d2d012f5a5b95e0b4b7c5755b38d7e64c0ef3a9d4217d642c24631ca50')
+noextract=("$pkgname-source.tar.gz")
+b2sums=('3e22d44be54b457507a5c0ea8534c70228a7bea92bd7c5b090118835854fe69d2a4c585675eb816c9642269fed95fbceb4ac576dd00d37d644f9c5c649b71fd6'
+        'ba7d1537ead5757091ec51da21ad1751bb1dcad2fe90cb3b5377f0507f9484643f0d9d784b23d7dccc88fe5f54d9559fd2e945ad4c6170614f1b04979c64e802')
 
 prepare() {
-    tar xpf data.tar.xz ./opt/Deskreen/ --strip-components=2 -C "$srcdir"
-    tar xpf data.tar.xz ./usr/share/icons/ --strip-components=3 -C "$srcdir"
-    mv "$srcdir"/Deskreen "$srcdir"/$pkgname
+    mkdir -p "$pkgname-$pkgver" "$pkgname-source"
+    bsdtar -xpf "$pkgname-source.tar.gz" --strip-components=1 -C "$pkgname-source/"
 }
 
-package() {
-    find "$srcdir"/icons/ -type d -exec chmod 755 {} +
-    find "$srcdir"/$pkgname/locales/ -type d -exec chmod 755 {} +
-    find "$srcdir"/$pkgname/resources/ -type d -exec chmod 755 {} +
+build() {
+    cd "$srcdir/$pkgname-source/"
+
+    # DEPS
+    yarn install --frozen-lockfile
+    cd app/client/
+    yarn install --frozen-lockfile
+    cd ..
+    yarn install --frozen-lockfile
+    cd ..
+
+    # BUILD
+    yarn build
+    if [ "$CARCH" == 'x86_64' ]; then
+        yarn electron-builder build --linux deb --x64
+        cp "release/${pkgname}_${pkgver}_amd64.deb" "../$pkgname-$pkgver.deb"
+    elif [ "$CARCH" == 'i686' ]; then
+        yarn electron-builder build --linux deb --ia32
+        cp "release/${pkgname}_${pkgver}_i386.deb" "../$pkgname-$pkgver.deb"
+    elif [ "$CARCH" == 'aarch64' ]; then
+        yarn electron-builder build --linux deb --arm64
+        cp "release/${pkgname}_${pkgver}_arm64.deb" "../$pkgname-$pkgver.deb"
+    elif [ "$CARCH" == 'armv7h' ]; then
+        yarn electron-builder build --linux deb --armv7l
+        cp "release/${pkgname}_${pkgver}_armv7l.deb" "../$pkgname-$pkgver.deb"
+    fi
 
-    install -d "$pkgdir"/opt/$pkgname
-    cp -r "$srcdir"/$pkgname/* "$pkgdir"/opt/$pkgname
+    cp 'LICENSE' '../LICENSE'
+    bsdtar -xpf "../$pkgname-$pkgver.deb" -C "$srcdir"
+    bsdtar -xpf '../data.tar.xz' -C "$srcdir/$pkgname-$pkgver"
+}
+
+package() {
+    install -d "$pkgdir/opt/$pkgname"
+    cp -r "$srcdir/$pkgname-$pkgver/opt/Deskreen/"* "$pkgdir/opt/$pkgname"
 
-    install -d "$pkgdir"/usr/bin
-    ln -s ../../opt/$pkgname/$pkgname "$pkgdir"/usr/bin/$pkgname
+    install -d "$pkgdir/usr/bin"
+    ln -s "/opt/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
 
-    install -d "$pkgdir"/usr/share/icons
-    cp -r "$srcdir"/icons/hicolor "$pkgdir"/usr/share/icons/hicolor
+    install -d "$pkgdir/usr/share/icons"
+    cp -r "$srcdir/$pkgname-$pkgver/usr/share/icons/"* "$pkgdir/usr/share/icons/"
 
-    install -Dm644 "$srcdir"/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+    install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }