Upgrade base to 2.6.8.65deepin0

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

5 files changed, 18 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b8fd36cd8f9a..cdda6a48cfee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deepin-wine-wechat
 	pkgdesc = Tencent WeChat (com.wechat) on Deepin Wine For Archlinux
 	pkgver = 2.8.0.133
-	pkgrel = 1
+	pkgrel = 2
 	url = https://weixin.qq.com/
 	install = deepin-wine-wechat.install
 	arch = x86_64
@@ -19,14 +19,14 @@ pkgbase = deepin-wine-wechat
 	depends = lib32-mpg123
 	depends = lib32-libldap
 	conflicts = deepin-wechat
-	source = https://mirrors.ustc.edu.cn/deepin/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_2.6.2.31deepin0_i386.deb
+	source = https://mirrors.ustc.edu.cn/deepin/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_2.6.8.65deepin0_i386.deb
 	source = WeChatSetup-2.8.0.133.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
 	source = run.sh
 	source = reg.patch
-	md5sums = c66a173fe6817afd898e0061d9eaf42e
+	md5sums = fe31cf4f0f6186fc1c99adc1512f5305
 	md5sums = 562d71c57e136a8aaa3be0d135092161
-	md5sums = d4bf851a09f5f5339299340388869bc4
-	md5sums = 35626e820e6790c230718b4dad6482f6
+	md5sums = bb6327d7e6997a3d9e1852915bafd337
+	md5sums = f264f961704f2aa1d480971b0e58617a
 
 pkgname = deepin-wine-wechat
 
diff --git a/PKGBUILD b/PKGBUILD
index 2441605ba5b2..19f1810043e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 pkgname=deepin-wine-wechat
 pkgver=2.8.0.133
 wechat_installer=WeChatSetup
-deepinwechatver=2.6.2.31deepin0
-pkgrel=1
+deepinwechatver=2.6.8.65deepin0
+pkgrel=2
 pkgdesc="Tencent WeChat (com.wechat) on Deepin Wine For Archlinux"
 arch=("x86_64")
 url="https://weixin.qq.com/"
@@ -17,10 +17,10 @@ source=("$_mirror/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_${deepinwe
   "${wechat_installer}-${pkgver}.exe::https://dldir1.qq.com/weixin/Windows/${wechat_installer}.exe"
   "run.sh"
   "reg.patch")
-md5sums=('c66a173fe6817afd898e0061d9eaf42e'
+md5sums=('fe31cf4f0f6186fc1c99adc1512f5305'
   '562d71c57e136a8aaa3be0d135092161'
-  'd4bf851a09f5f5339299340388869bc4'
-  '35626e820e6790c230718b4dad6482f6')
+  'bb6327d7e6997a3d9e1852915bafd337'
+  'f264f961704f2aa1d480971b0e58617a')
 
 build() {
   msg "Extracting DPKG package ..."
diff --git a/README.md b/README.md
index 27bfee3afc4d..fb49f4ab6de0 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,8 @@ Deepin打包的微信(WeChat)容器移植到Archlinux，不依赖`deepin-wine`�
 +Include = /etc/pacman.d/mirrorlist
 ```
 
+**注意：由于新版微信可能需要 `wine` 还没有实现的一些win api，这会导致一些功能不可用，安装前先根据[兼容性记录](#兼容性记录)选择一个合适的版本**
+
 ### 从AUR安装
 
 已添加到AUR [deepin-wine-wechat](https://aur.archlinux.org/packages/deepin-wine-wechat/)，可使用 `yay` 或 `yaourt` 安装:
diff --git a/reg.patch b/reg.patch
index 357373ab83bc..9be5d9ab8c59 100644
--- 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-04-03 13:53:26.000000000 +0800
-+++ reg_tmp_fixed/system.reg	2019-04-03 21:34:07.000000000 +0800
-@@ -30955,15 +30955,16 @@
+--- reg_tmp/system.reg	2019-08-27 15:06:17.000000000 +0800
++++ reg_tmp_fixed/system.reg	2020-03-10 11:14:33.397830695 +0800
+@@ -30982,15 +30982,16 @@
  [Software\\Microsoft\\Windows\\CurrentVersion\\Winlogon] 1486457887
  #time=1d281204c9b71e0
  
--[Software\\Microsoft\\Windows NT\\CurrentVersion] 1507795882
--#time=1d34331b1382cd2
+-[Software\\Microsoft\\Windows NT\\CurrentVersion] 1566803037
+-#time=1d55bdc6e529798
 -"CSDVersion"="Service Pack 3"
 -"CurrentBuildNumber"="2600"
 +[Software\\Microsoft\\Windows NT\\CurrentVersion] 1571657811
@@ -24,35 +24,3 @@ diff -ruN reg_tmp/system.reg reg_tmp_fixed/system.reg
  "RegisteredOrganization"=""
  "RegisteredOwner"=""
  "SystemRoot"="C:\\windows"
-diff -ruN reg_tmp/update.policy reg_tmp_fixed/update.policy
---- reg_tmp/update.policy	2018-04-03 13:53:26.000000000 +0800
-+++ reg_tmp_fixed/update.policy	2018-02-23 20:31:32.000000000 +0800
-@@ -8,15 +8,14 @@
- ;; Ingore     - Ingore file when copy.
- 
- ;; Ingore update.policy itself.
--;; "^update.policy$" = "Ingore"
-+"^update.policy$" = "Ingore"
- "^.update-timestamp$" = "Ingore"
- 
- ;; System registry files.
- "^(system|userdef|user).reg$" = "Registry"
- 
- ;; Addtional assist files.
--"^drive_c/deepin" = "Keep"
--"^drive_c/deepin/EnvInit.sh" = "Keep"
-+"^drive_c/Deepin" = "Keep"
- 
- ;; Microsoft Office files.
- "^drive_c/Windows/(?:control\.ini|hh\.dat|mapiuid\.ini|Reg Save Log\.txt)$" = "Override"
-diff -ruN reg_tmp/user.reg reg_tmp_fixed/user.reg
---- reg_tmp/user.reg	2018-04-03 13:53:26.000000000 +0800
-+++ reg_tmp_fixed/user.reg	2019-04-03 21:35:35.000000000 +0800
-@@ -815,6 +815,7 @@
- "androidassist"=""
- "mlang"="native,builtin"
- "msls31"="native,builtin"
-+"ntoskrnl.exe"=""
- "riched20"="native,builtin"
- "txplatform.exe"=""
- "txupd.exe"=""
diff --git a/run.sh b/run.sh
index 6562d6ace08d..cd85c0b2bf8a 100755
--- a/run.sh
+++ b/run.sh
@@ -8,7 +8,7 @@
 
 WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat"
 APPDIR="/opt/deepinwine/apps/Deepin-WeChat"
-APPVER="2.6.2.31deepin0"
+APPVER="2.6.8.65deepin0"
 WECHAT_INSTALLER="WeChatSetup"
 WECHAT_VER="2.8.0.133"
 APPTAR="files.7z"