Upgrade WeChat to 2.9.0.112

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

5 files changed, 51 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb91a0fbb005..dd834c9ad716 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deepin-wine-wechat
 	pkgdesc = Tencent WeChat (com.wechat) on Deepin Wine For Archlinux
-	pkgver = 2.8.0.133
-	pkgrel = 4
+	pkgver = 2.9.0.112
+	pkgrel = 1
 	url = https://weixin.qq.com/
 	install = deepin-wine-wechat.install
 	arch = x86_64
@@ -9,7 +9,7 @@ pkgbase = deepin-wine-wechat
 	depends = p7zip
 	depends = wine
 	depends = wine-mono
-	depends = wine_gecko
+	depends = wine-gecko
 	depends = xorg-xwininfo
 	depends = wqy-microhei
 	depends = lib32-alsa-lib
@@ -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.8.0.133.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
+	source = WeChatSetup-2.9.0.112.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
 	source = run.sh
 	source = reg.patch
 	source = shadow.exe
 	md5sums = fe31cf4f0f6186fc1c99adc1512f5305
-	md5sums = 562d71c57e136a8aaa3be0d135092161
-	md5sums = d25d415fbcf6c7608d0aa12188d755ea
+	md5sums = 1c2052b1e4e4d27b746b3723683619ac
+	md5sums = c1af7dde992a30815c185152527fbd0d
 	md5sums = f264f961704f2aa1d480971b0e58617a
 	md5sums = 0138f993c99d899e609bad85c2c9a15c
 
diff --git a/PKGBUILD b/PKGBUILD
index 8ac0691474be..e017124b4b3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Codist <countstarlight@gmail.com>
 
 pkgname=deepin-wine-wechat
-pkgver=2.8.0.133
+pkgver=2.9.0.112
 wechat_installer=WeChatSetup
 deepinwechatver=2.6.8.65deepin0
-pkgrel=4
+pkgrel=1
 pkgdesc="Tencent WeChat (com.wechat) on Deepin Wine For Archlinux"
 arch=("x86_64")
 url="https://weixin.qq.com/"
 license=('custom')
-depends=('p7zip' 'wine' 'wine-mono' 'wine_gecko' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-libldap')
+depends=('p7zip' 'wine' 'wine-mono' 'wine-gecko' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-libldap')
 conflicts=('deepin-wechat')
 install="deepin-wine-wechat.install"
 _mirror="https://mirrors.ustc.edu.cn/deepin"
@@ -19,8 +19,8 @@ source=("$_mirror/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_${deepinwe
   "reg.patch"
   "shadow.exe")
 md5sums=('fe31cf4f0f6186fc1c99adc1512f5305'
-  '562d71c57e136a8aaa3be0d135092161'
-  'd25d415fbcf6c7608d0aa12188d755ea'
+  '1c2052b1e4e4d27b746b3723683619ac'
+  'c1af7dde992a30815c185152527fbd0d'
   'f264f961704f2aa1d480971b0e58617a'
   '0138f993c99d899e609bad85c2c9a15c')
 
@@ -53,13 +53,4 @@ package() {
   install -m644 "${srcdir}/files.7z" "${pkgdir}/opt/deepinwine/apps/Deepin-WeChat/"
   install -m755 "${srcdir}/run.sh" "${pkgdir}/opt/deepinwine/apps/Deepin-WeChat/"
   install -m644 "${srcdir}/${wechat_installer}-${pkgver}.exe" "${pkgdir}/opt/deepinwine/apps/Deepin-WeChat/"
-  msg "Printing help info ..."
-  echo -e "\033[0;34m============================提示/INFO==============================="
-  echo -e "\033[0;34m* 报告问题(Report issue):"
-  echo -e "\033[0;34m  https://github.com/countstarlight/deepin-wine-wechat-arch/issues"
-  echo -e "\033[0;34m* 切换到 'deepin-wine'(Switch to 'deepin-wine'):"
-  echo -e "\033[0;34m  https://github.com/countstarlight/deepin-wine-wechat-arch"
-  echo -e "\033[0;34m* 安装包下载(Installation package download):"
-  echo -e "\033[0;34m  https://github.com/countstarlight/deepin-wine-wechat-arch/releases"
-  echo -e "\033[0;34m===================================================================="
 }
diff --git a/README.md b/README.md
index c932264dca39..d6241d9f522f 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.8.0.133-blue.svg" alt="WeChat Version">
+    <img src="https://img.shields.io/badge/WeChat-2.9.0.112-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">
@@ -32,10 +32,9 @@ Deepin打包的微信(WeChat)容器移植到Archlinux，不依赖`deepin-wine`�
     - [自动切换](#自动切换)
     - [手动切换](#手动切换)
         - [1. 安装 `deepin-wine`](#1-安装-deepin-wine)
-        - [2. 安装 `xsettingsd`](#2-安装-xsettingsd)
-        - [3. 修改 `deepin-wine-wechat` 的启动文件](#3-修改-deepin-wine-wechat-的启动文件)
-        - [4. 删除已安装的微信目录](#4-删除已安装的微信目录)
-        - [5. 修复 `deepin-wine` 字体渲染发虚](#5-修复-deepin-wine-字体渲染发虚)
+        - [2. 对于非 GNOME 桌面(KDE, XFCE等)](#2-对于非-gnome-桌面kde-xfce等)
+        - [3. 删除已安装的微信目录](#3-删除已安装的微信目录)
+        - [4. 修复 `deepin-wine` 字体渲染发虚](#4-修复-deepin-wine-字体渲染发虚)
 - [常见问题及解决](#常见问题及解决)
     - [不能截图](#不能截图)
     - [高分辨率屏幕支持](#高分辨率屏幕支持)
@@ -48,7 +47,7 @@ Deepin打包的微信(WeChat)容器移植到Archlinux，不依赖`deepin-wine`�
 
 ## 安装
 
-`deepin-wine-wechat`依赖`Multilib`仓库中的`wine`，`wine_gecko`和`wine-mono`，Archlinux默认没有开启`Multilib`仓库，需要编辑`/etc/pacman.conf`，取消对应行前面的注释([Archlinux wiki](https://wiki.archlinux.org/index.php/Official_repositories#multilib)):
+`deepin-wine-wechat`依赖`Multilib`仓库中的`wine`，`wine-gecko`和`wine-mono`，Archlinux默认没有开启`Multilib`仓库，需要编辑`/etc/pacman.conf`，取消对应行前面的注释([Archlinux wiki](https://wiki.archlinux.org/index.php/Official_repositories#multilib)):
 
 ```diff
 # If you want to run 32 bit applications on your x86_64 system,
@@ -113,19 +112,20 @@ sudo pacman -U #下载的包名
 
 | 微信版本  | wine版本 | 兼容性 |                             备注                             | deepin-wine版本 | 兼容性 | 备注 |
 | :-------: | :------: | :----: | :----------------------------------------------------------: | :-------------: | :----: | :--: |
+| 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-1  |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |      |
-| 2.7.1.88  |  4.19-1  |  支持  |                                                              |                 |        |      |
-| 2.7.1.88  |  4.18-1  |  部分  |                      不能使用中文输入法                      |                 |        |      |
-| 2.7.1.85  |  4.18-1  |  部分  |                      不能使用中文输入法                      |    2.18_18-2    |   ?    |      |
-| 2.7.1.82  |  4.18-1  |  部分  |                      不能使用中文输入法                      |    2.18_18-2    | 不支持 | 闪退 |
-| 2.7.1.82  |  4.17-1  |  部分  |                      不能使用中文输入法                      |    2.18_18-2    | 不支持 | 闪退 |
-| 2.6.8.65  |  4.16-1  |  支持  |                                                              |    2.18_18-2    |  支持  |      |
+| 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`
 
-由于原版 `wine` 在 [DDE(Deepin Desktop Environment)](https://www.deepin.org/dde/) 上，存在托盘图标无法响应鼠标事件([deepin-wine-tim-arch#21](https://github.com/countstarlight/deepin-wine-tim-arch/issues/21))，边框穿透显示([deepin-wine-wechat-arch#15](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/15)), 无法截图等问题，且原版 `wine` 尚不能实现保存登录密码等功能，可以选择切换到 `deepin-wine`。
+原版 `wine` 在 [DDE(Deepin Desktop Environment)](https://www.deepin.org/dde/) 上，有托盘图标无法响应鼠标事件([deepin-wine-tim-arch#21](https://github.com/countstarlight/deepin-wine-tim-arch/issues/21))的问题，截图功能也不可用，可以选择切换到 `deepin-wine`。
 
 **注意：切换前先确保 `deepin-wine` 支持**
 
@@ -159,7 +159,9 @@ sudo pacman -Rns deepin-wine xsettingsd lib32-freetype2-infinality-ultimate
 yay -S deepin-wine
 ```
 
-#### 2. 安装 `xsettingsd`
+#### 2. 对于非 GNOME 桌面(KDE, XFCE等)
+
+需要安装 `xsettingsd`：
 
 根据 [deepin-wine-wechat-arch#36](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/36#issuecomment-612001200)，由[Face-Smile](https://github.com/Face-Smile)提供的方法：
 
@@ -167,8 +169,6 @@ yay -S deepin-wine
 sudo pacman -S xsettingsd
 ```
 
-#### 3. 修改 `deepin-wine-wechat` 的启动文件
-
 修改 `/opt/deepinwine/apps/Deepin-WeChat/run.sh`：
 
 ```diff
@@ -188,13 +188,17 @@ sudo pacman -S xsettingsd
 
 **注意：对 `/opt/deepinwine/apps/Deepin-WeChat/run.sh` 的修改会在 `deepin-wine-wechat` 更新或重装时被覆盖，可以单独拷贝一份作为启动脚本**
 
-#### 4. 删除已安装的微信目录
+#### 3. 删除已安装的微信目录
 
 ```bash
 rm -rf ~/.deepinwine/Deepin-WeChat
 ```
 
-#### 5. 修复 `deepin-wine` 字体渲染发虚
+#### 4. 修复 `deepin-wine` 字体渲染发虚
+
+kde桌面参考：[deepin-wine-wechat-arch#36](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/36)
+
+deepin 桌面：
 
 ```bash
 yay -S lib32-freetype2-infinality-ultimate
@@ -261,6 +265,7 @@ CallApp()
 
 ## 更新日志
 
+* 2020-04-20 WeChat-2.9.0.112
 * 2020-03-08 WeChat-2.8.0.133
 * 2020-02-10 WeChat-2.8.0.121
 * 2020-01-20 WeChat-2.8.0.116
diff --git a/deepin-wine-wechat.install b/deepin-wine-wechat.install
index 5b8b1f2b7c1e..1b9ef098ae41 100644
--- a/deepin-wine-wechat.install
+++ b/deepin-wine-wechat.install
@@ -1,5 +1,19 @@
+info() {
+    echo -e "\033[0;34m============================提示/INFO==============================="
+    echo -e "\033[0;34m* 反馈问题(Report issue):"
+    echo -e "\033[0;34m  https://github.com/countstarlight/deepin-wine-wechat-arch/issues"
+    echo -e "\033[0;34m* 切换到 'deepin-wine'(Switch to 'deepin-wine'):"
+    echo -e "\033[0;34m  https://github.com/countstarlight/deepin-wine-wechat-arch"
+    echo -e "\033[0;34m* 安装包下载(Installation package download):"
+    echo -e "\033[0;34m  https://github.com/countstarlight/deepin-wine-wechat-arch/releases"
+    echo -e "\033[0;34m===================================================================="
+}
+post_install() {
+    info
+}
 post_upgrade() {
     find /home -maxdepth 2 -name ".deepinwine" -exec rm -f \{\}/Deepin-WeChat/reinstalled \;
+    info
 }
 pre_remove() {
     echo "deleting the WeChat bottle..."
diff --git a/run.sh b/run.sh
index 6ccaab044bfc..5481bec78b3f 100755
--- a/run.sh
+++ b/run.sh
@@ -10,7 +10,7 @@ WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat"
 APPDIR="/opt/deepinwine/apps/Deepin-WeChat"
 APPVER="2.6.8.65deepin0"
 WECHAT_INSTALLER="WeChatSetup"
-WECHAT_VER="2.8.0.133"
+WECHAT_VER="2.9.0.112"
 APPTAR="files.7z"
 PACKAGENAME="com.wechat"
 WINE_CMD="wine"
@@ -121,7 +121,7 @@ SwitchToDeepinWine()
 # Init
 if [ -f "$WINEPREFIX/deepin" ]; then
 	WINE_CMD="deepin-wine"
-	if [[ -z "$(ps -e | grep -o xsettingsd)" ]]; then
+	if [[ -z "$(ps -e | grep -o gsd-xsettings)" ]] && [[ -z "$(ps -e | grep -o xsettingsd)" ]]; then
 		/usr/bin/xsettingsd &
 	fi
 fi