update to 2.3.5

3 files changed, 26 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bbd4b73dec3..6591bb3ea09c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,17 @@
 pkgbase = dicionario.js-bin
 	pkgdesc = Simple dictionary in which you record your own words.
-	pkgver = 2.3.3
+	pkgver = 2.3.5
 	pkgrel = 1
 	url = https://github.com/ArthurLobopro/dicionario.js
 	arch = x86_64
 	license = MIT
-	depends = nss
-	depends = nodejs
-	depends = nspr
-	depends = gtk3
-	depends = glibc
-	depends = alsa-lib
-	depends = libxcomposite
-	depends = mesa
-	depends = libxrandr
-	depends = cairo
-	depends = libxcb
-	depends = at-spi2-core
-	depends = pango
-	depends = libxext
-	depends = gcc-libs
-	depends = libx11
-	depends = libxfixes
-	depends = libxkbcommon
-	depends = glib2
-	depends = libxdamage
-	depends = libdrm
-	depends = dbus
-	depends = libcups
-	depends = expat
+	makedepends = asar
+	depends = electron
 	conflicts = dicionario.js
 	conflicts = dicionario.js-bin
-	source = dicionario.js-2.3.3.deb::https://github.com/ArthurLobopro/dicionario.js/releases/download/v2.3.3/dicionario.js_2.3.3_amd64.deb
-	source = LICENSE::https://raw.githubusercontent.com/ArthurLobopro/dicionario.js/main/LICENSE
-	sha256sums = d495f71d2019c7e44c8fa16b64d1cb9dfbae04411fc5c86ca4eed491a183351a
-	sha256sums = c898d2875697b8ed803b6f18c641a194614b29c26c638eb8135398bc80255e26
+	source = dicionario.js-2.3.5.deb::https://github.com/ArthurLobopro/dicionario.js/releases/download/v2.3.5/dicionario.js_2.3.5_amd64.deb
+	source = dicionario.js.sh
+	sha256sums = 7d3e23d42f9b42c6e7329b147a3f21c71424fd5a0bdef5ceac94400b38beef5a
+	sha256sums = 1c0ac994b8c697d90ad4540abb51a4aa2ae17e1027e08a4554c10be4b6cee9ff
 
 pkgname = dicionario.js-bin
diff --git a/PKGBUILD b/PKGBUILD
index e3dd4492dec3..52b58f8c2609 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,24 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=dicionario.js-bin
-pkgver=2.3.3
+pkgver=2.3.5
 pkgrel=1
 pkgdesc="Simple dictionary in which you record your own words."
 arch=('x86_64')
 url="https://github.com/ArthurLobopro/dicionario.js"
 license=('MIT')
 conflicts=("${pkgname%-bin}" "${pkgname%-ng-bin}")
-depends=('nss' 'nodejs' 'nspr' 'gtk3' 'glibc' 'alsa-lib' 'libxcomposite' 'mesa' 'libxrandr' 'cairo' 'libxcb' 'at-spi2-core' \
-    'pango' 'libxext' 'gcc-libs' 'libx11' 'libxfixes' 'libxkbcommon' 'glib2' 'libxdamage' 'libdrm' 'dbus' 'libcups' 'expat')
+depends=('electron')
+makedepends=('asar')
 source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
-    "LICENSE::https://raw.githubusercontent.com/ArthurLobopro/dicionario.js/main/LICENSE")
-sha256sums=('d495f71d2019c7e44c8fa16b64d1cb9dfbae04411fc5c86ca4eed491a183351a'
-            'c898d2875697b8ed803b6f18c641a194614b29c26c638eb8135398bc80255e26')
-   
+    "${pkgname%-bin}.sh")
+sha256sums=('7d3e23d42f9b42c6e7329b147a3f21c71424fd5a0bdef5ceac94400b38beef5a'
+            '1c0ac994b8c697d90ad4540abb51a4aa2ae17e1027e08a4554c10be4b6cee9ff')
 package() {
-    bsdtar -xf "${srcdir}/data.tar.zst" -C "${pkgdir}"
-    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    chmod 0755 "${pkgdir}/usr/lib/${pkgname%-bin}/chrome-sandbox"
+    bsdtar -xf "${srcdir}/data.tar.zst"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
+    asar pack "${srcdir}/usr/lib/${pkgname%-bin}/resources/app" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+    install -Dm644 "${srcdir}/usr/share/doc/${pkgname%-bin}/copyright" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 "${srcdir}/usr/share/pixmaps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
+    sed "s|dicionario.js %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file
diff --git a/dicionario.js.sh b/dicionario.js.sh
new file mode 100644
index 000000000000..da5c7904a1a0
--- /dev/null
+++ b/dicionario.js.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec electron /opt/dicionario.js/dicionario.js.asar "$@"
+else
+    exec electron --no-sandbox /opt/dicionario.js/dicionario.js.asar "$@"
+fi
\ No newline at end of file