Upgrade WeChat to 2.9.5.56

Signed-off-by: Codist <countstarlight@gmail.com>

5 files changed, 50 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8bec970a1962..9c2d73c1cabf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-wechat
 	pkgdesc = Tencent WeChat (com.wechat) on Deepin Wine For Archlinux
-	pkgver = 2.9.5.41
+	pkgver = 2.9.5.56
 	pkgrel = 1
 	url = https://weixin.qq.com/
 	install = deepin-wine-wechat.install
@@ -20,13 +20,13 @@ pkgbase = deepin-wine-wechat
 	depends = lib32-libldap
 	conflicts = deepin-wechat
 	source = https://mirrors.ustc.edu.cn/deepin/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_2.6.8.65deepin0_i386.deb
-	source = WeChatSetup-2.9.5.41.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
+	source = WeChatSetup-2.9.5.56.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
 	source = run.sh
 	source = reg.patch
 	source = shadow.exe
 	md5sums = fe31cf4f0f6186fc1c99adc1512f5305
-	md5sums = 66e44f6d70e52890c7feab066868c062
-	md5sums = 42b388b01db50af8b781b58bc6ac5414
+	md5sums = f5a0bdfe4e3c52e96c09c67d59234a68
+	md5sums = 993f55a94e99879694b978ac8726b0d7
 	md5sums = f264f961704f2aa1d480971b0e58617a
 	md5sums = d83f1c3845f28abd81cbfd215089d3d8
 
diff --git a/.gitignore b/.gitignore
index db484d761956..5d9746dff60c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /deepin.com.wechat*
 /deepin-wine-wechat-*.tar.xz
+/deepin-wine-wechat-*.pkg.tar.zst
 /pkg/
 /src/
 /WeChat*
diff --git a/PKGBUILD b/PKGBUILD
index 9363a143a6fe..16cf4befe354 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Codist <countstarlight@gmail.com>
 
 pkgname=deepin-wine-wechat
-pkgver=2.9.5.41
+pkgver=2.9.5.56
 wechat_installer=WeChatSetup
 deepinwechatver=2.6.8.65deepin0
 pkgrel=1
@@ -19,8 +19,8 @@ source=("$_mirror/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_${deepinwe
   "reg.patch"
   "shadow.exe")
 md5sums=('fe31cf4f0f6186fc1c99adc1512f5305'
-  '66e44f6d70e52890c7feab066868c062'
-  '42b388b01db50af8b781b58bc6ac5414'
+  'f5a0bdfe4e3c52e96c09c67d59234a68'
+  '993f55a94e99879694b978ac8726b0d7'
   'f264f961704f2aa1d480971b0e58617a'
   'd83f1c3845f28abd81cbfd215089d3d8')
 
diff --git a/README.md b/README.md
index 9c8425c4b6d2..748f7b3fb22f 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
     <img src="https://travis-ci.org/countstarlight/deepin-wine-wechat-arch.svg?branch=master" alt="Build Status">
   </a>
   <a href="https://pc.weixin.qq.com/">
-    <img src="https://img.shields.io/badge/WeChat-2.9.5.41-blue.svg" alt="WeChat Version">
+    <img src="https://img.shields.io/badge/WeChat-2.9.5.56-blue.svg" alt="WeChat Version">
   </a>
   <a href="https://aur.archlinux.org/packages/deepin-wine-wechat/">
     <img src="https://img.shields.io/aur/version/deepin-wine-wechat.svg" alt="AUR Version">
@@ -110,21 +110,22 @@ sudo pacman -U #下载的包名
 
 ## 兼容性记录
 
-| 微信版本  | wine版本 | 兼容性 |                             备注                             | deepin-wine版本 | 兼容性 |                             备注                             |
-| :-------: | :------: | :----: | :----------------------------------------------------------: | :-------------: | :----: | :----------------------------------------------------------: |
-| 2.9.5.41  |   5.11   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |    2.18_22-3    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |
-| 2.9.0.123 |   5.7    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |    2.18_22-3    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |
-| 2.9.0.114 |   5.6    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
-| 2.9.0.112 |   5.5    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
-| 2.8.0.133 |   5.3    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
-| 2.8.0.112 | 5.0-rc4  |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
-| 2.8.0.106 |   4.19   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
-| 2.7.1.88  |  4.19+   |  支持  |                                                              |                 |        |                                                              |
-| 2.7.1.88  |   4.18   |  部分  |                      不能使用中文输入法                      |                 |        |                                                              |
-| 2.7.1.85  |   4.18   |  部分  |                      不能使用中文输入法                      |    2.18_18-2    |   ?    |                                                              |
-| 2.7.1.82  |   4.18   |  部分  |                      不能使用中文输入法                      |    2.18_18-2    | 不支持 |                             闪退                             |
-| 2.7.1.82  |   4.17   |  部分  |                      不能使用中文输入法                      |    2.18_18-2    | 不支持 |                             闪退                             |
-| 2.6.8.65  |   4.16   |  支持  |                                                              |    2.18_18-2    |  支持  |                                                              |
+|   微信    |  wine   | 兼容性 |                             备注                             | deepin-wine | 兼容性 |                             备注                             |
+| :-------: | :-----: | :----: | :----------------------------------------------------------: | :---------: | :----: | :----------------------------------------------------------: |
+| 2.9.5.56  |  5.13   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |  2.18_24-3  |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |
+| 2.9.5.41  |  5.11   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |  2.18_22-3  |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |
+| 2.9.0.123 |   5.7   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |  2.18_22-3  |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |
+| 2.9.0.114 |   5.6   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |             |        |                                                              |
+| 2.9.0.112 |   5.5   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |             |        |                                                              |
+| 2.8.0.133 |   5.3   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |             |        |                                                              |
+| 2.8.0.112 | 5.0-rc4 |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |             |        |                                                              |
+| 2.8.0.106 |  4.19   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |             |        |                                                              |
+| 2.7.1.88  |  4.19+  |  支持  |                                                              |             |        |                                                              |
+| 2.7.1.88  |  4.18   |  部分  |                      不能使用中文输入法                      |             |        |                                                              |
+| 2.7.1.85  |  4.18   |  部分  |                      不能使用中文输入法                      |  2.18_18-2  |   ?    |                                                              |
+| 2.7.1.82  |  4.18   |  部分  |                      不能使用中文输入法                      |  2.18_18-2  | 不支持 |                             闪退                             |
+| 2.7.1.82  |  4.17   |  部分  |                      不能使用中文输入法                      |  2.18_18-2  | 不支持 |                             闪退                             |
+| 2.6.8.65  |  4.16   |  支持  |                                                              |  2.18_18-2  |  支持  |                                                              |
 
 ## 切换到 `deepin-wine`
 
@@ -250,7 +251,7 @@ env WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat" deepin-wine winecfg
 yay -S mingw-w64-gcc
 
 # 编译
-i686-w64-mingw32-g++ -municode -m32 -s shadow.cpp -o shadow
+i686-w64-mingw32-g++ -municode -m32 -static -s shadow.cpp -o shadow
 ```
 
 对于 `v2.8.0.133-2` 及之前的版本，不自带这个程序，可以自行将[shadow.exe](shadow.exe)放置到 `~/.deepinwine/Deepin-WeChat/drive_c/shadow.exe`
@@ -284,6 +285,7 @@ CallApp()
 
 ## 更新日志
 
+* 2020-07-20 WeChat-2.9.5.56
 * 2020-07-02 WeChat-2.9.5.41
 * 2020-05-10 WeChat-2.9.0.123
 * 2020-04-24 WeChat-2.9.0.114
diff --git a/run.sh b/run.sh
index ed545149fab1..e43acea326dc 100755
--- a/run.sh
+++ b/run.sh
@@ -11,7 +11,7 @@ WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat"
 APPDIR="/opt/deepinwine/apps/Deepin-WeChat"
 APPVER="2.6.8.65deepin0"
 WECHAT_INSTALLER="WeChatSetup"
-WECHAT_VER="2.9.5.41"
+WECHAT_VER="2.9.5.56"
 APPTAR="files.7z"
 PACKAGENAME="com.wechat"
 WINE_CMD="wine"
@@ -39,7 +39,7 @@ CallApp()
         env WINEPREFIX="$WINEPREFIX" WINEDEBUG=-msvcrt $WINE_CMD "c:\\Program Files\\Tencent\\WeChat\\WeChat.exe" &
 	fi
 
-	if [ ! -f "$WINEPREFIX/deepin" ]; then
+	if [ "$WINE_CMD" = "wine" ]; then
         # run 'shadow.exe' if process not exist
         if [[ -z "$(ps -e | grep -o 'shadow.exe')" ]]; then
 		    env WINEPREFIX="$WINEPREFIX" WINEDEBUG=-msvcrt $WINE_CMD "c:\\shadow.exe" &
@@ -104,29 +104,42 @@ CreateBottle()
     fi
 }
 
+msg()
+{
+	ECHO_LEVEL=("\033[1;32m==> " "\033[1;31m==> ERROR: ")
+	echo -e "${ECHO_LEVEL[$1]}\033[1;37m$2\033[0m"
+}
+
 SwitchToDeepinWine()
 {
 	PACKAGE_MANAGER="yay"
+	DEEPIN_WINE_DEPENDS="deepin-wine"
 	if ! [ -x "$(command -v yay)" ]; then
 		if ! [ -x "$(command -v yaourt)" ]; then
-			echo "Error: Need to install 'yay' or 'yaourt' first." >&2
+			msg 1 "Need to install 'yay' or 'yaourt' first." >&2
 			exit 1
 		else
 			$PACKAGE_MANAGER="yaourt"
 		fi
-    fi
-	echo -e "\033[0;34mInstalling dependencies ...\033[0m"
-	$PACKAGE_MANAGER -S deepin-wine xsettingsd lib32-freetype2-infinality-ultimate --needed
-	echo -e "\033[0;34mRedeploying app ...\033[0m"
+	fi
+	if [[ -z "$(ps -e | grep -o gsd-xsettings)" ]]; then
+		DEEPIN_WINE_DEPENDS="${DEEPIN_WINE_DEPENDS} xsettingsd"
+	fi
+	if [ "$XDG_CURRENT_DESKTOP" = "Deepin" ]; then
+		DEEPIN_WINE_DEPENDS="${DEEPIN_WINE_DEPENDS} lib32-freetype2-infinality-ultimate"
+	fi
+	msg 0 "Installing dependencies: ${DEEPIN_WINE_DEPENDS} ..."
+	$PACKAGE_MANAGER -S ${DEEPIN_WINE_DEPENDS} --needed
+	msg 0 "Redeploying app ..."
 	if [ -d "$WINEPREFIX" ]; then
 		RemoveApp
 	fi
 	DeployApp
-	echo -e "\033[0;34mReversing the patch ...\033[0m"
+	msg 0 "Reversing the patch ..."
 	patch -p1 -R -d  ${WINEPREFIX} < $APPDIR/reg.patch
-	echo -e "\033[0;34mCreating flag file '$WINEPREFIX/deepin' ...\033[0m"
+	msg 0 "Creating flag file '$WINEPREFIX/deepin' ..."
 	touch -f $WINEPREFIX/deepin
-	echo -e "\033[0;34mDone.\033[0m"
+	msg 0 "Done."
 }
 
 # Init