Upgrade TIM to 3.2.0.21856

Signed-off-by: Codist <countstarlight@gmail.com>
vufa · Sep 30, 2020 · 4bb7158 · 4bb7158
1 parent 00cb0f7
commit 4bb7158
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 15 deletions.
diff --git a/.SRCINFO b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-tim
 	pkgdesc = Tencent TIM (com.qq.office) on Deepin Wine For Archlinux
-	pkgver = 3.1.0.21789
+	pkgver = 3.2.0.21856
 	pkgrel = 1
 	url = http://tim.qq.com/
 	install = deepin-wine-tim.install
@@ -22,13 +22,13 @@ pkgbase = deepin-wine-tim
 	conflicts = deepin.com.qq.office
 	conflicts = deepin-tim-for-arch
 	source = https://mirrors.ustc.edu.cn/deepin/pool/non-free/d/deepin.com.qq.office/deepin.com.qq.office_2.0.0deepin4_i386.deb
-	source = https://dldir1.qq.com/qqfile/qq/TIM3.1.0/TIM3.1.0.21789.exe
+	source = https://dldir1.qq.com/qqfile/qq/PCTIM/TIM3.2.0/TIM3.2.0.21856.exe
 	source = run.sh
 	source = reg.patch
 	md5sums = d5c37cb4f960e13111ce24dbc0dd2d58
-	md5sums = 344c9438db69db52c86f3fa575dff143
-	md5sums = 20625edae7b3d57e9f624fe473d4f7fa
-	md5sums = 8cdb3c8863cee35a54fe5ba29e770fd3
+	md5sums = 534c33e25dfa6360f710e5df4f3da1dd
+	md5sums = 1f8cba0fbbdc57c9d710d0c59aa03f3d
+	md5sums = d049e1171da0dc82c951b07cc534c39d
 
 pkgname = deepin-wine-tim
 
diff --git a/PKGBUILD b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Codist <countstarlight@gmail.com>
 
 pkgname=deepin-wine-tim
-pkgver=3.1.0.21789
+pkgver=3.2.0.21856
 deepintimver=2.0.0deepin4
 pkgrel=1
 pkgdesc="Tencent TIM (com.qq.office) on Deepin Wine For Archlinux"
@@ -13,13 +13,13 @@ conflicts=('wine-tim' 'deepin.com.qq.office' 'deepin-tim-for-arch')
 install="deepin-wine-tim.install"
 _mirror="https://mirrors.ustc.edu.cn/deepin"
 source=("$_mirror/pool/non-free/d/deepin.com.qq.office/deepin.com.qq.office_${deepintimver}_i386.deb"
-  "https://dldir1.qq.com/qqfile/qq/TIM3.1.0/TIM${pkgver}.exe"
+  "https://dldir1.qq.com/qqfile/qq/PCTIM/TIM3.2.0/TIM${pkgver}.exe"
   "run.sh"
   "reg.patch")
 md5sums=('d5c37cb4f960e13111ce24dbc0dd2d58'
-  '344c9438db69db52c86f3fa575dff143'
-  '20625edae7b3d57e9f624fe473d4f7fa'
-  '8cdb3c8863cee35a54fe5ba29e770fd3')
+  '534c33e25dfa6360f710e5df4f3da1dd'
+  '1f8cba0fbbdc57c9d710d0c59aa03f3d'
+  'd049e1171da0dc82c951b07cc534c39d')
 
 build() {
   msg "Extracting DPKG package ..."

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
     <img src="https://travis-ci.org/countstarlight/deepin-wine-tim-arch.svg?branch=master" alt="Build Status">
   </a>
   <a href="https://office.qq.com/download.html">
-    <img src="https://img.shields.io/badge/TIM-3.1.0.21789-blue.svg" alt="TIM Version">
+    <img src="https://img.shields.io/badge/TIM-3.2.0.21856-blue.svg" alt="TIM Version">
   </a>
   <a href="https://aur.archlinux.org/packages/deepin-wine-tim/">
     <img src="https://img.shields.io/aur/version/deepin-wine-tim.svg" alt="AUR Version">
@@ -27,6 +27,7 @@ Deepin 打包的 TIM 容器移植到 Archlinux，不依赖 `deepin-wine`，包
     - [从AUR安装](#从aur安装)
     - [用安装包安装](#用安装包安装)
     - [本地打包安装](#本地打包安装)
+- [兼容性记录](#兼容性记录)
 - [切换到 `deepin-wine`](#切换到-deepin-wine)
     - [自动切换(推荐)](#自动切换推荐)
     - [手动切换](#手动切换)
@@ -62,6 +63,10 @@ Deepin 打包的 TIM 容器移植到 Archlinux，不依赖 `deepin-wine`，包
 +Include = /etc/pacman.d/mirrorlist
 ```
 
+**注意：由于新版TIM可能需要 `wine` 还没有实现的一些win api，这会导致一些功能不可用，安装前先根据[兼容性记录](#兼容性记录)选择一个合适的版本**
+
+以下三种安装方式效果相同，选择一种即可
+
 ### 从AUR安装
 
 已添加到 AUR [deepin-wine-tim](https://aur.archlinux.org/packages/deepin-wine-tim/)，使用 `yay` 安装（如未安装 `yay`，请先 `pacman -S yay` 进行安装）：
@@ -110,6 +115,13 @@ md5sum -c *.md5
 
 * 安装完可直接启动
 
+## 兼容性记录
+
+|     TIM     | wine |   兼容性   |   备注   | deepin-wine | 兼容性 | 备注 |
+| :---------: | :--: | :--------: | :------: | :---------: | :----: | :--: |
+| 3.2.0.21856 | 5.18 | **不支持** | 无法启动 |  2.18_24-3  |  支持  |      |
+| 3.1.0.21789 | 5.16 |    支持    |          |  2.18_24-3  |  支持  |      |
+
 ## 切换到 `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))的问题，且原版 `wine` 尚不能实现保存登录密码等功能，可以选择切换到 `deepin-wine`。
@@ -239,6 +251,7 @@ env WINEPREFIX="$HOME/.deepinwine/Deepin-TIM" deepin-wine winecfg
 
 ## 更新日志
 
+* 2020-09-30 TIM-3.2.0.21856
 * 2020-08-12 TIM-3.1.0.21789
 * 2020-04-01 TIM-3.0.0.21315
 * 2019-09-21 TIM-2.3.2.21173

diff --git a/reg.patch b/reg.patch
@@ -1,12 +1,12 @@
 diff -ruN reg_tmp/system.reg reg_tmp_fixed/system.reg
 --- reg_tmp/system.reg	2018-07-10 09:05:51.000000000 +0800
-+++ reg_tmp_fixed/system.reg	2020-04-01 21:50:03.035389661 +0800
++++ reg_tmp_fixed/system.reg	2020-09-30 10:49:52.685269410 +0800
 @@ -33235,7 +33235,7 @@
  #time=1d375560815cedc
  "DisplayIcon"="C:\\Program Files\\Tencent\\TIM\\TIMUninst.ico"
  "DisplayName"="TIM"
 -"DisplayVersion"="2.0.0.22317"
-+"DisplayVersion"="3.1.0.21789"
++"DisplayVersion"="3.2.0.21856"
  "EstimatedSize"=dword:0002f7d0
  "HelpLink"="http://www.tencent.com"
  "HelpTelephone"="(86) 755 86060836"
@@ -38,7 +38,18 @@ diff -ruN reg_tmp/system.reg reg_tmp_fixed/system.reg
  [Software\\Tencent\\PlatForm_Type_List\\1] 1511754918
  #time=1d367338a03faee
 -"TypeName"="TIM2.0.0"
-+"TypeName"="TIM3.1.0"
++"TypeName"="TIM3.2.0"
  "TypePath"="c:\\Program Files\\Tencent\\TIM\\Bin\\TIM.exe"
 
  [Software\\Tencent\\QQ2009\\Component] 1488419637
+diff -ruN reg_tmp/user.reg reg_tmp_fixed/user.reg
+--- reg_tmp/user.reg	2018-07-10 09:05:51.000000000 +0800
++++ reg_tmp_fixed/user.reg	2020-09-30 10:47:13.175262388 +0800
+@@ -1024,6 +1024,7 @@
+ "qdantidrv.sys"=""
+ "qqsetupex.exe"=""
+ "riched20"="native,builtin"
++"tencentdl.exe"=""
+ "txplatform.exe"=""
+ "txupd.exe"=""
+ "usp10"="native,builtin"
diff --git a/run.sh b/run.sh
@@ -9,7 +9,7 @@
 
 WINEPREFIX="$HOME/.deepinwine/Deepin-TIM"
 APPDIR="/opt/deepinwine/apps/Deepin-TIM"
-APPVER="3.1.0.21789"
+APPVER="3.2.0.21856"
 APPTAR="files.7z"
 PACKAGENAME="com.qq.tim"
 WINE_CMD="wine"