Upgrade TIM to 3.0.0.21315

Signed-off-by: Codist <countstarlight@gmail.com>
vufa · Apr 1, 2020 · 47e4aa0 · 47e4aa0
1 parent 4dd03d7
commit 47e4aa0
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 54 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 = 2.3.2.21173
+	pkgver = 3.0.0.21315
 	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/TIM2.3.2/21173/TIM2.3.2.21173.exe
+	source = https://dldir1.qq.com/qqfile/qq/TIM3.0.0/TIM3.0.0.21315.exe
 	source = run.sh
 	source = reg.patch
 	md5sums = d5c37cb4f960e13111ce24dbc0dd2d58
-	md5sums = 89adda13f304f5385576ae9388b5752e
-	md5sums = d658f1c2ff7447bce839d8fa6f0001f5
-	md5sums = 38271ce3d662868baa1bca45cbb49018
+	md5sums = 05ccc6f90f26170c83f00d28628c1e2b
+	md5sums = 812b2e77ab9b559278915eeb803a2d9e
+	md5sums = 79efbcfa58f4f3d539f09ed5951a0899
 
 pkgname = deepin-wine-tim
 
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 TIM*
 deepin.com.qq*
-deepin-wine-tim-2*
+deepin-wine-tim-*
 /pkg/
 /src/
 /reg_tmp/

diff --git a/PKGBUILD b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: CountStarlight <countstarlight@gmail.com>
 
 pkgname=deepin-wine-tim
-pkgver=2.3.2.21173
+pkgver=3.0.0.21315
 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/TIM2.3.2/21173/TIM${pkgver}.exe"
+  "https://dldir1.qq.com/qqfile/qq/TIM3.0.0/TIM${pkgver}.exe"
   "run.sh"
   "reg.patch")
 md5sums=('d5c37cb4f960e13111ce24dbc0dd2d58'
-  '89adda13f304f5385576ae9388b5752e'
-  'd658f1c2ff7447bce839d8fa6f0001f5'
-  '38271ce3d662868baa1bca45cbb49018')
+  '05ccc6f90f26170c83f00d28628c1e2b'
+  '812b2e77ab9b559278915eeb803a2d9e'
+  '79efbcfa58f4f3d539f09ed5951a0899')
 
 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-2.3.2.21173-blue.svg" alt="TIM Version">
+    <img src="https://img.shields.io/badge/TIM-3.0.0.21315-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">
@@ -218,6 +218,7 @@ Windows 10 自带字体及版本：<https://docs.microsoft.com/en-us/typography/
 
 ## 更新日志
 
+* 2020-04-01 TIM-3.0.0.21315
 * 2019-09-21 TIM-2.3.2.21173
 * 2019-03-06 TIM-2.3.2.21158
 * 2019-02-05 TIM-2.3.1_3

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	2019-03-23 23:47:11.000000000 +0800
++++ reg_tmp_fixed/system.reg	2020-04-01 21:50:03.035389661 +0800
 @@ -33235,7 +33235,7 @@
  #time=1d375560815cedc
  "DisplayIcon"="C:\\Program Files\\Tencent\\TIM\\TIMUninst.ico"
  "DisplayName"="TIM"
 -"DisplayVersion"="2.0.0.22317"
-+"DisplayVersion"="2.3.2.21158"
++"DisplayVersion"="3.0.0.21315"
  "EstimatedSize"=dword:0002f7d0
  "HelpLink"="http://www.tencent.com"
  "HelpTelephone"="(86) 755 86060836"
@@ -18,18 +18,18 @@ diff -ruN reg_tmp/system.reg reg_tmp_fixed/system.reg
 -#time=1d3488aa9ba4da6
 -"CSDVersion"="Service Pack 3"
 -"CurrentBuildNumber"="2600"
-+[Software\\Microsoft\\Windows NT\\CurrentVersion] 1553355758
-+#time=1d4e18f0af44402
-+"CSDVersion"=""
-+"CurrentBuild"="17134"
-+"CurrentBuildNumber"="17134"
++[Software\\Microsoft\\Windows NT\\CurrentVersion] 1571657811
++#time=1d58803d4d74e20
++"CSDVersion"="Service Pack 1"
++"CurrentBuild"="7601"
++"CurrentBuildNumber"="7601"
  "CurrentType"="Uniprocessor Free"
 -"CurrentVersion"="5.1"
-+"CurrentVersion"="10.0"
++"CurrentVersion"="6.1"
  "InstallDate"=dword:4be5019a
  "ProductId"="12345-oem-0000001-54321"
 -"ProductName"="Microsoft Windows XP"
-+"ProductName"="Microsoft Windows 10"
++"ProductName"="Microsoft Windows 7"
  "RegisteredOrganization"=""
  "RegisteredOwner"=""
  "SystemRoot"="C:\\windows"
@@ -38,38 +38,7 @@ 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"="TIM2.3.2"
++"TypeName"="TIM3.0.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	2019-03-22 23:54:30.000000000 +0800
-@@ -893,7 +893,7 @@
-
- [Software\\Tencent\\PlatForm_Type_List\\1] 1511754918
- #time=1d367338a03f580
--"TypeName"="TIM2.0.0"
-+"TypeName"="TIM2.3.2"
- "TypePath"="c:\\Program Files\\Tencent\\TIM\\Bin\\TIM.exe"
-
- [Software\\Tencent\\QABS99] 1508380804
-@@ -1016,11 +1016,18 @@
- "RelayExclude"="ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError"
- "RelayFromExclude"="winex11.drv;winemac.drv;user32;gdi32;advapi32;kernel32"
-
-+[Software\\Wine\\Direct3D] 1549423053
-+#time=1d4bdca8095f360
-+"DirectDrawRenderer"="opengl"
-+"MaxVersionGL"=dword:00003002
-+"UseGLSL"="enabled"
-+
- [Software\\Wine\\DllOverrides] 1486619428
- #time=1d282986ac5b38c
- "androidassist"=""
- "mlang"="native,builtin"
- "msls31"="native,builtin"
-+"ntoskrnl.exe"=""
- "qdantidrv.sys"=""
- "qqsetupex.exe"=""
- "riched20"="native,builtin"
diff --git a/run.sh b/run.sh
@@ -7,7 +7,7 @@
 
 WINEPREFIX="$HOME/.deepinwine/Deepin-TIM"
 APPDIR="/opt/deepinwine/apps/Deepin-TIM"
-APPVER="2.3.2.21173"
+APPVER="3.0.0.21315"
 APPTAR="files.7z"
 PACKAGENAME="com.qq.tim"
 WINE_CMD="wine"