Upgrade QQ to 9.3.9.27427

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

5 files changed, 22 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 958ffbdd6452..78119cfeb571 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-qq
 	pkgdesc = Tencent QQ (com.qq.im) on Deepin Wine For Archlinux
-	pkgver = 9.3.8.27381
+	pkgver = 9.3.9.27427
 	pkgrel = 1
 	url = http://im.qq.com/
 	install = deepin-wine-qq.install
@@ -21,13 +21,13 @@ pkgbase = deepin-wine-qq
 	conflicts = deepin-qq-im
 	conflicts = deepin.com.qq.im
 	source = https://mirrors.ustc.edu.cn/deepin/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_9.1.8deepin0_i386.deb
-	source = PCQQ2020-9.3.8.27381.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe
+	source = PCQQ2020-9.3.9.27427.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe
 	source = run.sh
 	source = reg.patch
 	md5sums = d35bd4abfd1ac4c5e71c7fbc5282ccbd
-	md5sums = 1a777a9071509e30e9597f7f814219cd
-	md5sums = f33ff6e53eaaa7e5d427e365d76d5875
-	md5sums = 779ac006922a4668a549be743a3fa984
+	md5sums = 1c2ce821184b8e9304d728d3ce81f639
+	md5sums = 1a66f3d79817c083a6fb18ef3638a444
+	md5sums = 1ef3c4bf135be4c56776118f89ed14d1
 
 pkgname = deepin-wine-qq
 
diff --git a/PKGBUILD b/PKGBUILD
index 1c61bef1e032..7beaf5e116a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Codist <countstarlight@gmail.com>
 
 pkgname=deepin-wine-qq
-pkgver=9.3.8.27381
+pkgver=9.3.9.27427
 qq_installer=PCQQ2020
 deepinqqver=9.1.8deepin0
 pkgrel=1
@@ -18,9 +18,9 @@ source=("$_mirror/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_${deepinqqve
   "run.sh"
   "reg.patch")
 md5sums=('d35bd4abfd1ac4c5e71c7fbc5282ccbd'
-  '1a777a9071509e30e9597f7f814219cd'
-  'f33ff6e53eaaa7e5d427e365d76d5875'
-  '779ac006922a4668a549be743a3fa984')
+  '1c2ce821184b8e9304d728d3ce81f639'
+  '1a66f3d79817c083a6fb18ef3638a444'
+  '1ef3c4bf135be4c56776118f89ed14d1')
 
 build() {
   msg "Extracting DPKG package ..."
diff --git a/README.md b/README.md
index 14e29f79c803..b7bc2d6112c1 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
     <img src="https://travis-ci.org/countstarlight/deepin-wine-qq-arch.svg?branch=master" alt="Build Status">
   </a>
   <a href="https://im.qq.com/download/">
-    <img src="https://img.shields.io/badge/QQ-9.3.8.27381-blue.svg" alt="QQ Version">
+    <img src="https://img.shields.io/badge/QQ-9.3.9.27427-blue.svg" 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.svg" alt="AUR Version">
@@ -63,6 +63,10 @@ Deepin打包的QQ容器移植到Archlinux，不依赖`deepin-wine`，包含定�
 +Include = /etc/pacman.d/mirrorlist
 ```
 
+**注意：由于新版QQ可能需要 `wine` 还没有实现的一些win api，这会导致一些功能不可用，安装前先根据[兼容性记录](#兼容性记录)选择一个合适的版本**
+
+以下三种安装方式效果相同，选择一种即可
+
 ### 从AUR安装
 
 已添加到 AUR [deepin-wine-qq](https://aur.archlinux.org/packages/deepin-wine-qq/)，可使用 `yay` 或 `yaourt` 安装:
@@ -105,6 +109,7 @@ md5sum -c *.md5
 
 |     QQ      |  wine  |   兼容性   |        备注        | deepin-wine | 兼容性 | 备注 |
 | :---------: | :----: | :--------: | :----------------: | :---------: | :----: | :--: |
+| 9.3.9.27427 |  5.19  |    支持    |                    |  2.18_24-3  |  支持  |      |
 | 9.3.8.27381 |  5.17  | **不支持** |      无法启动      |  2.18_24-3  |  支持  |      |
 | 9.3.7.27301 |  5.15  |    支持    |                    |  2.18_24-3  |  支持  |      |
 | 9.3.6.27263 |  5.12  |    支持    |                    |  2.18_22-3  |  支持  |      |
@@ -246,6 +251,7 @@ env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine winecfg
 
 ## 更新日志
 
+* 2020-10-18 QQ-9.3.9.27427
 * 2020-09-13 QQ-9.3.8.27381
 * 2020-08-16 QQ-9.3.7.27301
 * 2020-07-19 QQ-9.3.6.27263
diff --git a/reg.patch b/reg.patch
index 8a3a46564d87..1f433e14419c 100644
--- a/reg.patch
+++ b/reg.patch
@@ -29,7 +29,7 @@ diff -ruN reg_tmp/system.reg reg_tmp_fixed/system.reg
  [Software\\Tencent\\PlatForm_Type_List\\1] 1486366185
  #time=1d2804aca40187a
 -"TypeName"="QQ8.9"
-+"TypeName"="QQ9.3.8"
++"TypeName"="QQ9.3.9"
  "TypePath"="C:\\Program Files\\Tencent\\QQ\\Bin\\QQ.exe"
  
  [Software\\Tencent\\PlatForm_Type_List\\3] 1486366142
@@ -41,7 +41,7 @@ diff -ruN reg_tmp/user.reg reg_tmp_fixed/user.reg
  [Software\\Tencent\\PlatForm_Type_List\\1] 1486366185
  #time=1d2804aca401244
 -"TypeName"="QQ8.9"
-+"TypeName"="QQ9.3.8"
++"TypeName"="QQ9.3.9"
  "TypePath"="C:\\Program Files\\Tencent\\QQ\\Bin\\QQ.exe"
  
  [Software\\Tencent\\Plugin\\VAS\\842404343] 1486366176
diff --git a/run.sh b/run.sh
index 46fa0aaa754d..58619f9eed1a 100755
--- a/run.sh
+++ b/run.sh
@@ -10,7 +10,7 @@ WINEPREFIX="$HOME/.deepinwine/Deepin-QQ"
 APPDIR="/opt/deepinwine/apps/Deepin-QQ"
 APPVER="9.1.8deepin0"
 QQ_INSTALLER="PCQQ2020"
-QQ_VER="9.3.8.27381"
+QQ_VER="9.3.9.27427"
 APPTAR="files.7z"
 PACKAGENAME="com.qq.im"
 WINE_CMD="wine"
@@ -137,6 +137,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