upgpkg: deskreen 2.0.4-4

3 files changed, 78 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32db624cf8de..e0c722cadfd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,43 @@
 pkgbase = deskreen
-	pkgdesc = Turns any device with a web browser to a second screen for your computer
+	pkgdesc = Turn any device into a secondary screen for your computer
 	pkgver = 2.0.4
-	pkgrel = 3
+	pkgrel = 4
 	url = https://deskreen.com
 	arch = aarch64
 	arch = x86_64
-	arch = i686
 	license = AGPL3
-	makedepends = nodejs>=12.22.12
-	makedepends = npm
+	makedepends = nodejs>=16.20.2
 	makedepends = yarn
+	depends = alsa-lib
+	depends = at-spi2-core
+	depends = cairo
+	depends = dbus
+	depends = expat
+	depends = gcc-libs
+	depends = gdk-pixbuf2
+	depends = glib2
+	depends = glibc
+	depends = gtk3
+	depends = hicolor-icon-theme
+	depends = libcups
+	depends = libdrm
+	depends = libx11
+	depends = libxcb
+	depends = libxcomposite
+	depends = libxdamage
+	depends = libxext
+	depends = libxfixes
+	depends = libxkbcommon
+	depends = libxrandr
+	depends = mesa
+	depends = nspr
+	depends = nss
+	depends = pango
 	conflicts = deskreen-bin
 	noextract = deskreen-2.0.4.tar.gz
 	source = deskreen-2.0.4.tar.gz::https://github.com/pavlobu/deskreen/archive/v2.0.4.tar.gz
 	source = deskreen.desktop
 	b2sums = bef83c836ac722a854b524bc829b8e2f5a395a10d8d5794a148f0ef7f7a9f1292f99e99f219b10a9d550986d224c744047288a62fa37dcc062bebdbe42684e65
-	b2sums = 96072794fba957f5d9258778f41595c00e8ea3b866b9692f64282212254139c2c85e4b9ca516d4f6efe1a1deb7fc1c269ec09f86c98debe04e4507cecc79457e
+	b2sums = 076a41b6d494ecdeb3a563b65dfe9d54250cec521e6e54fc9fe084829af1799f3f4e8287dd9bc80e41ddc74d8f7642ebda91158ccf1056bad87d40e8630cb8d6
 
 pkgname = deskreen
diff --git a/PKGBUILD b/PKGBUILD
index 5f54f9878c1c..a70b1fa32ddb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,64 @@
-# Maintainer: Ivan Gabaldon <ivan [d0t] gab [at] inetol [d0t] net>
+# Maintainer: Ivan Gabaldon <aur[at]inetol.net>
 # Contributor: Sonu Ishaq <sonuishaq67@gmail.com>
 
 pkgname=deskreen
 pkgver=2.0.4
-pkgrel=3
-pkgdesc='Turns any device with a web browser to a second screen for your computer'
-arch=('aarch64' 'x86_64' 'i686')
+pkgrel=4
+pkgdesc='Turn any device into a secondary screen for your computer'
+arch=('aarch64'
+      'x86_64')
 url='https://deskreen.com'
 license=('AGPL3')
-makedepends=('nodejs>=12.22.12' 'npm' 'yarn')
+depends=('alsa-lib'
+         'at-spi2-core'
+         'cairo'
+         'dbus'
+         'expat'
+         'gcc-libs'
+         'gdk-pixbuf2'
+         'glib2'
+         'glibc'
+         'gtk3'
+         'hicolor-icon-theme'
+         'libcups'
+         'libdrm'
+         'libx11'
+         'libxcb'
+         'libxcomposite'
+         'libxdamage'
+         'libxext'
+         'libxfixes'
+         'libxkbcommon'
+         'libxrandr'
+         'mesa'
+         'nspr'
+         'nss'
+         'pango')
+makedepends=('nodejs>=16.20.2'
+             'yarn')
 conflicts=("$pkgname-bin")
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pavlobu/$pkgname/archive/v$pkgver.tar.gz"
         "$pkgname.desktop")
 noextract=("$pkgname-$pkgver.tar.gz")
 b2sums=('bef83c836ac722a854b524bc829b8e2f5a395a10d8d5794a148f0ef7f7a9f1292f99e99f219b10a9d550986d224c744047288a62fa37dcc062bebdbe42684e65'
-        '96072794fba957f5d9258778f41595c00e8ea3b866b9692f64282212254139c2c85e4b9ca516d4f6efe1a1deb7fc1c269ec09f86c98debe04e4507cecc79457e')
+        '076a41b6d494ecdeb3a563b65dfe9d54250cec521e6e54fc9fe084829af1799f3f4e8287dd9bc80e41ddc74d8f7642ebda91158ccf1056bad87d40e8630cb8d6')
 
 prepare() {
-    mkdir -p "$pkgname-$pkgver"
+    mkdir -p "$pkgname-$pkgver/"
     bsdtar -xpf "$pkgname-$pkgver.tar.gz" --strip-components=1 -C "$pkgname-$pkgver/"
+
+    mv "$pkgname-$pkgver/resources/icon.png" "$srcdir/$pkgname.png"
 }
 
 build() {
-    # envelope routines::initialization error -> https://github.com/webpack/webpack/issues/14532
+    # "error:0308010C:digital envelope routines::unsupported" -> https://github.com/webpack/webpack/issues/14532
     export NODE_OPTIONS=--openssl-legacy-provider
 
-    cd "$srcdir/$pkgname-$pkgver/"
+    cd "$srcdir/$pkgname-$pkgver/app/client/"
+    yarn install --non-interactive --pure-lockfile
 
-    cd app/client/ && yarn install --frozen-lockfile
-    cd ../../ && yarn install --frozen-lockfile
+    cd "$srcdir/$pkgname-$pkgver/"
+    yarn install --non-interactive --pure-lockfile
     yarn build
 
     case "$CARCH" in
@@ -38,26 +68,17 @@ build() {
             ;;
         'x86_64')
             yarn electron-builder build --x64 -l dir
-            #mv 'release/linux-x64-unpacked/' 'release/linux-unpacked/'
-            ;;
-        'i686')
-            yarn electron-builder build --ia32 -l dir
-            mv 'release/linux-ia32-unpacked/' 'release/linux-unpacked/'
             ;;
     esac
-
-    # This increases the memory usage quite a lot due to electron, it is not recommended to uncomment, yet.
-    #upx "$srcdir/$pkgname-$pkgver/release/linux-unpacked/deskreen" 2> /dev/null || true
 }
 
 package() {
-    install -d "$pkgdir/opt/$pkgname"
+    install -d "$pkgdir/opt/$pkgname/"
     cp -r "$srcdir/$pkgname-$pkgver/release/linux-unpacked/"* "$pkgdir/opt/$pkgname/"
-    cp "$srcdir/$pkgname-$pkgver/resources/icon.png" "$pkgdir/opt/$pkgname/"
 
-    install -d "$pkgdir/usr/bin"
+    install -d "$pkgdir/usr/bin/"
     ln -s "/opt/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
 
-    install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-    install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 "$srcdir/$pkgname.png" -t "$pkgdir/usr/share/icons/hicolor/256x256/apps/"
+    install -Dm644 "$srcdir/$pkgname.desktop" -t "$pkgdir/usr/share/applications/"
 }
diff --git a/deskreen.desktop b/deskreen.desktop
index 026c34bb35a5..c9e18b52cc85 100644
--- a/deskreen.desktop
+++ b/deskreen.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Version=1.0
 Type=Application
+StartupWMClass=Deskreen
 Name=Deskreen
-Comment=Deskreen turns any device into a secondary screen for your computer
+Comment=Turn any device into a secondary screen for your computer
 Categories=Development;Utility;
 Keywords=display;screen;share;
-Exec=deskreen
-Icon=/opt/deskreen/icon.png
+Exec=deskreen %U
+Icon=deskreen
 Terminal=false
 StartupNotify=true
\ No newline at end of file