Upgrade QQ to 9.0.9.24445 and optimized Chinese fonts config.

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

6 files changed, 30 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75dae54f3b1d..d29850507a7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deepin-wine-qq
 	pkgdesc = Tencent QQ (com.qq.im) on Deepin Wine For Archlinux
-	pkgver = 9.0.9_1
-	pkgrel = 4
+	pkgver = 9.0.9.24445
+	pkgrel = 5
 	url = http://im.qq.com/
 	install = deepin-wine-qq.install
 	arch = x86_64
@@ -14,6 +14,7 @@ pkgbase = deepin-wine-qq
 	depends = xdotool
 	depends = wqy-microhei
 	depends = adobe-source-han-sans-cn-fonts
+	depends = adobe-source-han-serif-cn-fonts
 	depends = lib32-alsa-lib
 	depends = lib32-alsa-plugins
 	depends = lib32-libpulse
@@ -23,14 +24,14 @@ 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_8.9.19983deepin23_i386.deb
-	source = https://qd.myapp.com/myapp/qqteam/pcqq/QQ9.0.9_1.exe
+	source = https://dldir1.qq.com/qqfile/qq/PCQQ9.0.9/24445/QQ9.0.9.24445.exe
 	source = run.sh
 	source = reg_files.tar.bz2
 	source = update.policy
 	md5sums = 5135313eb131feeb6fef613ba02804cf
-	md5sums = a6273221731e7d253d6273c5de452e72
-	md5sums = 6440495c91b01a2e23bbaeda2592ca63
-	md5sums = 44291a46887c0f9107a97c4ddf0c8d63
+	md5sums = 94f2c620f4fa50ace14fae0f903a3547
+	md5sums = 1f1814fcfd876c4b4468967ec0e6c107
+	md5sums = a68c3271fa4858d956aac29ade6c602e
 	md5sums = a66646b473a3fbad243ac1afd64da07a
 
 pkgname = deepin-wine-qq
diff --git a/.travis.yml b/.travis.yml
index 18380c6ecca2..e72ca227fcdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ arch:
   - xdotool
   - wqy-microhei
   - adobe-source-han-sans-cn-fonts
+  - adobe-source-han-serif-cn-fonts
   - lib32-alsa-lib
   - lib32-alsa-plugins
   - lib32-libpulse
diff --git a/PKGBUILD b/PKGBUILD
index 4d009ea0771c..6245be5f534e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,26 +3,26 @@
 # Maintainer: ssfdust <ssfdust@gmail.com>
 
 pkgname=deepin-wine-qq
-pkgver=9.0.9_1
+pkgver=9.0.9.24445
 deepinqqver=8.9.19983deepin23
-pkgrel=4
+pkgrel=5
 pkgdesc="Tencent QQ (com.qq.im) on Deepin Wine For Archlinux"
 arch=("x86_64")
 url="http://im.qq.com/"
 license=('custom')
-depends=('p7zip' 'wine' 'wine-mono' 'wine_gecko' 'xorg-xwininfo' 'xdotool' 'wqy-microhei' 'adobe-source-han-sans-cn-fonts' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-gnutls')
+depends=('p7zip' 'wine' 'wine-mono' 'wine_gecko' 'xorg-xwininfo' 'xdotool' 'wqy-microhei' 'adobe-source-han-sans-cn-fonts' 'adobe-source-han-serif-cn-fonts' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-gnutls')
 conflicts=('deepin-qq-im' 'deepin.com.qq.im')
 install="deepin-wine-qq.install"
 _mirror="https://mirrors.ustc.edu.cn/deepin"
 source=("$_mirror/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_${deepinqqver}_i386.deb"
-  "https://qd.myapp.com/myapp/qqteam/pcqq/QQ${pkgver}.exe"
+  "https://dldir1.qq.com/qqfile/qq/PCQQ9.0.9/24445/QQ${pkgver}.exe"
   "run.sh"
   "reg_files.tar.bz2"
   "update.policy")
 md5sums=('5135313eb131feeb6fef613ba02804cf'
-  'a6273221731e7d253d6273c5de452e72'
-  '6440495c91b01a2e23bbaeda2592ca63'
-  '44291a46887c0f9107a97c4ddf0c8d63'
+  '94f2c620f4fa50ace14fae0f903a3547'
+  '1f1814fcfd876c4b4468967ec0e6c107'
+  'a68c3271fa4858d956aac29ade6c602e'
   'a66646b473a3fbad243ac1afd64da07a')
 
 build() {
@@ -42,6 +42,7 @@ build() {
   cp user.reg "${srcdir}/deepinqqdir/user.reg"
   ln -sf "/usr/share/fonts/wenquanyi/wqy-microhei/wqy-microhei.ttc" "${srcdir}/deepinqqdir/drive_c/windows/Fonts/wqy-microhei.ttc"
   ln -sf "/usr/share/fonts/adobe-source-han-sans/SourceHanSansCN-Medium.otf" "${srcdir}/deepinqqdir/drive_c/windows/Fonts/SourceHanSansCN-Medium.otf"
+  ln -sf "/usr/share/fonts/adobe-source-han-serif/SourceHanSerifCN-Medium.otf" "${srcdir}/deepinqqdir/drive_c/windows/Fonts/SourceHanSerifCN-Medium.otf"
   msg "Repackaging app archive ..."
   7z a -t7z -r "${srcdir}/files.7z" "${srcdir}/deepinqqdir/*"
 }
@@ -55,9 +56,4 @@ package() {
   install -m644 "${srcdir}/files.7z" "${pkgdir}/opt/deepinwine/apps/Deepin-QQ/"
   install -m755 "${srcdir}/run.sh" "${pkgdir}/opt/deepinwine/apps/Deepin-QQ/"
   install -m644 "${srcdir}/QQ$pkgver.exe" "${pkgdir}/opt/deepinwine/apps/Deepin-QQ/"
-  echo "$(tput setaf 1)$(tput setab 7)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$(tput sgr 0)"
-  echo "$(tput setaf 1)$(tput setab 7)!!!!!                                 !!!!$(tput sgr 0)"
-  echo "$(tput setaf 1)$(tput setab 7)!!!!!NEED TO REBOOT AFTER INSTALLATION!!!!$(tput sgr 0)"
-  echo "$(tput setaf 1)$(tput setab 7)!!!!!                                 !!!!$(tput sgr 0)"
-  echo "$(tput setaf 1)$(tput setab 7)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$(tput sgr 0)"
 }
diff --git a/README.md b/README.md
index 06dce46a396f..cb2b1ecf7fa6 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,21 @@ Deepin打包的QQ容器移植到Archlinux，包含定制的注册表配置，QQ�
 * [@ssfdust](https://github.com/ssfdust) 的 [wszqkzqk-deepin-wine-tim-arch](https://github.com/ssfdust/wszqkzqk-deepin-wine-tim-arch)
 
 存在如下问题：
-  * 1.不能视频通话
-  * 2.不能记住密码
+
+- [ ] 1.不能视频通话
+- [ ] 2.不能记住密码
+- [ ] 3.网络连接状态改变后不能重连: [issue19](https://github.com/countstarlight/deepin-wine-tim-arch/issues/19)
 
 ## 安装
-* 1.已添加到AUR [deepin-wine-qq](https://aur.archlinux.org/packages/deepin-wine-qq/)，可直接安装:
+* 1.已添加到AUR [deepin-wine-qq](https://aur.archlinux.org/packages/deepin-wine-qq/)，可使用 `yay/yaourt` 安装:
+```shell
+yay -S deepin-wine-qq
+```
+
+如果添加了archlinuxcn源，这会直接从源里安装，源相比AUR仓库有一定的延迟，或选择从AUR仓库安装:
+
 ```shell
-yaourt deepin-wine-qq
+yay deepin-wine-qq
 ```
 
 * 2.手动安装
@@ -42,5 +50,6 @@ yaourt deepin-wine-qq
 * 2.使用全局截图快捷键和解决Gnome上窗口化问题，参见[issue2](https://github.com/countstarlight/deepin-wine-tim-arch/issues/2)
 ## 更新日志
 
+* 2019-03-06 QQ-9.0.9.24445
 * 2019-02-05 QQ-9.0.9_1
 * 2017-12-31 QQ-8.9.6
\ No newline at end of file
diff --git a/reg_files.tar.bz2 b/reg_files.tar.bz2
index 8704cd4b4fd6..73f171224cf0 100644
--- a/reg_files.tar.bz2
+++ b/reg_files.tar.bz2
diff --git a/run.sh b/run.sh
index db856c06d7ba..d2a9d89cdbfd 100755
--- a/run.sh
+++ b/run.sh
@@ -8,7 +8,7 @@
 #               CountStarlight <countstarlight@gmail.com>
 WINEPREFIX="$HOME/.deepinwine/Deepin-QQ"
 APPDIR="/opt/deepinwine/apps/Deepin-QQ"
-APPVER="9.0.9_1"
+APPVER="9.0.9.24445"
 APPTAR="files.7z"
 PACKAGENAME="com.qq.im"
 WINE_CMD="wine"