update to 24.1

3 files changed, 75 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1776759b2532..87777b5b16b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = gstarcad-bin
 	pkgdesc = 浩辰 CAD.Free trial for 30 days
-	pkgver = 24.0
-	pkgrel = 2
-	url = https://www.gstarcad.com/cad_linux/
+	pkgver = 24.1
+	pkgrel = 1
+	url = https://www.gstarcad.com/cad_linux
 	arch = aarch64
-	arch = armv7h
 	arch = x86_64
 	license = custom
 	depends = libxxf86vm
@@ -34,14 +33,18 @@ pkgbase = gstarcad-bin
 	depends = libxkbcommon-x11
 	depends = libglvnd
 	depends = libdrm
-	provides = gstarcad=24.0
+	depends = openssl-1.1
+	depends = libpng12
+	depends = curl
+	depends = sqlite
+	provides = gstarcad=24.1
 	conflicts = gstarcad
 	options = !strip
-	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
+	source = gstarcad.sh
+	sha256sums = 95c9dc84df4bf3dc61400bf34e8fc2b36bf1b5e8d92496f3f15adc7576390c2f
+	source_aarch64 = gstarcad-24.1-aarch64.deb::https://official-cn.gstarcad.cn/linux/2024/sp1/deb/gstarcad_24.1_arm64.deb
+	sha256sums_aarch64 = bee290f7578d2c7ede25551b8ebf978834812d27fb1868dd8f800ae0f85656dc
+	source_x86_64 = gstarcad-24.1-x86_64.deb::https://official-cn.gstarcad.cn/linux/2024/sp1/deb/gstarcad_24.1_amd64.deb
+	sha256sums_x86_64 = cac879546a1ad8aabad0246d95ea25f77b628a0879392f570269f50882a8e8b5
 
 pkgname = gstarcad-bin
diff --git a/PKGBUILD b/PKGBUILD
index 986831b73ff3..bc6304246050 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,17 @@
 # Maintainer: sukanka <su975853527 at gmail dot com>
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=gstarcad-bin
-_appname="com.${pkgname%-bin}.cad"
-pkgver=24.0
-_subver=v10sp1
-pkgrel=2
+pkgver=24.1
+_subver=sp1
+pkgrel=1
 pkgdesc="浩辰 CAD.Free trial for 30 days"
 arch=(
     'aarch64'
-    'armv7h'
     'x86_64'
 )
 license=('custom')
-url="https://www.gstarcad.com/cad_linux/"
+url="https://www.gstarcad.com/cad_linux"
+_downurl="https://official-cn.gstarcad.cn"
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 options=('!strip')
@@ -44,28 +43,31 @@ depends=(
     'libxkbcommon-x11'
     'libglvnd'
     'libdrm'
+    'openssl-1.1'
+    'libpng12'
+    'curl'
+    'sqlite'
 )
-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')
+source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::${_downurl}/linux/2024/${_subver}/deb/${pkgname%-bin}_${pkgver}_arm64.deb")
+source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${_downurl}/linux/2024/${_subver}/deb/${pkgname%-bin}_${pkgver}_amd64.deb")
+source=("${pkgname%-bin}.sh")
+sha256sums=('95c9dc84df4bf3dc61400bf34e8fc2b36bf1b5e8d92496f3f15adc7576390c2f')
+sha256sums_aarch64=('bee290f7578d2c7ede25551b8ebf978834812d27fb1868dd8f800ae0f85656dc')
+sha256sums_x86_64=('cac879546a1ad8aabad0246d95ea25f77b628a0879392f570269f50882a8e8b5')
 build(){
+    sed -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@runname@|gcad|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data.tar.xz"
-    sed -e "s|bash /opt/apps/${pkgname%-bin}/v2024/files/gclauncher.sh %F|bash ${pkgname%-bin} %F|g" \
+    sed -e "s|bash /opt/apps/${pkgname%-bin}/v2024/files/gclauncher.sh %F|${pkgname%-bin} %F|g" \
         -e "s|/opt/apps/${pkgname%-bin}/v2024/files/gcad.svg|${pkgname%-bin}|g" \
         -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
-    sed -e "s|/usr/bin/mate-terminal -x /opt/apps/${pkgname%-bin}/v2024/files/linux/gcad_uninstall.sh|bash -x ${pkgname%-bin}-uninstall|g" \
-        -e "s|/opt/apps/${pkgname%-bin}/v2024/files/gcad.svg|${pkgname%-bin}|g" \
-        -i "${srcdir}/usr/share/applications/${pkgname%-bin}-uninstall.desktop"
 }
 package(){
-    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/files/linux/gcad_uninstall.sh" "${pkgdir}/usr/bin/${pkgname%-bin}-uninstall"
-    install -Dm644 "${srcdir}/usr/share/applications/"*.desktop -t "${pkgdir}/usr/share/applications"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" -t "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm755 -d "${pkgdir}/opt/${pkgname%-bin}"
+    cp -r "${srcdir}/opt/apps/${pkgname%-bin}/v2024/files/"* "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.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}"
     install -Dm644 "${srcdir}/opt/apps/${pkgname%-bin}/v2024/files/about/licenses/"*.* -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/gstarcad.sh b/gstarcad.sh
new file mode 100644
index 000000000000..d220961cc523
--- /dev/null
+++ b/gstarcad.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+set -e
+XDG_DATA_HOME="/var/tmp"
+_APPNAME=@appname@
+_APPDIR="/opt/${_APPNAME}"
+_RUNNAME="${_APPDIR}/@runname@"
+_env_user_data="${XDG_DATA_HOME}"
+if [ -z "${_env_user_data}" ] ; then
+    _env_user_data="${HOME}"
+fi
+if [ -z "${_env_user_data}" ] ; then
+    _env_user_data="/var/tmp"             
+fi
+export _env_user_data="${_env_user_data}/${_APPNAME}"
+_input_method_framework=fcitx
+is_exist_fcitx=`ps -ef | grep [f]citx`
+if [ -z "${is_exist_fcitx}" ] ; then
+	_input_method_framework=ibus
+fi
+export XMODIFIERS="@im=${_input_method_framework}"
+export XIM="${_input_method_framework}"
+export XIM_PROGRAM="${_input_method_framework}"
+export GTK_IM_MODULE="${_input_method_framework}"
+export QT_IM_MODULE="${_input_method_framework}"
+export QT_QPA_PLATFORM=xcb
+export QT_QPA_PLATFORM_PLUGIN_PATH="${_APPDIR}/qtplugins:${QT_QPA_PLATFORM_PLUGIN_PATH}"
+export QT_PLUGIN_PATH="${_APPDIR}/qtplugins:${QT_PLUGIN_PATH}"
+export QT_DEBUG_PLUGINS=1
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${_APPDIR}:${_APPDIR}/drivers:${_APPDIR}/systemlibs:${_APPDIR}/language"
+export DOTNET_ROOT="${_APPDIR}/dotnet:${DOTNET_ROOT}"
+export PATH="${PATH}:${DOTNET_ROOT}"
+_display_server_type=`echo ${WAYLAND_DISPLAY}`
+if [ "${_display_server_type}" = "*wayland*" ]; then
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${_APPDIR}/systemlibs/wayland"
+fi
+cd "${_APPDIR}" || exit
+exec "${_RUNNAME}" "$@" | exit
+