update to 2.3.23

3 files changed, 38 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ebcf6edee51f..260b1c7c5973 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,29 @@
 pkgbase = apifox-bin
 	pkgdesc = Apifox=Postman+Swagger+Mock+JMeter.API 文档、API 调试、API Mock、API 自动化测试
-	pkgver = 2.3.22
+	pkgver = 2.3.23
 	pkgrel = 1
 	url = https://apifox.com/
 	arch = aarch64
 	arch = x86_64
 	license = custom
-	makedepends = asar
-	depends = gtk3
-	depends = nss
-	depends = at-spi2-core
-	depends = alsa-lib
-	depends = libxdamage
-	depends = expat
-	depends = cairo
-	depends = libx11
-	depends = dbus
+	depends = bash
+	depends = electron22
 	depends = hicolor-icon-theme
-	depends = pango
-	depends = mesa
-	depends = nspr
-	depends = libxrandr
-	depends = libxext
-	depends = gcc-libs
-	depends = libxcomposite
-	depends = libxcb
-	depends = glib2
-	depends = libcups
-	depends = libdrm
-	depends = glibc
-	depends = libxkbcommon
-	depends = libxfixes
-	provides = apifox=2.3.22
+	depends = java-runtime
+	depends = gdk-pixbuf2
+	depends = lib32-gcc-libs
+	depends = libdbusmenu-glib
+	depends = lib32-glibc
+	depends = gtk2
+	provides = apifox=2.3.23
 	conflicts = apifox
 	source = LICENSE.html
 	source = apifox.sh
 	sha256sums = 3884df6451dd5aaadc867c2b6882a7feabccb10c7e1df98e48e9fe2414c9fe19
-	sha256sums = 3b975bd6352fe7e3233aeb9372cce915909b665bd6d3ddc48a408e571042316c
-	source_aarch64 = apifox-2.3.22-aarch64.zip::https://cdn.apifox.cn/download/Apifox-linux-arm64-latest.zip
-	sha256sums_aarch64 = 91057cc2532325e7184ea904f191333a14428da1ffe1be192b082a65a0d8b35c
-	source_x86_64 = apifox-2.3.22-x86_64.zip::https://cdn.apifox.cn/download/Apifox-linux-latest.zip
-	sha256sums_x86_64 = d951f7c65263e27be7893f89fdbf271ded09c47160274a7274a2c9fc0a4f1419
+	sha256sums = cbf4154e6a26f4099a8da2f3bba63578b0ed9046141ba8bea9c2b4d585dbdf62
+	source_aarch64 = apifox-2.3.23-aarch64.zip::https://cdn.apifox.cn/download/Apifox-linux-arm64-latest.zip
+	sha256sums_aarch64 = ceac6e886202e68f2cc9d179e740bb5a8e3fbe5e702d2f2105a6d82966e5adc7
+	source_x86_64 = apifox-2.3.23-x86_64.zip::https://cdn.apifox.cn/download/Apifox-linux-latest.zip
+	sha256sums_x86_64 = 3fc3fdb008fbbdc4123f22a0372f387b425791dde0e8d9bfa662489a5f08c9fc
 
 pkgname = apifox-bin
diff --git a/PKGBUILD b/PKGBUILD
index 1a90b1e45148..517acffa1084 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=apifox-bin
 _pkgname=Apifox
-pkgver=2.3.22
+pkgver=2.3.23
 pkgrel=1
 pkgdesc="Apifox=Postman+Swagger+Mock+JMeter.API 文档、API 调试、API Mock、API 自动化测试"
 arch=('aarch64' 'x86_64')
@@ -10,17 +10,25 @@ _githuburl="https://github.com/apifox/apifox"
 license=('custom')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
-depends=('gtk3' 'nss' 'at-spi2-core' 'alsa-lib' 'libxdamage' 'expat' 'cairo' 'libx11' 'dbus' 'hicolor-icon-theme' 'pango' 'mesa' \
-  'nspr' 'libxrandr' 'libxext' 'gcc-libs' 'libxcomposite' 'libxcb' 'glib2' 'libcups' 'libdrm' 'glibc' 'libxkbcommon' 'libxfixes')
-makedepends=('asar')
+depends=(
+    'bash'
+    'electron22'
+    'hicolor-icon-theme'
+    'java-runtime'
+    'gdk-pixbuf2'
+    'lib32-gcc-libs'
+    'libdbusmenu-glib'
+    'lib32-glibc'
+    'gtk2'
+)
 source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.zip::https://cdn.apifox.cn/download/${_pkgname}-linux-arm64-latest.zip")
 source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.zip::https://cdn.apifox.cn/download/${_pkgname}-linux-latest.zip")
 source=("LICENSE.html"
     "${pkgname%-bin}.sh")
 sha256sums=('3884df6451dd5aaadc867c2b6882a7feabccb10c7e1df98e48e9fe2414c9fe19'
-            '3b975bd6352fe7e3233aeb9372cce915909b665bd6d3ddc48a408e571042316c')
-sha256sums_aarch64=('91057cc2532325e7184ea904f191333a14428da1ffe1be192b082a65a0d8b35c')
-sha256sums_x86_64=('d951f7c65263e27be7893f89fdbf271ded09c47160274a7274a2c9fc0a4f1419')
+            'cbf4154e6a26f4099a8da2f3bba63578b0ed9046141ba8bea9c2b4d585dbdf62')
+sha256sums_aarch64=('ceac6e886202e68f2cc9d179e740bb5a8e3fbe5e702d2f2105a6d82966e5adc7')
+sha256sums_x86_64=('3fc3fdb008fbbdc4123f22a0372f387b425791dde0e8d9bfa662489a5f08c9fc')
 build() {
     chmod a+x "${srcdir}/${_pkgname}.AppImage"
     "${srcdir}/${_pkgname}.AppImage" --appimage-extract > /dev/null
@@ -29,9 +37,9 @@ build() {
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
-    cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked" "${pkgdir}/opt/${pkgname%-bin}/resources"
-    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/opt/${pkgname%-bin}/usr/lib"
+    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512;do
         install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
             -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
diff --git a/apifox.sh b/apifox.sh
index c5031de43a82..cecd755871c8 100644
--- a/apifox.sh
+++ b/apifox.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron13
-APPDIR="/opt/apifox"
-export PATH="${APPDIR}:${APPDIR}/usr/sbin:${PATH}"
-export XDG_DATA_DIRS="./share/:/usr/share/gnome:/usr/local/share/:/usr/share/:${XDG_DATA_DIRS}"
-export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
-export XDG_DATA_DIRS="${APPDIR}"/usr/share/:"${XDG_DATA_DIRS}":/usr/share/gnome/:/usr/local/share/:/usr/share/
-export GSETTINGS_SCHEMA_DIR="${APPDIR}/usr/share/glib-2.0/schemas:${GSETTINGS_SCHEMA_DIR}"
-_ASAR="${APPDIR}/resources/app.asar"
+_ELECTRON=/usr/bin/electron22
+APPDIR="/usr/lib/apifox"
+export PATH="${APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else