fix errors

3 files changed, 57 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8b3fa3b03c66..6de991985517 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = any-sync-gui
 	pkgdesc = 一款支持在pc与pc或移动设备之间同步文本信息或文件的应用
 	pkgver = 1.3.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/easyhutu/any-sync-gui
 	arch = any
 	license = custom
 	makedepends = npm
 	makedepends = nodejs
 	makedepends = gendesk
+	makedepends = git
 	depends = libxcomposite
 	depends = libxkbcommon
 	depends = libxfixes
@@ -18,21 +19,17 @@ pkgbase = any-sync-gui
 	depends = cairo
 	depends = libxrandr
 	depends = pango
-	depends = glibc
 	depends = libxext
 	depends = libxcb
 	depends = at-spi2-core
 	depends = libdrm
 	depends = nspr
 	depends = libxdamage
-	depends = glib2
-	depends = gcc-libs
 	depends = nss
-	depends = dbus
 	depends = libx11
 	depends = gtk3
 	conflicts = any-sync-gui
-	source = any-sync-gui-1.3.0.tar.gz::https://github.com/easyhutu/any-sync-gui/archive/refs/tags/v1.3.0.tar.gz
-	sha256sums = f6194fd66558225c5f069db71013f4552d65d9152d482166d3c9ae87adbc79ee
+	source = any-sync-gui-1.3.0::git+https://github.com/easyhutu/any-sync-gui.git#tag=v1.3.0
+	sha256sums = SKIP
 
 pkgname = any-sync-gui
diff --git a/PKGBUILD b/PKGBUILD
index cf5984149ee8..c137e0915374 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,51 @@
 pkgname=any-sync-gui
 _appname="Lan同步"
 pkgver=1.3.0
-pkgrel=2
+_electronversion=25
+pkgrel=3
 pkgdesc="一款支持在pc与pc或移动设备之间同步文本信息或文件的应用"
 arch=('any')
 url="https://github.com/easyhutu/any-sync-gui"
 license=('custom')
 conflicts=("${pkgname}")
-depends=('libxcomposite' 'libxkbcommon' 'libxfixes' 'libcups' 'mesa' 'alsa-lib' 'expat' 'cairo' 'libxrandr' 'pango' 'glibc' \
-    'libxext' 'libxcb' 'at-spi2-core' 'libdrm' 'nspr' 'libxdamage' 'glib2' 'gcc-libs' 'nss' 'dbus' 'libx11' 'gtk3')
-makedepends=('npm' 'nodejs' 'gendesk')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
-sha256sums=('f6194fd66558225c5f069db71013f4552d65d9152d482166d3c9ae87adbc79ee')
-prepare() {
-    gendesk -f -n -q --categories "Utility" --name "${pkgname}-${_appname}" --exec "${pkgname} --no-sandbox %U"
-}
+depends=(
+    'libxcomposite'
+    'libxkbcommon'
+    'libxfixes'
+    'libcups'
+    'mesa'
+    'alsa-lib'
+    'expat'
+    'cairo'
+    'libxrandr'
+    'pango'
+    'libxext'
+    'libxcb'
+    'at-spi2-core'
+    'libdrm'
+    'nspr'
+    'libxdamage'
+    'nss'
+    'libx11'
+    'gtk3'
+)
+makedepends=(
+    'npm'
+    'nodejs'
+    'gendesk'
+    'git'
+)
+source=(
+    "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver}"
+)
+sha256sums=('SKIP')
 build() {
+    gendesk -f -n -q --categories "Utility" --name "${pkgname}-${_appname}" --exec "${pkgname} --no-sandbox %U"
+    export npm_config_build_from_source=true
+    export npm_config_cache="${srcdir}/.npm_cache"
+    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    export ELECTRONVERSION="${_electronversion}"
     cd "${srcdir}/${pkgname}-${pkgver}/fe"
     npm install --force
     npm run build
diff --git a/any-sync-gui.sh b/any-sync-gui.sh
new file mode 100644
index 000000000000..2ec4412e5c4f
--- /dev/null
+++ b/any-sync-gui.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
+else
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+fi
\ No newline at end of file