Upgrade WeChat to 3.0.0.57

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

7 files changed, 41 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c2d73c1cabf..7b08a2439b53 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.56
+	pkgver = 3.0.0.57
 	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.56.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
+	source = WeChatSetup-3.0.0.57.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
 	source = run.sh
 	source = reg.patch
 	source = shadow.exe
 	md5sums = fe31cf4f0f6186fc1c99adc1512f5305
-	md5sums = f5a0bdfe4e3c52e96c09c67d59234a68
-	md5sums = 993f55a94e99879694b978ac8726b0d7
+	md5sums = 2b103d675a045a2ef68c23c6c7339471
+	md5sums = ab8fc323e66bdbbcd734df7f9dbdce31
 	md5sums = f264f961704f2aa1d480971b0e58617a
 	md5sums = d83f1c3845f28abd81cbfd215089d3d8
 
diff --git a/.gitignore b/.gitignore
index 5d9746dff60c..b15f2a37d299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 /deepin.com.wechat*
-/deepin-wine-wechat-*.tar.xz
-/deepin-wine-wechat-*.pkg.tar.zst
+/deepin-wine-wechat-*.pkg*
 /pkg/
 /src/
 /WeChat*
diff --git a/.travis.yml b/.travis.yml
index 58db7262d324..7fd012909315 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ archlinux:
   - lib32-libldap
   script:
   - "makepkg"
+  - "./gen.sh -m"
 
 script:
 - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash"
@@ -34,7 +35,7 @@ deploy:
   api_key: $GH_TOKEN
   file_glob: true
   file:
-    - "deepin-wine-wechat-*-x86_64.pkg.tar.xz"
+    - "deepin-wine-wechat*.pkg*"
   on:
     tags: true
     all_branches: true
diff --git a/PKGBUILD b/PKGBUILD
index 16cf4befe354..3aa219535713 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Codist <countstarlight@gmail.com>
 
 pkgname=deepin-wine-wechat
-pkgver=2.9.5.56
+pkgver=3.0.0.57
 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'
-  'f5a0bdfe4e3c52e96c09c67d59234a68'
-  '993f55a94e99879694b978ac8726b0d7'
+  '2b103d675a045a2ef68c23c6c7339471'
+  'ab8fc323e66bdbbcd734df7f9dbdce31'
   'f264f961704f2aa1d480971b0e58617a'
   'd83f1c3845f28abd81cbfd215089d3d8')
 
diff --git a/README.md b/README.md
index 748f7b3fb22f..091d5550f2e8 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.56-blue.svg" alt="WeChat Version">
+    <img src="https://img.shields.io/badge/WeChat-3.0.0.57-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">
@@ -64,6 +64,8 @@ Deepin打包的微信(WeChat)容器移植到Archlinux，不依赖`deepin-wine`�
 
 **注意：由于新版微信可能需要 `wine` 还没有实现的一些win api，这会导致一些功能不可用，安装前先根据[兼容性记录](#兼容性记录)选择一个合适的版本**
 
+以下三种安装方式效果相同，选择一种即可
+
 ### 从AUR安装
 
 已添加到AUR [deepin-wine-wechat](https://aur.archlinux.org/packages/deepin-wine-wechat/)，可使用 `yay` 或 `yaourt` 安装:
@@ -76,12 +78,18 @@ yay -S deepin-wine-wechat
 
 > 由 [Travis CI](https://travis-ci.org/countstarlight/deepin-wine-wechat-arch) 在 Docker 容器 [mikkeloscar/arch-travis](https://hub.docker.com/r/mikkeloscar/arch-travis) 中自动构建的 ArchLinux 安装包
 
-在[GitHub Release](https://github.com/countstarlight/deepin-wine-wechat-arch/releases)页面下载 `.pkg.tar.xz`后缀的安装包，使用`pacman`安装：
+在 [GitHub Release](https://github.com/countstarlight/deepin-wine-wechat-arch/releases) 页面下载后缀为 `.pkg.tar.xz` 或 `.pkg.tar.zst` 的安装包，使用`pacman`安装：
 
 ```bash
 sudo pacman -U #下载的包名
 ```
 
+`.md5` 文件用于校验包完整性：
+
+```bash
+md5sum -c *.md5
+```
+
 ### 本地打包安装
 
 ```shell
@@ -112,6 +120,7 @@ sudo pacman -U #下载的包名
 
 |   微信    |  wine   | 兼容性 |                             备注                             | deepin-wine | 兼容性 |                             备注                             |
 | :-------: | :-----: | :----: | :----------------------------------------------------------: | :---------: | :----: | :----------------------------------------------------------: |
+| 3.0.0.57  |  5.19   |  支持  |                                                              |  2.18_24-3  |  支持  |                                                              |
 | 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) |
@@ -285,6 +294,7 @@ CallApp()
 
 ## 更新日志
 
+* 2020-10-16 WeChat-3.0.0.57
 * 2020-07-20 WeChat-2.9.5.56
 * 2020-07-02 WeChat-2.9.5.41
 * 2020-05-10 WeChat-2.9.0.123
diff --git a/gen.sh b/gen.sh
index 7b840fbf21f9..7fa9309db8c7 100755
--- a/gen.sh
+++ b/gen.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+PACKAGE_NAME="deepin-wine-wechat"
+PACKAGE_SUFFIX=(".pkg.tar.xz" ".pkg.tar.zst")
+
 GenPatch()
 {
     diff -ruN reg_tmp/ reg_tmp_fixed/ > reg.patch
@@ -30,6 +33,13 @@ Tar()
     cd ../
 }
 
+Md5()
+{
+    for i in "${PACKAGE_SUFFIX[@]}"; do
+        find . -type f -name "${PACKAGE_NAME}*$i" -execdir sh -c 'md5sum "$1" > "$1.md5"' _ {} \;
+    done
+}
+
 HelpApp()
 {
     echo " Extra Commands:"
@@ -37,7 +47,8 @@ HelpApp()
     echo " -e/--extract        Extract reg files from reg_files.tar.bz2 to dir reg_tmp_fixed/"
     echo " -g/--gen            Generate AUR package info to .SRCINFO"
     echo " -c/--clean          Clean files which not track by git"
-    echo " -t/--tar            Package reg files and modify the md5 value in PKGBUILD"
+    echo " -t/--tar            Package reg files"
+    echo " -m/--md5            Generate the md5 file of each package"
     echo " -h/--help           Show program help info"
 }
 
@@ -62,6 +73,9 @@ case $1 in
     "-t" | "--tar")
         Tar
     ;;
+    "-m" | "--md5")
+        Md5
+    ;;
     "-h" | "--help")
         HelpApp
     ;;
diff --git a/run.sh b/run.sh
index e43acea326dc..713f26f44f73 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.56"
+WECHAT_VER="3.0.0.57"
 APPTAR="files.7z"
 PACKAGENAME="com.wechat"
 WINE_CMD="wine"
@@ -146,6 +146,9 @@ SwitchToDeepinWine()
 if [ -f "$WINEPREFIX/deepin" ]; then
 	WINE_CMD="deepin-wine"
 	if [[ -z "$(ps -e | grep -o gsd-xsettings)" ]] && [[ -z "$(ps -e | grep -o xsettingsd)" ]]; then
+		if [[ ! -f "$HOME/.xsettingsd" ]] && [[ ! -f "$HOME/.config/xsettingsd/xsettingsd.conf" ]] && [[ ! -f "/etc/xsettingsd/xsettingsd.conf" ]]; then
+			touch "$HOME/.config/xsettingsd/xsettingsd.conf"
+		fi
 		/usr/bin/xsettingsd &
 	fi
 fi