Upgrade QQ to 9.3.7.27301

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

6 files changed, 44 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ffb916429e4..218d6a50f444 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.6.27263
+	pkgver = 9.3.7.27301
 	pkgrel = 1
 	url = http://im.qq.com/
 	install = deepin-wine-qq.install
@@ -21,12 +21,12 @@ 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.6.27263.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe
+	source = PCQQ2020-9.3.7.27301.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe
 	source = run.sh
 	source = reg.patch
 	md5sums = d35bd4abfd1ac4c5e71c7fbc5282ccbd
-	md5sums = b3f3654f709f85fb26bf8f879920cfc0
-	md5sums = da18a31ea048426f3edbdaa39bea6e0c
+	md5sums = 46878fd9908c8a099cbd308f9314ade6
+	md5sums = c2802529fb307e2feb2f9e9dcfaba1c0
 	md5sums = 4b131fb1e7cf8fdf695876032842b39d
 
 pkgname = deepin-wine-qq
diff --git a/.travis.yml b/.travis.yml
index e71b9923f5eb..72b5412c602e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ archlinux:
   - lib32-gnutls
   script:
   - "makepkg"
+  - "./gen.sh -m"
 
 script:
 - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash"
@@ -32,7 +33,7 @@ deploy:
   api_key: $GH_TOKEN
   file_glob: true
   file:
-    - "deepin-wine-qq-*-x86_64.pkg.tar.xz"
+    - "deepin-wine-qq*.pkg*"
   on:
     tags: true
     all_branches: true
diff --git a/PKGBUILD b/PKGBUILD
index 134044ffc090..ddc2120c4ebd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Codist <countstarlight@gmail.com>
 
 pkgname=deepin-wine-qq
-pkgver=9.3.6.27263
+pkgver=9.3.7.27301
 qq_installer=PCQQ2020
 deepinqqver=9.1.8deepin0
 pkgrel=1
@@ -18,8 +18,8 @@ source=("$_mirror/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_${deepinqqve
   "run.sh"
   "reg.patch")
 md5sums=('d35bd4abfd1ac4c5e71c7fbc5282ccbd'
-  'b3f3654f709f85fb26bf8f879920cfc0'
-  'da18a31ea048426f3edbdaa39bea6e0c'
+  '46878fd9908c8a099cbd308f9314ade6'
+  'c2802529fb307e2feb2f9e9dcfaba1c0'
   '4b131fb1e7cf8fdf695876032842b39d')
 
 build() {
diff --git a/README.md b/README.md
index 3715f07a92e6..ae30bcad6383 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.6.27263-blue.svg" alt="QQ Version">
+    <img src="https://img.shields.io/badge/QQ-9.3.7.27301-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">
@@ -48,7 +48,7 @@ Deepin打包的QQ容器移植到Archlinux，不依赖`deepin-wine`，包含定�
 
 ## 安装
 
-`deepin-wine-qq`依赖`Multilib`仓库中的`wine`，`wine-gecko`和`wine-mono`，Archlinux默认没有开启`Multilib`仓库，需要编辑`/etc/pacman.conf`，取消对应行前面的注释([Archlinux wiki](https://wiki.archlinux.org/index.php/Official_repositories#multilib)):
+`deepin-wine-qq` 依赖`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,
@@ -65,7 +65,7 @@ Deepin打包的QQ容器移植到Archlinux，不依赖`deepin-wine`，包含定�
 
 ### 从AUR安装
 
-已添加到AUR [deepin-wine-qq](https://aur.archlinux.org/packages/deepin-wine-qq/)，可使用 `yay` 或 `yaourt` 安装:
+已添加到 AUR [deepin-wine-qq](https://aur.archlinux.org/packages/deepin-wine-qq/)，可使用 `yay` 或 `yaourt` 安装:
 
 ```shell
 yay -S deepin-wine-qq
@@ -73,14 +73,20 @@ yay -S deepin-wine-qq
 
 ### 用安装包安装
 
-> 由[Travis CI](https://travis-ci.org/countstarlight/deepin-wine-qq-arch)在Docker容器[mikkeloscar/arch-travis](https://hub.docker.com/r/mikkeloscar/arch-travis)中自动构建的ArchLinux安装包
+> 由 [Travis CI](https://travis-ci.org/countstarlight/deepin-wine-qq-arch) 在 Docker 容器 [mikkeloscar/arch-travis](https://hub.docker.com/r/mikkeloscar/arch-travis) 中自动构建的 ArchLinux 安装包
 
-在[GitHub Release](https://github.com/countstarlight/deepin-wine-qq-arch/releases)页面下载 `.pkg.tar.xz`后缀的安装包，使用`pacman`安装：
+在[GitHub Release](https://github.com/countstarlight/deepin-wine-qq-arch/releases) 页面下载后缀为 `.pkg.tar.xz` 或 `.pkg.tar.zst` 的安装包，使用`pacman`安装：
 
 ```bash
 sudo pacman -U #下载的包名
 ```
 
+`.md5` 文件用于校验包完整性：
+
+```bash
+md5sum -c *.md5
+```
+
 ### 本地打包安装
 
 ```shell
@@ -99,6 +105,7 @@ sudo pacman -U #下载的包名
 
 |     QQ      |  wine  | 兼容性 |        备注        | deepin-wine | 兼容性 | 备注 |
 | :---------: | :----: | :----: | :----------------: | :---------: | :----: | :--: |
+| 9.3.7.27301 |  5.15  |  支持  |                    |  2.18_24-3  |  支持  |      |
 | 9.3.6.27263 |  5.12  |  支持  |                    |  2.18_22-3  |  支持  |      |
 | 9.3.5.27030 |  5.10  |  支持  |                    |  2.18_22-3  |  支持  |      |
 | 9.3.3.27011 |  5.9   |  支持  |                    |  2.18_22-3  |  支持  |      |
@@ -192,7 +199,6 @@ yay -S lib32-freetype2-infinality-ultimate
 
 **注意：切换到 `deepin-wine` 后，对 `wine` 的修改，如更改dpi，都改为对 `deepin-wine` 的修改**
 
-
 ## 常见问题及解决
 
 ### 不能记住密码
@@ -205,7 +211,9 @@ yay -S lib32-freetype2-infinality-ultimate
 
 ### 高分辨率屏幕支持
 
-在 `winecfg` 的Graphics选项卡中修改dpi，如 修改为`210`：
+在 `winecfg` 的Graphics选项卡中修改dpi，如 修改为`192`
+
+对于 `wine`：
 
 ```bash
 env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" winecfg
@@ -237,6 +245,7 @@ env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine winecfg
 
 ## 更新日志
 
+* 2020-08-16 QQ-9.3.7.27301
 * 2020-07-19 QQ-9.3.6.27263
 * 2020-06-19 QQ-9.3.5.27030
 * 2020-06-05 QQ-9.3.3.27011
diff --git a/gen.sh b/gen.sh
index 7b840fbf21f9..6f659599ce74 100755
--- a/gen.sh
+++ b/gen.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+PACKAGE_NAME="deepin-wine-qq"
+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 78e0abae572f..44dde397d7b7 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.6.27263"
+QQ_VER="9.3.7.27301"
 APPTAR="files.7z"
 PACKAGENAME="com.qq.im"
 WINE_CMD="wine"
@@ -98,7 +98,7 @@ CreateBottle()
 msg()
 {
 	ECHO_LEVEL=("\033[1;32m==> " "\033[1;31m==> ERROR: ")
-    echo -e "${ECHO_LEVEL[$1]}\033[1;37m$2\033[0m"
+	echo -e "${ECHO_LEVEL[$1]}\033[1;37m$2\033[0m"
 }
 
 SwitchToDeepinWine()
@@ -112,12 +112,12 @@ SwitchToDeepinWine()
 		else
 			$PACKAGE_MANAGER="yaourt"
 		fi
-    fi
+	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"
+		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