fix errors

2 files changed, 52 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b56a7e8cd38..1776759b2532 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = gstarcad-bin
 	pkgdesc = 浩辰 CAD.Free trial for 30 days
 	pkgver = 24.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.gstarcad.com/cad_linux/
 	arch = aarch64
 	arch = armv7h
 	arch = x86_64
 	license = custom
-	depends = sh
 	depends = libxxf86vm
 	depends = libsm
 	depends = hicolor-icon-theme
@@ -25,27 +24,24 @@ pkgbase = gstarcad-bin
 	depends = libxfixes
 	depends = libxext
 	depends = libxcb
-	depends = gcc-libs
 	depends = expat
 	depends = mesa
 	depends = libxdamage
 	depends = libx11
-	depends = zlib
 	depends = systemd-libs
 	depends = libxshmfence
 	depends = qt5-svg
 	depends = libxkbcommon-x11
 	depends = libglvnd
-	depends = glibc
 	depends = libdrm
 	provides = gstarcad=24.0
 	conflicts = gstarcad
 	options = !strip
-	source_aarch64 = gstarcad-24.0-aarch64.deb::https://hccad.gstarcad.cn/linux2024/v4.0/0928/deb/gstarcad_24.0_arm64.deb
-	sha256sums_aarch64 = 9a829507750f456bcbd3b7e59579d1f2909531acdfd6e97b408b31876e744810
-	source_armv7h = gstarcad-24.0-armv7h.deb::https://hccad.gstarcad.cn/linux2024/v4.0/0928/deb/gstarcad_24.0_arm64.deb
-	sha256sums_armv7h = 9a829507750f456bcbd3b7e59579d1f2909531acdfd6e97b408b31876e744810
-	source_x86_64 = gstarcad-24.0-x86_64.deb::https://hccad.gstarcad.cn/linux2024/v4.0/0928/deb/gstarcad_24.0_amd64.deb
-	sha256sums_x86_64 = 314b1903fc388557cd53a3bebe04e616df10841418d6e01402bd4a7af576f546
+	source_aarch64 = gstarcad-24.0-aarch64.deb::https://hccad.gstarcad.cn/linux2024/v4.0/1113/v10sp1/gstarcad_24.0_arm64.deb
+	sha256sums_aarch64 = 5661e50a07e554a98322aaa8ea8e2bf4597962667d494d974c809adf2fdaca4e
+	source_armv7h = gstarcad-24.0-armv7h.deb::https://hccad.gstarcad.cn/linux2024/v4.0/1113/v10sp1/gstarcad_24.0_arm64.deb
+	sha256sums_armv7h = 5661e50a07e554a98322aaa8ea8e2bf4597962667d494d974c809adf2fdaca4e
+	source_x86_64 = gstarcad-24.0-x86_64.deb::https://hccad.gstarcad.cn/linux2024/v4.0/1113/v10sp1/gstarcad_24.0_amd64.deb
+	sha256sums_x86_64 = cd6a569843d911f4b379367745b853f1f08e898deee7be0c9f99706704c5ad63
 
 pkgname = gstarcad-bin
diff --git a/PKGBUILD b/PKGBUILD
index 905d0e7f10b8..986831b73ff3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,54 @@
 pkgname=gstarcad-bin
 _appname="com.${pkgname%-bin}.cad"
 pkgver=24.0
-pkgrel=1
+_subver=v10sp1
+pkgrel=2
 pkgdesc="浩辰 CAD.Free trial for 30 days"
-arch=('aarch64' 'armv7h' 'x86_64')
+arch=(
+    'aarch64'
+    'armv7h'
+    'x86_64'
+)
 license=('custom')
 url="https://www.gstarcad.com/cad_linux/"
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 options=('!strip')
-depends=('sh' 'libxxf86vm' 'libsm' 'hicolor-icon-theme' 'libxkbcommon' 'xcb-util-image' 'xdg-utils' 'xcb-util-keysyms' \
-    'fontconfig' 'libcups' 'xcb-util-wm' 'libice' 'xcb-util-renderutil' 'qt5-base' 'freetype2' 'libxfixes' 'libxext' \
-    'libxcb' 'gcc-libs' 'expat' 'mesa' 'libxdamage' 'libx11' 'zlib' 'systemd-libs' 'libxshmfence' 'qt5-svg' \
-    'libxkbcommon-x11' 'libglvnd' 'glibc' 'libdrm')
-source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::https://hccad.gstarcad.cn/linux2024/v4.0/0928/deb/${pkgname%-bin}_${pkgver}_arm64.deb")
-source_armv7h=("${pkgname%-bin}-${pkgver}-armv7h.deb::https://hccad.gstarcad.cn/linux2024/v4.0/0928/deb/${pkgname%-bin}_${pkgver}_arm64.deb")
-source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::https://hccad.gstarcad.cn/linux2024/v4.0/0928/deb/${pkgname%-bin}_${pkgver}_amd64.deb")
-sha256sums_aarch64=('9a829507750f456bcbd3b7e59579d1f2909531acdfd6e97b408b31876e744810')
-sha256sums_armv7h=('9a829507750f456bcbd3b7e59579d1f2909531acdfd6e97b408b31876e744810')
-sha256sums_x86_64=('314b1903fc388557cd53a3bebe04e616df10841418d6e01402bd4a7af576f546')
+depends=(
+    'libxxf86vm'
+    'libsm'
+    'hicolor-icon-theme'
+    'libxkbcommon'
+    'xcb-util-image'
+    'xdg-utils'
+    'xcb-util-keysyms'
+    'fontconfig'
+    'libcups'
+    'xcb-util-wm'
+    'libice'
+    'xcb-util-renderutil'
+    'qt5-base'
+    'freetype2'
+    'libxfixes'
+    'libxext'
+    'libxcb'
+    'expat'
+    'mesa'
+    'libxdamage'
+    'libx11'
+    'systemd-libs'
+    'libxshmfence'
+    'qt5-svg'
+    'libxkbcommon-x11'
+    'libglvnd'
+    'libdrm'
+)
+source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::https://hccad.gstarcad.cn/linux2024/v4.0/1113/${_subver}/${pkgname%-bin}_${pkgver}_arm64.deb")
+source_armv7h=("${pkgname%-bin}-${pkgver}-armv7h.deb::https://hccad.gstarcad.cn/linux2024/v4.0/1113/${_subver}/${pkgname%-bin}_${pkgver}_arm64.deb")
+source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::https://hccad.gstarcad.cn/linux2024/v4.0/1113/${_subver}/${pkgname%-bin}_${pkgver}_amd64.deb")
+sha256sums_aarch64=('5661e50a07e554a98322aaa8ea8e2bf4597962667d494d974c809adf2fdaca4e')
+sha256sums_armv7h=('5661e50a07e554a98322aaa8ea8e2bf4597962667d494d974c809adf2fdaca4e')
+sha256sums_x86_64=('cd6a569843d911f4b379367745b853f1f08e898deee7be0c9f99706704c5ad63')
 build(){
     bsdtar -xf "${srcdir}/data.tar.xz"
     sed -e "s|bash /opt/apps/${pkgname%-bin}/v2024/files/gclauncher.sh %F|bash ${pkgname%-bin} %F|g" \
@@ -31,10 +61,10 @@ build(){
         -i "${srcdir}/usr/share/applications/${pkgname%-bin}-uninstall.desktop"
 }
 package(){
-    install -Dm755 -d "${pkgdir}/"{opt/apps,usr/bin}
-    cp -r "${srcdir}/opt/apps/${pkgname%-bin}" "${pkgdir}/opt/apps"
+    cp -r "${srcdir}/opt" "${pkgdir}/opt"
+    install -Dm755 -d "${pkgdir}/usr/bin"
     ln -sf "/opt/apps/${pkgname%-bin}/v2024/files/gclauncher.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    ln -sf "/opt/apps/${pkgname%-bin}/v2024/linux/gcad_uninstall.sh" "${pkgdir}/usr/bin/${pkgname%-bin}-uninstall"
+    ln -sf "/opt/apps/${pkgname%-bin}/v2024/files/linux/gcad_uninstall.sh" "${pkgdir}/usr/bin/${pkgname%-bin}-uninstall"
     install -Dm644 "${srcdir}/usr/share/applications/"*.desktop -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/usr/share/icons/hicolor/scalable/apps/${pkgname%-bin}.svg" -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps"
     install -Dm644 "${srcdir}/opt/apps/${pkgname%-bin}/v2024/files/about/"*.html -t "${pkgdir}/usr/share/licenses/${pkgname}"