Upgrade WeChat to 2.9.5.41

Signed-off-by: Codist <[email protected]>
vufa · Jul 2, 2020 · edc3a70 · edc3a70
1 parent 93d413f
commit edc3a70
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/.SRCINFO b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-wechat
 	pkgdesc = Tencent WeChat (com.wechat) on Deepin Wine For Archlinux
-	pkgver = 2.9.0.123
+	pkgver = 2.9.5.41
 	pkgrel = 1
 	url = https://weixin.qq.com/
 	install = deepin-wine-wechat.install
@@ -20,13 +20,13 @@ pkgbase = deepin-wine-wechat
 	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.8.65deepin0_i386.deb
-	source = WeChatSetup-2.9.0.123.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
+	source = WeChatSetup-2.9.5.41.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
 	source = run.sh
 	source = reg.patch
 	source = shadow.exe
 	md5sums = fe31cf4f0f6186fc1c99adc1512f5305
-	md5sums = 0f64e8d65338e8c136a825ed5b717d66
-	md5sums = ee59ffc498b45598abe0e3aea03ca425
+	md5sums = 66e44f6d70e52890c7feab066868c062
+	md5sums = 42b388b01db50af8b781b58bc6ac5414
 	md5sums = f264f961704f2aa1d480971b0e58617a
 	md5sums = d83f1c3845f28abd81cbfd215089d3d8
 

diff --git a/PKGBUILD b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Codist <[email protected]>
 
 pkgname=deepin-wine-wechat
-pkgver=2.9.0.123
+pkgver=2.9.5.41
 wechat_installer=WeChatSetup
 deepinwechatver=2.6.8.65deepin0
 pkgrel=1
@@ -19,8 +19,8 @@ source=("$_mirror/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_${deepinwe
   "reg.patch"
   "shadow.exe")
 md5sums=('fe31cf4f0f6186fc1c99adc1512f5305'
-  '0f64e8d65338e8c136a825ed5b717d66'
-  'ee59ffc498b45598abe0e3aea03ca425'
+  '66e44f6d70e52890c7feab066868c062'
+  '42b388b01db50af8b781b58bc6ac5414'
   'f264f961704f2aa1d480971b0e58617a'
   'd83f1c3845f28abd81cbfd215089d3d8')
 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
     <img src="https://travis-ci.org/countstarlight/deepin-wine-wechat-arch.svg?branch=master" alt="Build Status">
   </a>
   <a href="https://pc.weixin.qq.com/">
-    <img src="https://img.shields.io/badge/WeChat-2.9.0.123-blue.svg" alt="WeChat Version">
+    <img src="https://img.shields.io/badge/WeChat-2.9.5.41-blue.svg" alt="WeChat Version">
   </a>
   <a href="https://aur.archlinux.org/packages/deepin-wine-wechat/">
     <img src="https://img.shields.io/aur/version/deepin-wine-wechat.svg" alt="AUR Version">
@@ -29,7 +29,7 @@ Deepin打包的微信(WeChat)容器移植到Archlinux，不依赖`deepin-wine`
     - [本地打包安装](#本地打包安装)
 - [兼容性记录](#兼容性记录)
 - [切换到 `deepin-wine`](#切换到-deepin-wine)
-    - [自动切换](#自动切换)
+    - [自动切换(推荐)](#自动切换推荐)
     - [手动切换](#手动切换)
         - [1. 安装 `deepin-wine`](#1-安装-deepin-wine)
         - [2. 对于非 GNOME 桌面(KDE, XFCE等)](#2-对于非-gnome-桌面kde-xfce等)
@@ -112,6 +112,7 @@ sudo pacman -U #下载的包名
 
 | 微信版本  | wine版本 | 兼容性 |                             备注                             | deepin-wine版本 | 兼容性 |                             备注                             |
 | :-------: | :------: | :----: | :----------------------------------------------------------: | :-------------: | :----: | :----------------------------------------------------------: |
+| 2.9.5.41  |   5.11   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |    2.18_22-3    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |
 | 2.9.0.123 |   5.7    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |    2.18_22-3    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |
 | 2.9.0.114 |   5.6    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
 | 2.9.0.112 |   5.5    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
@@ -133,7 +134,7 @@ sudo pacman -U #下载的包名
 
 根据 [deepin-wine-wechat-arch#15](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/15#issuecomment-515455845)，[deepin-wine-wechat-arch#27](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/27)，由 [@feileb](https://github.com/feileb), [@violetbobo](https://github.com/violetbobo), [@HE7086](https://github.com/HE7086)提供的方法：
 
-### 自动切换
+### 自动切换(推荐)
 
 ```bash
 /opt/deepinwine/apps/Deepin-WeChat/run.sh -d
@@ -216,15 +217,31 @@ yay -S lib32-freetype2-infinality-ultimate
 
 ### 高分辨率屏幕支持
 
-在 2k/4k 屏幕下字体和图标都非常小, 参见[issue1](https://github.com/countstarlight/deepin-wine-tim-arch/issues/1)
+在 `winecfg` 的Graphics选项卡中修改dpi，如 修改为`192`
+
+对于 `wine`：
+
+```bash
+env WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat" winecfg
+```
+
+对于 `deepin-wine` ：
+
+```bash
+env WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat" deepin-wine winecfg
+```
 
 ### 使用全局截图快捷键
 
 使用全局截图快捷键和解决Gnome上窗口化问题，参见[issue2](https://github.com/countstarlight/deepin-wine-tim-arch/issues/2)
 
 ### 消除阴影边框
 
-微信窗口不在最上方时，在其他窗口上会显示一个阴影边框，根据[用山寨方法解决wine运行微信残留阴影窗口的问题](https://blog.kangkang.org/index.php/archives/397)，对原程序稍做修改编译出[shadow.exe](shadow.exe)，在微信启动时运行，自动消除这个阴影边框。
+微信窗口不在最上方时，在其他窗口上会显示一个阴影边框
+
+参照[切换到 `deepin-wine`](#切换到-deepin-wine) 解决，或者使用[shadow.exe](shadow.exe)，在微信启动时运行，自动消除这个阴影边框
+
+> 根据[“用山寨方法解决wine运行微信残留阴影窗口的问题”](https://blog.kangkang.org/index.php/archives/397)，对原程序稍做修改编译出的 [shadow.exe](shadow.exe)，源码文件为 [shadow.cpp](shadow.cpp)
 
 你也可以自行编译这个程序：
 
@@ -267,6 +284,7 @@ CallApp()
 
 ## 更新日志
 
+* 2020-07-02 WeChat-2.9.5.41
 * 2020-05-10 WeChat-2.9.0.123
 * 2020-04-24 WeChat-2.9.0.114
 * 2020-04-20 WeChat-2.9.0.112

diff --git a/run.sh b/run.sh
@@ -4,13 +4,14 @@
 #
 #   Author:     Li LongYu <[email protected]>
 #               Peng Hao <[email protected]>
+
 #               Codist <[email protected]>
 
 WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat"
 APPDIR="/opt/deepinwine/apps/Deepin-WeChat"
 APPVER="2.6.8.65deepin0"
 WECHAT_INSTALLER="WeChatSetup"
-WECHAT_VER="2.9.0.123"
+WECHAT_VER="2.9.5.41"
 APPTAR="files.7z"
 PACKAGENAME="com.wechat"
 WINE_CMD="wine"