Upgrade deepin base package

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

4 files changed, 37 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 737f07c732bf..fc99b4fa2071 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deepin-wine-wechat
 	pkgdesc = Tencent WeChat on Deepin Wine(com.qq.weixin.deepin) For Archlinux
 	pkgver = 3.5.0.46
-	pkgrel = 2
+	pkgrel = 3
 	url = https://weixin.qq.com/
 	install = deepin-wine-wechat.install
 	arch = x86_64
@@ -25,10 +25,10 @@ pkgbase = deepin-wine-wechat
 	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
-	md5sums = 34e5107632fbec5cca41546ab50c209e
+	md5sums = 940b59d57536a1e43bc9fc6f61d675ca
 	md5sums = d81ce735e25cf79ac90bdc2c87020d13
 	md5sums = cf87ad9db0bf279ddf9e5c1dce64a716
 	md5sums = 531a3997ea28e8fc0f47e9e136dae332
-	md5sums = bdd9f1e7102892d4738c98fbede6749e
+	md5sums = 407a69a6359b429e74c503ff9b389c7c
 
 pkgname = deepin-wine-wechat
diff --git a/PKGBUILD b/PKGBUILD
index c2abab78839c..db0bf3611b6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=3.5.0.46
 wechat_installer=WeChatSetup
 deepinwechatver=3.4.0.38deepin4
 debpkgname="com.qq.weixin.deepin"
-pkgrel=2
+pkgrel=3
 pkgdesc="Tencent WeChat on Deepin Wine(${debpkgname}) For Archlinux"
 arch=("x86_64")
 url="https://weixin.qq.com/"
@@ -22,11 +22,11 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${deepinw
   "$_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")
-md5sums=('34e5107632fbec5cca41546ab50c209e'
+md5sums=('940b59d57536a1e43bc9fc6f61d675ca'
          'd81ce735e25cf79ac90bdc2c87020d13'
          'cf87ad9db0bf279ddf9e5c1dce64a716'
          '531a3997ea28e8fc0f47e9e136dae332'
-         'bdd9f1e7102892d4738c98fbede6749e')
+         '407a69a6359b429e74c503ff9b389c7c')
 
 build() {
   msg "Extracting DPKG package ..."
diff --git a/README.md b/README.md
index 2670b82835fa..25b6f1782fab 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ Deepin打包的微信容器(`com.qq.weixin.deepin`)移植到Archlinux，包含�
 - [卸载](#卸载)
 - [常见问题及解决](#常见问题及解决)
     - [中文字体显示为方框/显示模糊](#中文字体显示为方框显示模糊)
+    - [小程序中字体显示为方框](#小程序中字体显示为方框)
     - [不能截图](#不能截图)
     - [高分辨率屏幕支持](#高分辨率屏幕支持)
     - [GNOME 桌面上的托盘图标](#gnome-桌面上的托盘图标)
@@ -206,6 +207,19 @@ sudo pacman -Rns deepin-wine-wechat
 
 经测试将 `微软雅黑` 伪装成 `宋体(simsun)` 的显示效果最好，具体可以参照 [bbs.deepin.org](https://bbs.deepin.org/zh/post/213530?offset=0&postId=1269543)，将 `fake_simsun.ttc` 放到字体文件夹
 
+### 小程序中字体显示为方框
+
+> 参照 [deepin-wine-wechat-arch#186](https://github.com/vufa/deepin-wine-wechat-arch/issues/186)
+
+可以安装 `deepin-wine-wechat` 的可选依赖 [noto-fonts-sc](https://aur.archlinux.org/packages/noto-fonts-sc/)(只包含 `noto-fonts-cjk` 中的简体中文字体)：
+
+```bash
+yay -S noto-fonts-sc
+```
+
+或安装 `noto-fonts-cjk` 并参照[ArchWiki](https://wiki.archlinux.org/title/Localization_(%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87)/Simplified_Chinese_(%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87)#.E4.BF.AE.E6.AD.A3.E7.AE.80.E4.BD.93.E4.B8.AD.E6.96.87.E6.98.BE.E7.A4.BA.E4.B8.BA.E5.BC.82.E4.BD.93.EF.BC.88.E6.97.A5.E6.96.87.EF.BC.89.E5.AD.97.E5.BD.A2)进行配置
+
+
 ### 不能截图
 
 对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-wechat-arch/blob/120d2dedd5dd9d018a14e8ff832f34fe2fcc57a3/README.md)。
diff --git a/run.sh b/run.sh
index 9328a6fe4b65..4e3d9d94d380 100755
--- a/run.sh
+++ b/run.sh
@@ -12,6 +12,7 @@ version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1";
 BOTTLENAME="Deepin-WeChat"
 APPVER="3.4.0.38deepin4"
 WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME"
+WECHAT_FONTS="$WINEPREFIX/drive_c/windows/Fonts"
 WECHAT_VER="3.5.0.46"
 EXEC_PATH="c:/Program Files/Tencent/WeChat/WeChat.exe"
 START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
@@ -44,10 +45,26 @@ Run()
         export ATTACH_FILE_DIALOG=1
     fi
 
+    if [ -n "$EXPORT_ENVS" ];then
+        export $EXPORT_ENVS
+    fi
+
     if [ -n "$EXEC_PATH" ];then
         if [ ! -f "$WINEPREFIX/reinstalled" ];then
+            # backup fonts
+            if [ -d "$WECHAT_FONTS" ];then
+                mkdir $HOME/.deepinwine/.wechat_tmp
+                cp "$WECHAT_FONTS/*" "$HOME/.deepinwine/.wechat_tmp/"
+            fi
+
             # run installer
             env WINEDLLOVERRIDES="winemenubuilder.exe=d" $START_SHELL_PATH $BOTTLENAME $APPVER "$WECHAT_INSTALLER_PATH" "$@"
+
+            # restore fonts
+            if [ -d "$HOME/.deepinwine/.wechat_tmp" ];then
+                cp -n "$HOME/.deepinwine/.wechat_tmp/*" "$WECHAT_FONTS/"
+                rm -rf "$HOME/.deepinwine/.wechat_tmp"
+            fi
             touch $WINEPREFIX/reinstalled
         else
             if [ -z "${EXEC_PATH##*.lnk*}" ];then