Upgrade deepin base package to 3.4.0.38deepin4 and use aur package 'deepin-wine6-stable' instead of 'deepin-wine5'; weapp and wechatbrowser work.

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

6 files changed, 32 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff4bf5147cf1..737f07c732bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = deepin-wine-wechat
 	pkgdesc = Tencent WeChat on Deepin Wine(com.qq.weixin.deepin) For Archlinux
 	pkgver = 3.5.0.46
-	pkgrel = 1
+	pkgrel = 2
 	url = https://weixin.qq.com/
 	install = deepin-wine-wechat.install
 	arch = x86_64
 	license = custom
 	depends = p7zip
-	depends = deepin-wine5
+	depends = deepin-wine6-stable
 	depends = deepin-wine-helper
 	depends = xorg-xwininfo
 	depends = wqy-microhei
@@ -20,17 +20,15 @@ pkgbase = deepin-wine-wechat
 	optdepends = noto-fonts-sc: display some Chinese characters
 	optdepends = lib32-nvidia-utils: required for nvidia graphics card
 	conflicts = deepin-wechat
-	source = https://com-store-packages.uniontech.com/appstore/pool/appstore/c/com.qq.weixin.deepin/com.qq.weixin.deepin_3.2.1.154deepin14_i386.deb
+	source = https://com-store-packages.uniontech.com/appstore/pool/appstore/c/com.qq.weixin.deepin/com.qq.weixin.deepin_3.4.0.38deepin4_i386.deb
 	source = WeChatSetup-3.5.0.46.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
 	source = https://community-packages.deepin.com/deepin/pool/main/o/openldap/libldap-2.4-2_2.4.47+dfsg.4-1+eagle_i386.deb
 	source = https://community-packages.deepin.com/deepin/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.27+dfsg-1+deb10u1_i386.deb
 	source = run.sh
-	source = reg.patch
-	md5sums = b48cd3c089b7c2bb7b68aba018b306b1
+	md5sums = 34e5107632fbec5cca41546ab50c209e
 	md5sums = d81ce735e25cf79ac90bdc2c87020d13
 	md5sums = cf87ad9db0bf279ddf9e5c1dce64a716
 	md5sums = 531a3997ea28e8fc0f47e9e136dae332
-	md5sums = e011858fb5987efa31d3a519c62cb2d6
-	md5sums = a2db11c578fa038120153d790eb8f144
+	md5sums = bdd9f1e7102892d4738c98fbede6749e
 
 pkgname = deepin-wine-wechat
diff --git a/PKGBUILD b/PKGBUILD
index eb4efbf1aac6..c2abab78839c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 pkgname=deepin-wine-wechat
 pkgver=3.5.0.46
 wechat_installer=WeChatSetup
-deepinwechatver=3.2.1.154deepin14
+deepinwechatver=3.4.0.38deepin4
 debpkgname="com.qq.weixin.deepin"
-pkgrel=1
+pkgrel=2
 pkgdesc="Tencent WeChat on Deepin Wine(${debpkgname}) For Archlinux"
 arch=("x86_64")
 url="https://weixin.qq.com/"
 license=('custom')
-depends=('p7zip' 'deepin-wine5' 'deepin-wine-helper' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-libldap')
+depends=('p7zip' 'deepin-wine6-stable' 'deepin-wine-helper' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-libldap')
 optdepends=('noto-fonts-sc: display some Chinese characters'
             'lib32-nvidia-utils: required for nvidia graphics card')
 conflicts=('deepin-wechat')
@@ -21,14 +21,12 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${deepinw
   "${wechat_installer}-${pkgver}.exe::https://dldir1.qq.com/weixin/Windows/${wechat_installer}.exe"
   "$_mirror_lib/o/openldap/libldap-2.4-2_2.4.47+dfsg.4-1+eagle_i386.deb"
   "$_mirror_lib/c/cyrus-sasl2/libsasl2-2_2.1.27+dfsg-1+deb10u1_i386.deb"
-  "run.sh"
-  "reg.patch")
-md5sums=('b48cd3c089b7c2bb7b68aba018b306b1'
+  "run.sh")
+md5sums=('34e5107632fbec5cca41546ab50c209e'
          'd81ce735e25cf79ac90bdc2c87020d13'
          'cf87ad9db0bf279ddf9e5c1dce64a716'
          '531a3997ea28e8fc0f47e9e136dae332'
-         'e011858fb5987efa31d3a519c62cb2d6'
-         'a2db11c578fa038120153d790eb8f144')
+         'bdd9f1e7102892d4738c98fbede6749e')
 
 build() {
   msg "Extracting DPKG package ..."
@@ -46,8 +44,8 @@ build() {
   7z x -aoa "${srcdir}/dpkgdir/opt/apps/${debpkgname}/files/files.7z" -o"${srcdir}/deepinwechatdir"
   msg "Cleaning up the original package directory ..."
   rm -r "${srcdir}/deepinwechatdir/drive_c/Program Files/Tencent/WeChat"
-  msg "Patching reg files ..."
-  patch -p1 -d "${srcdir}/deepinwechatdir/" < "${srcdir}/reg.patch"
+  #msg "Patching reg files ..."
+  #patch -p1 -d "${srcdir}/deepinwechatdir/" < "${srcdir}/reg.patch"
   msg "Creating font file link ..."
   ln -sf "/usr/share/fonts/wenquanyi/wqy-microhei/wqy-microhei.ttc" "${srcdir}/deepinwechatdir/drive_c/windows/Fonts/wqy-microhei.ttc"
   msg "Copying latest WeChat installer to ${srcdir}/deepinwechatdir/drive_c/Program Files/Tencent/ ..."
diff --git a/README.md b/README.md
index a2b6910c42ca..2670b82835fa 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@
 
 Deepin打包的微信容器(`com.qq.weixin.deepin`)移植到Archlinux，包含定制的运行脚本，微信安装包替换为官方最新
 
-:warning: `deepin-wine-wechat` 从 `v3.4.0.38-2` 开始，默认使用AUR仓库 [deepin-wine5](https://aur.archlinux.org/packages/deepin-wine5/)，不再依赖 `wine`，可以进行一些清理操作来保持系统整洁，具体参照： [从 `wine`/`deepin-wine 2.x` 迁移](#从-winedeepin-wine-2x-迁移)
+:warning: `deepin-wine-wechat` 从 `v3.5.0.46-2` 开始，默认使用AUR仓库 [deepin-wine6-stable](https://aur.archlinux.org/packages/deepin-wine6-stable/)，不再依赖 `wine`，可以进行一些清理操作来保持系统整洁，具体参照： [从 `wine`/`deepin-wine 2.x` 迁移](#从-winedeepin-wine-2x-迁移)
 
 <!-- TOC -->
 
@@ -36,6 +36,7 @@ Deepin打包的微信容器(`com.qq.weixin.deepin`)移植到Archlinux，包含�
     - [从 `wine`/`deepin-wine 2.x` 迁移](#从-winedeepin-wine-2x-迁移)
 - [卸载](#卸载)
 - [常见问题及解决](#常见问题及解决)
+    - [中文字体显示为方框/显示模糊](#中文字体显示为方框显示模糊)
     - [不能截图](#不能截图)
     - [高分辨率屏幕支持](#高分辨率屏幕支持)
     - [GNOME 桌面上的托盘图标](#gnome-桌面上的托盘图标)
@@ -155,7 +156,7 @@ dpi，系统版本，目录映射等可以在 `winecfg` 进行设置，打开 `w
 
 ## 切换到 `deepin-wine`
 
-:warning: `deepin-wine-wechat` 从 `v3.3.5.42-2` 开始，默认使用AUR仓库 [deepin-wine5](https://aur.archlinux.org/packages/deepin-wine5/)，无需再进行任何切换操作，对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-wechat-arch/blob/120d2dedd5dd9d018a14e8ff832f34fe2fcc57a3/README.md)。
+:warning: `deepin-wine-wechat` 从 `v3.5.0.46-2` 开始，默认使用AUR仓库 [deepin-wine6-stable](https://aur.archlinux.org/packages/deepin-wine6-stable/)，无需再进行任何切换操作，对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-wechat-arch/blob/120d2dedd5dd9d018a14e8ff832f34fe2fcc57a3/README.md)。
 
 ### 自动切换(推荐)
 
@@ -163,17 +164,17 @@ dpi，系统版本，目录映射等可以在 `winecfg` 进行设置，打开 `w
 
 ### 从 `wine`/`deepin-wine 2.x` 迁移
 
-更新到 `deepin-wine-wechat v3.4.0.38-2` 及之后的版本后，依赖变更为 `deepin-wine5`，
+更新到 `deepin-wine-wechat v3.5.0.46-2` 及之后的版本后，依赖变更为 `deepin-wine6-stable`，
 
-如果此时没有其他应用在使用 `wine`, `deepin-wine 2.x` 和 `deepin-wine6-stable`，就可以放心的卸载 `wine`, `deepin-wine 2.x` 和 `deepin-wine6-stable` 及其依赖：
+如果此时没有其他应用在使用 `wine`, `deepin-wine 2.x` 和 `deepin-wine5`，就可以放心的卸载 `wine`, `deepin-wine 2.x` 和 `deepin-wine5` 及其依赖：
 
 ```bash
 # 卸载 deepin-wine 2.x (如果有)
 sudo pacman -S lib32-freetype2 #用原版替换lib32-freetype2-infinality-ultimate
 sudo pacman -Rns deepin-wine xsettingsd # 卸载 deepin-wine 2.x
 
-# 卸载 deepin-wine6-stable (如果有)
-sudo pacman -Rns deepin-wine6-stable
+# 卸载 deepin-wine5 (如果有)
+sudo pacman -Rns deepin-wine5
 
 # 卸载 wine (如果有)
 sudo pacman -Rns wine wine-mono wine-gecko
@@ -199,6 +200,12 @@ sudo pacman -Rns deepin-wine-wechat
 
 ## 常见问题及解决
 
+### 中文字体显示为方框/显示模糊
+
+`deepin-wine-wechat` 的字体文件夹在：`$HOME/.deepinwine/Deepin-WeChat/drive_c/windows/Fonts`
+
+经测试将 `微软雅黑` 伪装成 `宋体(simsun)` 的显示效果最好，具体可以参照 [bbs.deepin.org](https://bbs.deepin.org/zh/post/213530?offset=0&postId=1269543)，将 `fake_simsun.ttc` 放到字体文件夹
+
 ### 不能截图
 
 对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-wechat-arch/blob/120d2dedd5dd9d018a14e8ff832f34fe2fcc57a3/README.md)。
@@ -248,6 +255,7 @@ DEEPIN_WINE_SCALE=1.25
 <details open>
 <summary>2022</summary>
 
+* 2022-02-03 WeChat-3.5.0.46 3.4.0.38deepin4
 * 2022-01-27 WeChat-3.5.0.46
 * 2022-01-03 WeChat-3.4.5.45
 
diff --git a/deepin-wine-wechat.install b/deepin-wine-wechat.install
index 07afbe05b5ec..bfe8c04e4597 100644
--- a/deepin-wine-wechat.install
+++ b/deepin-wine-wechat.install
@@ -1,5 +1,7 @@
 info() {
     echo -e "\033[0;34m============================提示/INFO==============================="
+    echo -e "* 常见问题及解决(Troubleshoot):"
+    echo -e "  https://github.com/vufa/deepin-wine-wechat-arch"
     echo -e "* 反馈问题(Report issue):"
     echo -e "  https://github.com/vufa/deepin-wine-wechat-arch/issues"
     echo -e "* 安装包下载(Installation package download):"
diff --git a/reg.patch b/reg.patch
deleted file mode 100644
index 96e9457fba5e..000000000000
--- a/reg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN reg_tmp/user.reg reg_tmp_fixed/user.reg
---- reg_tmp/user.reg	2021-04-28 14:50:30.000000000 +0800
-+++ reg_tmp_fixed/user.reg	2022-01-27 11:07:09.995468048 +0800
-@@ -761,6 +761,8 @@
- "txupd.exe"=""
- "usp10"="native,builtin"
- "wechatupdate.exe"=""
-+"wechatbrowser.exe"=""
-+"wechatapp.exe"=""
- 
- [Software\\Wine\\Drivers\\winepulse.drv] 1591000018
- #time=1d637ee6a5a1faa
diff --git a/run.sh b/run.sh
index 2addd626deca..9328a6fe4b65 100755
--- a/run.sh
+++ b/run.sh
@@ -10,7 +10,7 @@
 version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 
 BOTTLENAME="Deepin-WeChat"
-APPVER="3.2.1.154deepin14"
+APPVER="3.4.0.38deepin4"
 WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME"
 WECHAT_VER="3.5.0.46"
 EXEC_PATH="c:/Program Files/Tencent/WeChat/WeChat.exe"
@@ -19,8 +19,9 @@ WECHAT_INSTALLER="WeChatSetup"
 WECHAT_INSTALLER_PATH="c:/Program Files/Tencent/$WECHAT_INSTALLER-$WECHAT_VER.exe"
 export MIME_TYPE=""
 export DEB_PACKAGE_NAME="com.qq.weixin.deepin"
-export APPRUN_CMD="deepin-wine5"
+export APPRUN_CMD="deepin-wine6-stable"
 DISABLE_ATTACH_FILE_DIALOG=""
+EXPORT_ENVS=""
 
 export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`