Upgrade QQ to 9.4.2.27658

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

5 files changed, 42 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d70e1aac8927..3f4096df2111 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deepin-wine-qq
 	pkgdesc = Tencent QQ on Deepin Wine(com.qq.im.deepin) For Archlinux
-	pkgver = 9.4.2.27655
-	pkgrel = 2
+	pkgver = 9.4.2.27658
+	pkgrel = 1
 	url = https://im.qq.com/
 	install = deepin-wine-qq.install
 	arch = x86_64
@@ -21,13 +21,11 @@ pkgbase = deepin-wine-qq
 	conflicts = deepin-qq-im
 	conflicts = deepin.com.qq.im
 	source = https://cdn-package-store6.deepin.com/appstore/pool/appstore/c/com.qq.im.deepin/com.qq.im.deepin_9.3.2deepin14_i386.deb
-	source = PCQQ2020-9.4.2.27655.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe
+	source = PCQQ2020-9.4.2.27658.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe
 	source = run.sh
-	source = reg.patch
 	md5sums = e12c4b26c791ca32cdc96e5441341148
-	md5sums = d52fb334557a14caa2e69ac43b2c29eb
-	md5sums = 3476136a1f6a1dc5477dfe40da88df36
-	md5sums = eb76d1e0e8f325856cec59697ae8a256
+	md5sums = 107ca85564926ef0119d471cfea66f35
+	md5sums = c9f6403304f0e246f1f9de067ddcc4e0
 
 pkgname = deepin-wine-qq
 
diff --git a/PKGBUILD b/PKGBUILD
index 93c4d4ba654f..6bf2104d16ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Maintainer: taotieren <admin@taotieren.com>
 
 pkgname=deepin-wine-qq
-pkgver=9.4.2.27655
+pkgver=9.4.2.27658
 qq_installer=PCQQ2020
 deepinqqver=9.3.2deepin14
 debpkgname="com.qq.im.deepin"
-pkgrel=2
+pkgrel=1
 pkgdesc="Tencent QQ on Deepin Wine(${debpkgname}) For Archlinux"
 arch=("x86_64")
 url="https://im.qq.com/"
@@ -17,12 +17,10 @@ install="deepin-wine-qq.install"
 _mirror="https://cdn-package-store6.deepin.com"
 source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${deepinqqver}_i386.deb"
   "${qq_installer}-${pkgver}.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/${qq_installer}.exe"
-  "run.sh"
-  "reg.patch")
+  "run.sh")
 md5sums=('e12c4b26c791ca32cdc96e5441341148'
-  'd52fb334557a14caa2e69ac43b2c29eb'
-  '3476136a1f6a1dc5477dfe40da88df36'
-  'eb76d1e0e8f325856cec59697ae8a256')
+  '107ca85564926ef0119d471cfea66f35'
+  'c9f6403304f0e246f1f9de067ddcc4e0')
 
 build() {
   msg "Extracting DPKG package ..."
@@ -34,8 +32,8 @@ build() {
   7z x -aoa "${srcdir}/dpkgdir/opt/apps/${debpkgname}/files/files.7z" -o"${srcdir}/deepinqqdir"
   msg "Cleaning up the original package directory ..."
   rm -r "${srcdir}/deepinqqdir/drive_c/Program Files/Tencent/QQ"
-  msg "Patching reg files ..."
-  patch -p1 -d "${srcdir}/deepinqqdir/" < "${srcdir}/reg.patch"
+  #msg "Patching reg files ..."
+  #patch -p1 -d "${srcdir}/deepinqqdir/" < "${srcdir}/reg.patch"
   msg "Creating font file link ..."
   ln -sf "/usr/share/fonts/wenquanyi/wqy-microhei/wqy-microhei.ttc" "${srcdir}/deepinqqdir/drive_c/windows/Fonts/wqy-microhei.ttc"
   msg "Copying latest QQ installer to ${srcdir}/deepinqqdir/drive_c/Program Files/Tencent/ ..."
@@ -56,6 +54,6 @@ package() {
   cp ${srcdir}/dpkgdir/opt/apps/${debpkgname}/files/helper_archive* "${pkgdir}/opt/apps/${debpkgname}/files/"
   install -m755 "${srcdir}/dpkgdir/opt/apps/${debpkgname}/files/gtkGetFileNameDlg" "${pkgdir}/opt/apps/${debpkgname}/files/"
   md5sum "${srcdir}/files.7z" | awk '{ print $1 }' > "${pkgdir}/opt/apps/${debpkgname}/files/files.md5sum"
-  install -m644 "${srcdir}/reg.patch" "${pkgdir}/opt/apps/${debpkgname}/files/"
+  #install -m644 "${srcdir}/reg.patch" "${pkgdir}/opt/apps/${debpkgname}/files/"
   install -m755 "${srcdir}/run.sh" "${pkgdir}/opt/apps/${debpkgname}/files/"
 }
diff --git a/README.md b/README.md
index d5224db23b68..560a6d6484e8 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.4.2.27655-blue.svg" alt="QQ Version">
+    <img src="https://img.shields.io/badge/QQ-9.4.2.27658-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">
@@ -111,23 +111,24 @@ EXEC_PATH="c:/Program Files/Tencent/QQ/Bin/QQ.exe"
 
 ## 兼容性记录
 
-|    版本     |  wine  |   兼容性   |        备注        | deepin-wine | 兼容性 | 备注 |
-| :---------: | :----: | :--------: | :----------------: | :---------: | :----: | :--: |
-| 9.4.2.27655 |  5.22  |    支持    |                    |  5.0.16-1   |  支持  |      |
-| 9.4.1.27572 |  5.22  | **不支持** |                    |  5.0.16-1   |  支持  |      |
-| 9.4.0.27525 |  5.21  | **不支持** |                    |  2.18_24-3  |  支持  |      |
-| 9.3.9.27427 |  5.19  |    支持    |                    |  2.18_24-3  |  支持  |      |
-| 9.3.8.27381 |  5.17  | **不支持** |      无法启动      |  2.18_24-3  |  支持  |      |
-| 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  |  支持  |      |
-| 9.3.3.27009 |  5.8   |    支持    |                    |  2.18_22-3  |  支持  |      |
-| 9.3.2.26869 |  5.8   |    支持    |                    |  2.18_22-3  |  支持  |      |
-| 9.1.8.26211 | 4.20-1 |    支持    |                    |             |        |      |
-| 9.1.8.26211 | 4.18-1 |    部分    | 不能使用中文输入法 |             |        |      |
-| 9.1.8.26211 | 4.17-1 |    部分    | 不能使用中文输入法 |             |        |      |
-| 9.1.8.26211 | 4.16-1 |    支持    |                    |             |        |      |
+|    版本     |  wine  |   兼容性   |             备注             | deepin-wine | 兼容性 | 备注 |
+| :---------: | :----: | :--------: | :--------------------------: | :---------: | :----: | :--: |
+| 9.4.2.27658 |  5.22  |    部分    | 部分字体显示为方框且性能较差 |  5.0.16-1   |  支持  |      |
+| 9.4.2.27655 |  5.22  |    支持    |                              |  5.0.16-1   |  支持  |      |
+| 9.4.1.27572 |  5.22  | **不支持** |                              |  5.0.16-1   |  支持  |      |
+| 9.4.0.27525 |  5.21  | **不支持** |                              |  2.18_24-3  |  支持  |      |
+| 9.3.9.27427 |  5.19  |    支持    |                              |  2.18_24-3  |  支持  |      |
+| 9.3.8.27381 |  5.17  | **不支持** |           无法启动           |  2.18_24-3  |  支持  |      |
+| 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  |  支持  |      |
+| 9.3.3.27009 |  5.8   |    支持    |                              |  2.18_22-3  |  支持  |      |
+| 9.3.2.26869 |  5.8   |    支持    |                              |  2.18_22-3  |  支持  |      |
+| 9.1.8.26211 | 4.20-1 |    支持    |                              |             |        |      |
+| 9.1.8.26211 | 4.18-1 |    部分    |      不能使用中文输入法      |             |        |      |
+| 9.1.8.26211 | 4.17-1 |    部分    |      不能使用中文输入法      |             |        |      |
+| 9.1.8.26211 | 4.16-1 |    支持    |                              |             |        |      |
 
 ## 切换到 `deepin-wine`
 
@@ -240,6 +241,12 @@ env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine5 winecfg
 ## 更新日志
 
 <details open>
+<summary>2021</summary>
+
+* 2021-01-05 QQ-9.4.2.27658
+
+</details>
+<details>
 <summary>2020</summary>
 
 * 2020-12-29 QQ-9.4.2.27655
diff --git a/reg.patch b/reg.patch
deleted file mode 100644
index 87f6a45c9405..000000000000
--- a/reg.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/system.reg b/system.reg
-index e449ec1..45f4e6e 100644
---- a/system.reg
-+++ b/system.reg
-@@ -38603,11 +38603,11 @@ WINE REGISTRY Version 2
- 
- [Software\\Microsoft\\Windows NT\\CurrentVersion] 1600134060
- #time=1d68b0144225dc8
--"CSDVersion"="Service Pack 3"
-+"CSDVersion"="Service Pack 1"
- "CurrentBuild"="7601"
--"CurrentBuildNumber"="2600"
-+"CurrentBuildNumber"="7601"
- "CurrentType"="Uniprocessor Free"
--"CurrentVersion"="5.1"
-+"CurrentVersion"="6.1"
- "DigitalProductId"=hex:00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
-   00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
-   00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
-@@ -38617,7 +38617,7 @@ WINE REGISTRY Version 2
-   00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
- "InstallDate"=dword:4be5019a
- "ProductId"="12345-oem-0000001-54321"
--"ProductName"="Microsoft Windows XP"
-+"ProductName"="Microsoft Windows 7"
- "RegisteredOrganization"=""
- "RegisteredOwner"=""
- "SystemRoot"="C:\\windows"
-@@ -41069,7 +41069,7 @@ WINE REGISTRY Version 2
- 
- [Software\\Tencent\\PlatForm_Type_List\\1] 1600133839
- #time=1d68b00c062f128
--"TypeName"="QQ9.3.2"
-+"TypeName"="QQ9.4.1"
- "TypePath"="c:\\Program Files\\Tencent\\QQ\\Bin\\QQ.exe"
- 
- [Software\\Tencent\\PlatForm_Type_List\\3] 1592536834
-diff --git a/user.reg b/user.reg
-index 9468a71..e31f02a 100644
---- a/user.reg
-+++ b/user.reg
-@@ -926,7 +926,7 @@ WINE REGISTRY Version 2
- 
- [Software\\Tencent\\PlatForm_Type_List\\1] 1600133839
- #time=1d68b00c062eec6
--"TypeName"="QQ9.3.2"
-+"TypeName"="QQ9.4.1"
- "TypePath"="c:\\Program Files\\Tencent\\QQ\\Bin\\QQ.exe"
- 
- [Software\\Tencent\\Plugin\\VAS\\1940915894] 1603801664
diff --git a/run.sh b/run.sh
index ea6b702c6cc4..6ee9200126a2 100755
--- a/run.sh
+++ b/run.sh
@@ -35,7 +35,7 @@ extract_archive()
 BOTTLENAME="Deepin-QQ"
 APPVER="9.3.2deepin14"
 WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME"
-QQ_VER="9.4.2.27655"
+QQ_VER="9.4.2.27658"
 EXEC_PATH="c:/Program Files/Tencent/QQ/Bin/QQ.exe"
 START_SHELL_PATH="$HOME/.deepinwine/deepin-wine-helper/run_v3.sh"
 QQ_INSTALLER="PCQQ2020"
@@ -98,12 +98,12 @@ Run()
     if [ -n "$EXEC_PATH" ];then
         if [ ! -f "$WINEPREFIX/reinstalled" ];then
             touch $WINEPREFIX/reinstalled
-            env WINEDLLOVERRIDES="winemenubuilder.exe=d" $START_SHELL_PATH $BOTTLENAME $APPVER "$QQ_INSTALLER_PATH" "$@"
+            env LC_ALL=zh_CN.UTF-8 WINEDLLOVERRIDES="winemenubuilder.exe=d" $START_SHELL_PATH $BOTTLENAME $APPVER "$QQ_INSTALLER_PATH" "$@"
         else
-            $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+            env LC_ALL=zh_CN.UTF-8 $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
         fi
     else
-        $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
+        env LC_ALL=zh_CN.UTF-8 $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
     fi
 }