4.1.10.6007.spark1

4 files changed, 14 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 488f880b074f..f7a608919d9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = com.qq.weixin.work.deepin-x11
 	pkgdesc = Deepin Wine Weixin Work on x11
-	pkgver = 4.1.6.6017deepin5.1
+	pkgver = 4.1.10.6007.spark1
 	pkgrel = 1
 	url = https://work.weixin.qq.com/
 	arch = i686
@@ -41,10 +41,11 @@ pkgbase = com.qq.weixin.work.deepin-x11
 	depends = deepin-wine6-stable
 	depends = p7zip
 	depends = spark-dwine-helper
+	depends = spark-transhell
 	conflicts = deepin-wxwork
 	conflicts = com.qq.weixin.work.deepin
-	noextract = com.qq.weixin.work.deepin_4.1.6.6017deepin5.1_all.deb
-	source = https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/com.qq.weixin.work.deepin/com.qq.weixin.work.deepin_4.1.6.6017deepin5.1_all.deb
-	md5sums = abb941d9173a153e8c9946dc9cc51a74
+	noextract = com.qq.weixin.work.deepin_4.1.10.6007.spark1_all.deb
+	source = https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/com.qq.weixin.work.deepin/com.qq.weixin.work.deepin_4.1.10.6007.spark1_all.deb
+	md5sums = 3184436827c25ff6fe79bc7378e120c8
 
 pkgname = com.qq.weixin.work.deepin-x11
diff --git a/.gitignore b/.gitignore
index e998d0b23d9a..d11ffb6a0d2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 *.deb
 *.zst
+run.sh.bak
+lib/
 src
 pkg
 com.qq.weixin.work.deepin*
diff --git a/PKGBUILD b/PKGBUILD
index f385a15555be..b7a03d3fab64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: 302606571@qq.com
 # Contributor: luosoy <249799588@qq.com>
 pkgname=com.qq.weixin.work.deepin-x11
-pkgver=4.1.6.6017deepin5.1
+pkgver=4.1.10.6007.spark1
 deepin_app=com.qq.weixin.work.deepin
 pkgrel=1
 epoch=
@@ -18,7 +18,7 @@ depends=(
         'lib32-ocl-icd' 'deepin-udis86' 'lib32-zlib' 'lib32-ncurses' 'lib32-fontconfig'
         'lib32-freetype2' 'lib32-gettext' 'lib32-libxcursor' 'lib32-mesa' 'lib32-libjpeg6'
         'lib32-libxrandr' 'lib32-libxi' 'lib32-glu' 'deepin-wine-helper' 'deepin-wine6-stable' 'p7zip'
-		'spark-dwine-helper'
+		'spark-dwine-helper' 'spark-transhell'
     )
 makedepends=('tar')
 checkdepends=()
@@ -31,11 +31,11 @@ options=()
 install=
 changelog=
 source=("https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/com.qq.weixin.work.deepin/${deepin_app}_${pkgver}_all.deb")
-# source=("https://com-store-packages.uniontech.com/appstore/pool/appstore/c/${deepin_app}/${deepin_app}_${pkgver}_all.deb")
+# https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/com.qq.weixin.work.deepin/com.qq.weixin.work.deepin_4.1.10.6007.spark1_all.deb
 # source=("./${deepin_app}_${pkgver}_all.deb")
 # 换为对象存储的zst文件
 noextract=("${deepin_app}_${pkgver}_all.deb")
-md5sums=('abb941d9173a153e8c9946dc9cc51a74')
+md5sums=('3184436827c25ff6fe79bc7378e120c8')
 validpgpkeys=()
 
 prepare() {
diff --git a/run.sh b/run.sh
index eac4139f69a6..5973cce1a1bd 100755
--- a/run.sh
+++ b/run.sh
@@ -9,7 +9,7 @@ version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1";
 
 ACTIVEX_NAME=""
 BOTTLENAME="Deepin-WXWork"
-APPVER="4.1.6.6017deepin5"
+APPVER="4.1.10.6007deepin0"
 EXEC_PATH="c:/Program Files/WXWork/WXWork.exe"
 START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
 export MIME_TYPE=""
@@ -18,6 +18,7 @@ export DEB_PACKAGE_NAME="com.qq.weixin.work.deepin"
 export APPRUN_CMD="deepin-wine6-stable"
 
 export LD_LIBRARY_PATH=/opt/apps/com.qq.weixin.work.deepin/lib/
+GDK_BACKEND=x11
 
 DISABLE_ATTACH_FILE_DIALOG=""
 EXPORT_ENVS=""
@@ -27,7 +28,7 @@ export BOX86_EMU_CMD="/opt/deepin-box86/stable/box86"
 export DEF_EMU_NAME="exagear"
 export SPECIFY_SHELL_DIR=${START_SHELL_PATH%/*}
 export WINESERVICESNODELAY=""
-export WINESERVICESDISABLE="nsiproxy"
+export WINESERVICESDISABLE=""
 
 ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"