update to 2.3.18

2 files changed, 21 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d0262439fb2..28d88ba22cc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,26 @@
 pkgbase = apifox-bin
 	pkgdesc = Apifox=Postman+Swagger+Mock+JMeter.API 文档、API 调试、API Mock、API 自动化测试
-	pkgver = 2.3.17
+	pkgver = 2.3.18
 	pkgrel = 1
 	url = https://apifox.com/
 	arch = aarch64
 	arch = x86_64
 	license = custom
+	makedepends = asar
 	depends = gtk3
-	depends = lib32-gcc-libs
 	depends = nss
 	depends = at-spi2-core
-	depends = java-runtime
 	depends = alsa-lib
 	depends = libxdamage
 	depends = expat
 	depends = cairo
 	depends = libx11
 	depends = dbus
+	depends = hicolor-icon-theme
+	depends = pango
+	depends = mesa
 	depends = nspr
 	depends = libxrandr
-	depends = lib32-glibc
 	depends = libxext
 	depends = gcc-libs
 	depends = libxcomposite
@@ -30,17 +31,13 @@ pkgbase = apifox-bin
 	depends = glibc
 	depends = libxkbcommon
 	depends = libxfixes
-	depends = hicolor-icon-theme
-	depends = pango
-	depends = mesa
-	depends = sh
-	provides = apifox=2.3.17
+	provides = apifox=2.3.18
 	conflicts = apifox
 	source = LICENSE.html
 	sha256sums = 3884df6451dd5aaadc867c2b6882a7feabccb10c7e1df98e48e9fe2414c9fe19
-	source_aarch64 = apifox-2.3.17-aarch64.zip::https://cdn.apifox.cn/download/Apifox-linux-arm64-deb-latest.zip
-	sha256sums_aarch64 = 35b7d6364491d01bbd5b0b676d6b1ad860e2de90075b86a402b9175d95fdb6e3
-	source_x86_64 = apifox-2.3.17-x86_64.zip::https://cdn.apifox.cn/download/Apifox-linux-deb-latest.zip
-	sha256sums_x86_64 = a9173215bee9b8448ef100e9f6eb23d33e1f49daa61a434ac4cb0ef0dcc99695
+	source_aarch64 = apifox-2.3.18-aarch64.zip::https://cdn.apifox.cn/download/Apifox-linux-arm64-deb-latest.zip
+	sha256sums_aarch64 = 7a62190aede4c22ac75e2a0d83ae07e0b4444fa52c906a20792db3d5c3262851
+	source_x86_64 = apifox-2.3.18-x86_64.zip::https://cdn.apifox.cn/download/Apifox-linux-deb-latest.zip
+	sha256sums_x86_64 = b978bc992d423a1dac2da9fcd7d7b0d01f62584fc0bb92fa241a991a1ac999ea
 
 pkgname = apifox-bin
diff --git a/PKGBUILD b/PKGBUILD
index c8ac61a19a75..4749456289d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=apifox-bin
 _pkgname=Apifox
-pkgver=2.3.17
+pkgver=2.3.18
 pkgrel=1
 pkgdesc="Apifox=Postman+Swagger+Mock+JMeter.API 文档、API 调试、API Mock、API 自动化测试"
 arch=('aarch64' 'x86_64')
@@ -10,19 +10,23 @@ _githuburl="https://github.com/apifox/apifox"
 license=('custom')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
-depends=('gtk3' 'lib32-gcc-libs' 'nss' 'at-spi2-core' 'java-runtime' 'alsa-lib' 'libxdamage' 'expat' 'cairo' 'libx11' 'dbus' \
-  'nspr' 'libxrandr' 'lib32-glibc' 'libxext' 'gcc-libs' 'libxcomposite' 'libxcb' 'glib2' 'libcups' 'libdrm' 'glibc' 'libxkbcommon' \
-  'libxfixes' 'hicolor-icon-theme' 'pango' 'mesa' 'sh')
+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')
 source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.zip::https://cdn.apifox.cn/download/${_pkgname}-linux-arm64-deb-latest.zip")
 source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.zip::https://cdn.apifox.cn/download/${_pkgname}-linux-deb-latest.zip")
 source=("LICENSE.html")
 sha256sums=('3884df6451dd5aaadc867c2b6882a7feabccb10c7e1df98e48e9fe2414c9fe19')
-sha256sums_aarch64=('35b7d6364491d01bbd5b0b676d6b1ad860e2de90075b86a402b9175d95fdb6e3')
-sha256sums_x86_64=('a9173215bee9b8448ef100e9f6eb23d33e1f49daa61a434ac4cb0ef0dcc99695')
+sha256sums_aarch64=('7a62190aede4c22ac75e2a0d83ae07e0b4444fa52c906a20792db3d5c3262851')
+sha256sums_x86_64=('b978bc992d423a1dac2da9fcd7d7b0d01f62584fc0bb92fa241a991a1ac999ea')
 build() {
     bsdtar -xf "${pkgname%-bin}_${pkgver}_"*.deb
     bsdtar -xf "${srcdir}/data.tar.xz"
-    sed "s|/opt/${_pkgname}/${pkgname%-bin} %U|${pkgname%-bin} %U|g;s|Utility|Development;Utility|g" \
+    asar e "${srcdir}/opt/${_pkgname}/resources/app.asar" "${srcdir}/app.asar.unpacked"
+    cp -r "${srcdir}/opt/${_pkgname}/resources/app.asar.unpacked" "${srcdir}"
+    rm -rf "${srcdir}/opt/${_pkgname}/resources/app.asar.unpacked"
+    asar p "${srcdir}/app.asar.unpacked" "${srcdir}/opt/${_pkgname}/resources/app.asar"
+    sed "s|/opt/${_pkgname}/${pkgname%-bin}|${pkgname%-bin} -no-sandbox|g;s|Utility|Development|g" \
         -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {