Upgrade QQ to 9.5.1.27888

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

4 files changed, 56 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac4ced263f07..e4bb9f39c225 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-qq
 	pkgdesc = Tencent QQ on Deepin Wine5(com.qq.im.deepin) For Archlinux
-	pkgver = 9.5.0.27852
+	pkgver = 9.5.1.27888
 	pkgrel = 1
 	url = https://im.qq.com/
 	install = deepin-wine-qq.install
@@ -20,10 +20,10 @@ pkgbase = deepin-wine-qq
 	conflicts = deepin-qq-im
 	conflicts = deepin.com.qq.im
 	source = https://cdn-package-store6.deepin.com/appstore/pool/appstore/c/com.qq.im.deepin/com.qq.im.deepin_9.3.2deepin20_i386.deb
-	source = PCQQ2021-9.5.0.27852.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2021.exe
+	source = PCQQ2021-9.5.1.27888.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2021.exe
 	source = run.sh
 	md5sums = 5fdc20e614d945bd2ba5251420872479
-	md5sums = c685254049819c9d277916d5d7e977e7
-	md5sums = 30839f5549a405b94ef38093162ebc44
+	md5sums = 771fde2d9fb52617d27b1cec6d4ca770
+	md5sums = da3fffc3319a883f781798003171a9f5
 
 pkgname = deepin-wine-qq
diff --git a/PKGBUILD b/PKGBUILD
index 61437b1a091b..cf92c0110f74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: taotieren <admin@taotieren.com>
 
 pkgname=deepin-wine-qq
-pkgver=9.5.0.27852
+pkgver=9.5.1.27888
 qq_installer=PCQQ2021
 debpkgver=9.3.2deepin20
 debpkgname="com.qq.im.deepin"
@@ -19,8 +19,8 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${debpkgv
   "${qq_installer}-${pkgver}.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/${qq_installer}.exe"
   "run.sh")
 md5sums=('5fdc20e614d945bd2ba5251420872479'
-  'c685254049819c9d277916d5d7e977e7'
-  '30839f5549a405b94ef38093162ebc44')
+  '771fde2d9fb52617d27b1cec6d4ca770'
+  'da3fffc3319a883f781798003171a9f5')
 
 build() {
   msg "Extracting DPKG package ..."
diff --git a/README.md b/README.md
index 7fe6dfd96317..ef6ef72c9e79 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
     <img src="https://img.shields.io/github/workflow/status/countstarlight/deepin-wine-qq-arch/CI/action?logo=github&style=flat-square" alt="Build Status">
   </a>
   <a href="https://im.qq.com/download/">
-    <img src="https://img.shields.io/badge/QQ-9.5.0.27852-blue?style=flat-square&logo=tencent-qq" alt="QQ Version">
+    <img src="https://img.shields.io/badge/QQ-9.5.1.27888-blue?style=flat-square&logo=tencent-qq" alt="QQ Version">
   </a>
   <a href="https://aur.archlinux.org/packages/deepin-wine-qq/">
     <img src="https://img.shields.io/aur/version/deepin-wine-qq?label=AUR&logo=arch-linux&style=flat-square" alt="AUR Version">
@@ -40,6 +40,7 @@ Deepin 打包的 QQ 容器(`com.qq.im.deepin`)移植到 Archlinux，包含定制
     - [网络连接状态改变后不能重连](#网络连接状态改变后不能重连)
     - [高分辨率屏幕支持](#高分辨率屏幕支持)
     - [GNOME 桌面上的悬浮窗口问题](#gnome-桌面上的悬浮窗口问题)
+    - [防止使用系统安装的 Windows 字体](#防止使用系统安装的-windows-字体)
     - [不能启动/卡死/卡顿问题](#不能启动卡死卡顿问题)
     - [使用其他字体](#使用其他字体)
 - [感谢](#感谢)
@@ -208,11 +209,56 @@ QQ在本地保存的数据不会被删除，如保存在用户文档下的数据
 
 安装 GNOME 插件: [TopIcons Plus](https://extensions.gnome.org/extension/1031/topicons/)
 
+
+### 防止使用系统安装的 Windows 字体
+
+> 参照 https://blog.zhullyb.top/2021/04/27/hide-simsun-from-deepin-wine-tim/
+
+假设 Windows 字体都安装在 `/usr/share/fonts/TTF/` 目录下
+
+先安装 `bubblewrap`：
+```bash
+sudo pacman -S bubblewrap --needed
+```
+
+然后每次用如下命令启动QQ:
+```bash
+bwrap --dev-bind / / --tmpfs /usr/share/fonts/TTF/ /opt/apps/com.qq.im.deepin/files/run.sh
+```
+
+也可以修改 `deepin-wine-qq` 的应用菜单 `/usr/share/applications/com.qq.im.deepin.desktop`：
+```diff
+#!/usr/bin/env xdg-open
+
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+X-Created-By=Deepin WINE Team
+Categories=chat;Network;
+Icon=com.qq.im.deepin
+-Exec="/opt/apps/com.qq.im.deepin/files/run.sh"
++Exec="bwrap --dev-bind / / --tmpfs /usr/share/fonts/TTF/ /opt/apps/com.qq.im.deepin/files/run.sh"
+Name=QQ
+Name[zh_CN]=QQ
+Comment=Tencent QQ Client on Deepin Wine
+StartupWMClass=QQ.exe
+MimeType=
+
+```
+就可以和之前一样通过应用菜单中的QQ图标启动
+
+:warning: **注意：对 `/usr/share/applications/com.qq.im.deepin.desktop` 的修改会在重装或更新后被覆盖**
+
 ### 不能启动/卡死/卡顿问题
 
+> 由 [AUR](https://aur.archlinux.org/packages/com.tencent.meeting.deepin/) 的 [huyz](https://aur.archlinux.org/account/huyz) 提供的方法
+
+如果你在系统里安装了 windows 的宋体（simsun.ttc），则需复制一份 `simsun.ttc` 到 wine 容器（`$HOME/.deepinwine/Deepin-QQ/drive_c/windows/fonts`）里，否则程序可能会崩溃。
+
 > 参照 [deepin-wine-qq-arch#19](https://github.com/countstarlight/deepin-wine-qq-arch/issues/19)
 
 用原版 `dwrite.dll` 替换 `$HOME/.deepinwine/Deepin-QQ/drive_c/windows/system32/dwrite.dll`
+
 再参照[设置](#设置)打开 `winecfg`，在 `Libraries` 中新增一项 `dwrite`，将新增的 `dwrite` 设置为原装先于内建(Native then Builtin)。
 
 ### 使用其他字体
@@ -234,6 +280,7 @@ QQ在本地保存的数据不会被删除，如保存在用户文档下的数据
 <details open>
 <summary>2021</summary>
 
+* 2021-10-08 QQ-9.5.1.27888
 * 2021-08-25 QQ-9.5.0.27852
 * 2021-07-16 QQ-9.4.9.27849
 * 2021-07-09 QQ-9.4.9.27847
diff --git a/run.sh b/run.sh
index e3d8e8d42bda..64a8ede0c418 100755
--- a/run.sh
+++ b/run.sh
@@ -12,7 +12,7 @@ version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1";
 BOTTLENAME="Deepin-QQ"
 APPVER="9.3.2deepin20"
 WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME"
-QQ_VER="9.5.0.27852"
+QQ_VER="9.5.1.27888"
 EXEC_PATH="c:/Program Files/Tencent/QQ/Bin/QQ.exe"
 START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
 QQ_INSTALLER="PCQQ2021"