aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVufa2023-01-16 12:50:09 +0800
committerVufa2023-01-16 12:50:09 +0800
commit966ab90669886ec0694efa77e1445935a77d4551 (patch)
tree63ccb2f049652d65efca07c1470dc71c98152a3a
parentbe7b0d2f70894965ae452c3ef44563b7d8b961f7 (diff)
downloadaur-966ab90669886ec0694efa77e1445935a77d4551.tar.gz
Upgrade WeChat to '3.8.1.26'
Signed-off-by: Vufa <countstarlight@gmail.com>
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD8
-rw-r--r--README.md236
-rwxr-xr-xgen.sh75
-rwxr-xr-xrun.sh4
5 files changed, 191 insertions, 142 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 36ebb5f77e63..d8d93ad639f0 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.8.0.41
- pkgrel = 2
+ pkgver = 3.8.1.26
+ pkgrel = 1
url = https://weixin.qq.com/
install = deepin-wine-wechat.install
arch = x86_64
@@ -21,16 +21,16 @@ pkgbase = deepin-wine-wechat
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.4.0.38deepin6_i386.deb
- source = WeChatSetup-3.8.0.41.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
+ source = WeChatSetup-3.8.1.26.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.1-1+dde_i386.deb
source = run.sh
source = reg.patch
md5sums = 6c4edb108a0593bab7a556a6c9e8a012
- md5sums = d841406c6a892707904029953266ad41
+ md5sums = 4f374b1a0961dc7ca734db90ebc5e635
md5sums = cf87ad9db0bf279ddf9e5c1dce64a716
md5sums = 89b10711889f52ab0a386f37b4eb3212
- md5sums = 8ff0cb8e9c126641593ee8d31b94042b
+ md5sums = 1a98e0a0ba0d740115e9e62523104011
md5sums = 05b05416ef1fa4e1baaf64736e15a057
pkgname = deepin-wine-wechat
diff --git a/PKGBUILD b/PKGBUILD
index 29c1951ae5db..ae5aba01ca80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: Vufa <countstarlight@gmail.com>
pkgname=deepin-wine-wechat
-pkgver=3.8.0.41
+pkgver=3.8.1.26
wechat_installer=WeChatSetup
deepinwechatver=3.4.0.38deepin6
debpkgname="com.qq.weixin.deepin"
-pkgrel=2
+pkgrel=1
pkgdesc="Tencent WeChat on Deepin Wine(${debpkgname}) For Archlinux"
arch=("x86_64")
url="https://weixin.qq.com/"
@@ -24,10 +24,10 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${deepinw
"run.sh"
"reg.patch")
md5sums=('6c4edb108a0593bab7a556a6c9e8a012'
- 'd841406c6a892707904029953266ad41'
+ '4f374b1a0961dc7ca734db90ebc5e635'
'cf87ad9db0bf279ddf9e5c1dce64a716'
'89b10711889f52ab0a386f37b4eb3212'
- '8ff0cb8e9c126641593ee8d31b94042b'
+ '1a98e0a0ba0d740115e9e62523104011'
'05b05416ef1fa4e1baaf64736e15a057')
build() {
diff --git a/README.md b/README.md
index 3eb8450f773a..c67e09fb55ab 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,11 @@
-在Archlinux及衍生发行版上运行微信(WeChat) <!-- omit in toc -->
-========
+# 在 Archlinux 及衍生发行版上运行微信(WeChat) <!-- omit in toc -->
<p align="center">
<a href="https://github.com/vufa/deepin-wine-wechat-arch/actions">
- <img src="https://img.shields.io/github/workflow/status/vufa/deepin-wine-wechat-arch/CI/action?logo=github&style=flat-square">
+ <img src="https://img.shields.io/github/actions/workflow/status/vufa/deepin-wine-wechat-arch/ci.yml?branch=action&logo=github&style=flat-square">
</a>
<a href="https://pc.weixin.qq.com/">
- <img src="https://img.shields.io/badge/WeChat-3.8.0.41-blue?style=flat-square&logo=wechat" alt="WeChat Version">
+ <img src="https://img.shields.io/badge/WeChat-3.8.1.26-blue?style=flat-square&logo=wechat" 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?label=AUR&logo=arch-linux&style=flat-square" alt="AUR Version">
@@ -19,12 +18,12 @@
</a>
</p>
-Deepin打包的微信容器(`com.qq.weixin.deepin`)移植到Archlinux，包含定制的运行脚本，微信安装包替换为官方最新
+Deepin 打包的微信容器(`com.qq.weixin.deepin`)移植到 Archlinux，包含定制的运行脚本，微信安装包替换为官方最新
-: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-迁移)
+: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-迁移)
- [安装](#安装)
- - [从AUR安装](#从aur安装)
+ - [从 AUR 安装](#从-aur-安装)
- [用安装包安装](#用安装包安装)
- [本地打包安装](#本地打包安装)
- [设置](#设置)
@@ -40,14 +39,15 @@ Deepin打包的微信容器(`com.qq.weixin.deepin`)移植到Archlinux，包含
- [高分辨率屏幕支持](#高分辨率屏幕支持)
- [GNOME 桌面上的托盘图标](#gnome-桌面上的托盘图标)
- [消除阴影边框](#消除阴影边框)
- - [唤出已运行的WeChat窗口](#唤出已运行的wechat窗口)
+ - [唤出已运行的 WeChat 窗口](#唤出已运行的-wechat-窗口)
+ - [旧方法：](#旧方法)
+ - [新方法：](#新方法)
- [感谢](#感谢)
- [更新日志](#更新日志)
-
## 安装
-`deepin-wine-wechat`依赖`Multilib`仓库中的一些32位库，Archlinux默认没有开启`Multilib`仓库，需要编辑`/etc/pacman.conf`，取消对应行前面的注释并更新本地数据库([Archlinux wiki](https://wiki.archlinux.org/index.php/Official_repositories#multilib)):
+`deepin-wine-wechat`依赖`Multilib`仓库中的一些 32 位库，Archlinux 默认没有开启`Multilib`仓库，需要编辑`/etc/pacman.conf`，取消对应行前面的注释并更新本地数据库([Archlinux wiki](https://wiki.archlinux.org/index.php/Official_repositories#multilib)):
```diff
# If you want to run 32 bit applications on your x86_64 system,
@@ -61,16 +61,18 @@ Deepin打包的微信容器(`com.qq.weixin.deepin`)移植到Archlinux，包含
+[multilib]
+Include = /etc/pacman.d/mirrorlist
```
+
保存后执行
+
```shell
sudo pacman -Sy
```
-:warning: **注意：由于新版微信可能需要 `wine` 还没有实现的一些win api，这会导致一些功能不可用，安装前先根据[兼容性记录](#兼容性记录)选择一个合适的版本**
+:warning: **注意：由于新版微信可能需要 `wine` 还没有实现的一些 win api，这会导致一些功能不可用，安装前先根据[兼容性记录](#兼容性记录)选择一个合适的版本**
:bulb: 以下三种安装方式效果相同，选择一种即可
-### 从AUR安装
+### 从 AUR 安装
已添加到 AUR [deepin-wine-wechat](https://aur.archlinux.org/packages/deepin-wine-wechat/)，可使用 `yay` 或 `yaourt` 安装:
@@ -100,7 +102,7 @@ md5sum -c *.md5
git clone https://github.com/vufa/deepin-wine-wechat-arch.git
cd deepin-wine-wechat-arch
-
+
makepkg -si
```
@@ -111,6 +113,7 @@ md5sum -c *.md5
```bash
EXEC_PATH="c:/Program Files/Tencent/WeChat/WeChat.exe"
```
+
改为修改后的安装路径，否则只有安装后第一次能够运行
:warning: **注意：登录后请在`设置`里关闭微信的`自动更新`，微信启动时会检查更新并加载自动更新程序，由于默认屏蔽了微信的自动更新程序，会导致找不到更新程序而不能启动**
@@ -127,30 +130,29 @@ dpi，系统版本，目录映射等可以在 `winecfg` 进行设置，打开 `w
:warning: **注意：所有版本的摄像头均不可用**
-
-| 微信版本 | wine | 兼容性 | 备注 | deepin-wine | 兼容性 | 备注 |
-| :-----------------: | :-------: | :--------: | :----------------------------------------------------------: | :---------: | :----: | :----------------------------------------------------------: |
-| 3.8.0.41~ | \ | \ | \ | 6.0.0.39-1 | 部分 | 截图不可用，内置浏览器出现问题([#225](https://github.com/vufa/deepin-wine-wechat-arch/issues/225)) |
-| 3.7.0.30~3.7.6.44 | \ | \ | \ | 6.0.0.24-1 | 部分 | 截图和表情包不可用，内置浏览器出现问题([#225](https://github.com/vufa/deepin-wine-wechat-arch/issues/225)) |
-| 3.5.0.46~3.7.0.30 | \ | \ | \ | 6.0.0.24-1 | 部分 | 小程序和公众号可用，截图([#192](https://github.com/vufa/deepin-wine-wechat-arch/issues/192))和表情包不可用([#177](https://github.com/vufa/deepin-wine-wechat-arch/issues/188)) |
-| 3.3.0.93~3.5.0.46 | \ | \ | \ | 5.0.16-1 | 支持 | |
-| 3.2.1.141~3.2.1.154 | 6.6 | | 截图功能不可用：[#87](https://github.com/vufa/deepin-wine-wechat-arch/issues/87) | 5.0.16-1 | 支持 | |
-| 3.2.1.127 | 6.5 | 部分 | 群聊闪退&截图功能不可用：[#87](https://github.com/vufa/deepin-wine-wechat-arch/issues/87) | 5.0.16-1 | 支持 | |
-| 3.1.0.41~3.1.0.72 | 5.22~6.0 | 部分 | 截图功能不可用：[#73](https://github.com/vufa/deepin-wine-wechat-arch/issues/73) | 5.0.16-1 | 支持 | |
-| 3.0.0.57 | 5.22 | **不支持** | 微信安装程序不能启动：[#92](https://github.com/vufa/deepin-wine-wechat-arch/issues/92) | 5.0.16-1 | 支持 | |
-| 3.0.0.57 | 5.19 | 支持 | | 2.18_24-3 | 支持 | |
-| 2.8.0.106~2.9.5.56 | 4.19~5.13 | 部分 | 发送图片有问题: [#42](https://github.com/vufa/deepin-wine-wechat-arch/issues/42) | 2.18_22-3 | 部分 | 发送图片有问题: [#42](https://github.com/vufa/deepin-wine-wechat-arch/issues/42) |
-| 2.7.1.82~2.7.1.88 | 4.19+ | 支持 | | | | |
-| 2.7.1.82~2.7.1.88 | 4.17~4.18 | 部分 | 不能使用中文输入法 | 2.18_18-2 | 不支持 | 闪退 |
-| 2.6.8.65 | 4.16 | 支持 | | 2.18_18-2 | 支持 | |
+| 微信版本 | wine | 兼容性 | 备注 | deepin-wine | 兼容性 | 备注 |
+| :-----------------: | :-------: | :--------: | :---------------------------------------------------------------------------------------: | :---------: | :----: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
+| 3.8.0.41~ | \ | \ | \ | 6.0.0.39-1 | 部分 | 截图不可用，内置浏览器出现问题([#225](https://github.com/vufa/deepin-wine-wechat-arch/issues/225)) |
+| 3.7.0.30~3.7.6.44 | \ | \ | \ | 6.0.0.24-1 | 部分 | 截图和表情包不可用，内置浏览器出现问题([#225](https://github.com/vufa/deepin-wine-wechat-arch/issues/225)) |
+| 3.5.0.46~3.7.0.30 | \ | \ | \ | 6.0.0.24-1 | 部分 | 小程序和公众号可用，截图([#192](https://github.com/vufa/deepin-wine-wechat-arch/issues/192))和表情包不可用([#177](https://github.com/vufa/deepin-wine-wechat-arch/issues/188)) |
+| 3.3.0.93~3.5.0.46 | \ | \ | \ | 5.0.16-1 | 支持 | |
+| 3.2.1.141~3.2.1.154 | 6.6 | | 截图功能不可用：[#87](https://github.com/vufa/deepin-wine-wechat-arch/issues/87) | 5.0.16-1 | 支持 | |
+| 3.2.1.127 | 6.5 | 部分 | 群聊闪退&截图功能不可用：[#87](https://github.com/vufa/deepin-wine-wechat-arch/issues/87) | 5.0.16-1 | 支持 | |
+| 3.1.0.41~3.1.0.72 | 5.22~6.0 | 部分 | 截图功能不可用：[#73](https://github.com/vufa/deepin-wine-wechat-arch/issues/73) | 5.0.16-1 | 支持 | |
+| 3.0.0.57 | 5.22 | **不支持** | 微信安装程序不能启动：[#92](https://github.com/vufa/deepin-wine-wechat-arch/issues/92) | 5.0.16-1 | 支持 | |
+| 3.0.0.57 | 5.19 | 支持 | | 2.18_24-3 | 支持 | |
+| 2.8.0.106~2.9.5.56 | 4.19~5.13 | 部分 | 发送图片有问题: [#42](https://github.com/vufa/deepin-wine-wechat-arch/issues/42) | 2.18_22-3 | 部分 | 发送图片有问题: [#42](https://github.com/vufa/deepin-wine-wechat-arch/issues/42) |
+| 2.7.1.82~2.7.1.88 | 4.19+ | 支持 | | | | |
+| 2.7.1.82~2.7.1.88 | 4.17~4.18 | 部分 | 不能使用中文输入法 | 2.18_18-2 | 不支持 | 闪退 |
+| 2.6.8.65 | 4.16 | 支持 | | 2.18_18-2 | 支持 | |
## 切换到 `deepin-wine`
-: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)。
+: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)。
### 自动切换(推荐)
-对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-wechat-arch/blob/120d2dedd5dd9d018a14e8ff832f34fe2fcc57a3/README.md)。
+对于之前的版本，可以查看[旧版 README](https://github.com/vufa/deepin-wine-wechat-arch/blob/120d2dedd5dd9d018a14e8ff832f34fe2fcc57a3/README.md)。
### 从 `wine`/`deepin-wine 2.x` 迁移
@@ -170,7 +172,7 @@ sudo pacman -Rns deepin-wine5
sudo pacman -Rns wine wine-mono wine-gecko
```
-同时，由于 deepin 的打包中不再包含 `deepin-wine-helper`，现改为使用AUR仓库[deepin-wine-helper](https://aur.archlinux.org/packages/deepin-wine-helper)，可以删除之前的 `deepin-wine-helper`：
+同时，由于 deepin 的打包中不再包含 `deepin-wine-helper`，现改为使用 AUR 仓库[deepin-wine-helper](https://aur.archlinux.org/packages/deepin-wine-helper)，可以删除之前的 `deepin-wine-helper`：
```bash
rm -rf $HOME/.deepinwine/deepin-wine-helper
@@ -206,18 +208,17 @@ sudo pacman -Rns deepin-wine-wechat
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)进行配置
-
+或安装 `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)。
+对于之前的版本，可以查看[旧版 README](https://github.com/vufa/deepin-wine-wechat-arch/blob/120d2dedd5dd9d018a14e8ff832f34fe2fcc57a3/README.md)。
### 高分辨率屏幕支持
-参照[设置](#设置)打开 `winecfg` ，在选项卡 `Graphics` 中修改dpi，如 修改为`192`
+参照[设置](#设置)打开 `winecfg` ，在选项卡 `Graphics` 中修改 dpi，如 修改为`192`
-:bulb: 这一修改会在更新或重装后被重置，如果要在更新后保留dpi设置，可以添加环境变量
+:bulb: 这一修改会在更新或重装后被重置，如果要在更新后保留 dpi 设置，可以添加环境变量
> 根据 [deepin-wine-wechat-arch#173](https://github.com/vufa/deepin-wine-wechat-arch/issues/173)，由[abcfy2](https://github.com/abcfy2)提供的方法
@@ -235,9 +236,11 @@ DEEPIN_WINE_SCALE=1.25
### 消除阴影边框
-对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-wechat-arch/blob/120d2dedd5dd9d018a14e8ff832f34fe2fcc57a3/README.md)。
+对于之前的版本，可以查看[旧版 README](https://github.com/vufa/deepin-wine-wechat-arch/blob/120d2dedd5dd9d018a14e8ff832f34fe2fcc57a3/README.md)。
+
+### 唤出已运行的 WeChat 窗口
-### 唤出已运行的WeChat窗口
+#### 旧方法：
运行命令：
@@ -247,79 +250,134 @@ DEEPIN_WINE_SCALE=1.25
可以参考 [deepin-wine-wechat-arch#96](https://github.com/vufa/deepin-wine-wechat-arch/issues/96) 和 [deepin-wine-wechat-arch#263](https://github.com/vufa/deepin-wine-wechat-arch/issues/263) 将该命令存入脚本并添加到全局快捷键中，方便使用
+#### 新方法：
+
+点击图标时如果已有正在运行的实例会导致错误的 kill，原因是`/opt/deepinwine/tools/kill.sh`中：
+
+```shell
+get_tray_window()
+{
+ # get_tray_window 是一个基于 python2 写的脚本，
+ # python2 已是被扔进历史垃圾堆的产物，这个垃圾在
+ # debian 10 中是关键组件，但在 Archlinux 中却
+ # 没有必要再安装这个垃圾。
+ $SHELL_DIR/get_tray_window | grep window_id: | awk -F: '{print $2}'
+}
+```
+
+我们需要安装一个依赖：
+
+```bash
+sudo pacman -S dbus-python
+```
+
+再将脚本`/opt/deepinwine/tools/get_tray_window`内容修改成如下代码：
+
+```python
+#!/usr/bin/env python
+
+def get_tray_window():
+ try:
+ import dbus
+ except ImportError:
+ return False
+
+ bus = dbus.SessionBus()
+ traymanager = bus.get_object("com.deepin.dde.TrayManager", "/com/deepin/dde/TrayManager")
+
+ windows = traymanager.Get("com.deepin.dde.TrayManager","TrayIcons")
+ str="window_id:"
+ for i in range(len(windows)):
+ str += '{:#x} '.format(windows[i])
+
+ print(str)
+
+if __name__ == "__main__":
+ get_tray_window()
+```
+
+保存退出后，点击图标就不会再退出原实例，而是会唤出原实例窗口了。
+
## 感谢
-* [Wuhan Deepin Technology Co.,Ltd.](http://www.deepin.org/)
+- [Wuhan Deepin Technology Co.,Ltd.](http://www.deepin.org/)
## 更新日志
<details open>
+<summary>2023</summary>
+
+- 2023-01-16 WeChat-3.8.1.26
+
+</details>
+
+<details>
<summary>2022</summary>
-* 2022-11-30 WeChat-3.8.0.41
-* 2022-09-06 WeChat-3.7.6.44
-* 2022-08-20 WeChat-3.7.6.29
-* 2022-08-20 WeChat-3.7.6.24
-* 2022-08-17 WeChat-3.7.5.31
-* 2022-07-21 WeChat-3.7.5.23
-* 2022-06-09 WeChat-3.7.0.30
-* 2022-06-02 WeChat-3.7.0.29
-* 2022-03-20 WeChat-3.6.0.18 3.4.0.38deepin6
-* 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
+- 2022-11-30 WeChat-3.8.0.41
+- 2022-09-06 WeChat-3.7.6.44
+- 2022-08-20 WeChat-3.7.6.29
+- 2022-08-20 WeChat-3.7.6.24
+- 2022-08-17 WeChat-3.7.5.31
+- 2022-07-21 WeChat-3.7.5.23
+- 2022-06-09 WeChat-3.7.0.30
+- 2022-06-02 WeChat-3.7.0.29
+- 2022-03-20 WeChat-3.6.0.18 3.4.0.38deepin6
+- 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
</details>
<details>
<summary>2021</summary>
-* 2021-12-11 WeChat-3.4.5.27
-* 2021-12-04 WeChat-3.4.0.54
-* 2021-11-12 WeChat-3.4.0.38 3.2.1.154deepin14
-* 2021-10-21 WeChat-3.4.0.38
-* 2021-08-29 WeChat-3.3.5.50
-* 2021-08-25 WeChat-3.3.5.42 3.2.1.154deepin13
-* 2021-08-13 WeChat-3.3.5.42
-* 2021-08-08 WeChat-3.3.5.34
-* 2021-07-05 WeChat-3.3.0.115
-* 2021-06-21 WeChat-3.3.0.93
-* 2021-05-07 WeChat-3.2.1.154 3.2.1.154deepin8
-* 2021-04-23 WeChat-3.2.1.154
-* 2021-04-19 WeChat-3.2.1.151
-* 2021-04-18 WeChat-3.2.1.141
-* 2021-04-02 WeChat-3.2.1.127
-* 2021-01-29 WeChat-3.1.0.72
+- 2021-12-11 WeChat-3.4.5.27
+- 2021-12-04 WeChat-3.4.0.54
+- 2021-11-12 WeChat-3.4.0.38 3.2.1.154deepin14
+- 2021-10-21 WeChat-3.4.0.38
+- 2021-08-29 WeChat-3.3.5.50
+- 2021-08-25 WeChat-3.3.5.42 3.2.1.154deepin13
+- 2021-08-13 WeChat-3.3.5.42
+- 2021-08-08 WeChat-3.3.5.34
+- 2021-07-05 WeChat-3.3.0.115
+- 2021-06-21 WeChat-3.3.0.93
+- 2021-05-07 WeChat-3.2.1.154 3.2.1.154deepin8
+- 2021-04-23 WeChat-3.2.1.154
+- 2021-04-19 WeChat-3.2.1.151
+- 2021-04-18 WeChat-3.2.1.141
+- 2021-04-02 WeChat-3.2.1.127
+- 2021-01-29 WeChat-3.1.0.72
</details>
<details>
<summary>2020</summary>
-* 2020-12-29 WeChat-3.1.0.41
-* 2020-11-26 WeChat-3.0.0.57 2.9.5.41deepin7
-* 2020-10-16 WeChat-3.0.0.57
-* 2020-07-20 WeChat-2.9.5.56
-* 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
-* 2020-03-08 WeChat-2.8.0.133
-* 2020-02-10 WeChat-2.8.0.121
-* 2020-01-20 WeChat-2.8.0.116
-* 2020-01-10 WeChat-2.8.0.112
-* 2020-01-04 WeChat-2.8.0.106
+- 2020-12-29 WeChat-3.1.0.41
+- 2020-11-26 WeChat-3.0.0.57 2.9.5.41deepin7
+- 2020-10-16 WeChat-3.0.0.57
+- 2020-07-20 WeChat-2.9.5.56
+- 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
+- 2020-03-08 WeChat-2.8.0.133
+- 2020-02-10 WeChat-2.8.0.121
+- 2020-01-20 WeChat-2.8.0.116
+- 2020-01-10 WeChat-2.8.0.112
+- 2020-01-04 WeChat-2.8.0.106
</details>
<details>
<summary>2019</summary>
-* 2019-11-07 WeChat-2.7.1.88
-* 2019-10-23 WeChat-2.7.1.85
-* 2019-10-19 WeChat-2.7.1.82
-* 2019-07-25 WeChat-2.6.8.65
-* 2019-06-02 WeChat-2.6.8.52
-* 2019-05-29 WeChat-2.6.8.51
-* 2019-04-03 WeChat-2.6.7.57
-* 2019-01-03 WeChat-2.6.2
+- 2019-11-07 WeChat-2.7.1.88
+- 2019-10-23 WeChat-2.7.1.85
+- 2019-10-19 WeChat-2.7.1.82
+- 2019-07-25 WeChat-2.6.8.65
+- 2019-06-02 WeChat-2.6.8.52
+- 2019-05-29 WeChat-2.6.8.51
+- 2019-04-03 WeChat-2.6.7.57
+- 2019-01-03 WeChat-2.6.2
</details>
diff --git a/gen.sh b/gen.sh
index 7fa9309db8c7..93de289c39be 100755
--- a/gen.sh
+++ b/gen.sh
@@ -3,45 +3,38 @@
PACKAGE_NAME="deepin-wine-wechat"
PACKAGE_SUFFIX=(".pkg.tar.xz" ".pkg.tar.zst")
-GenPatch()
-{
- diff -ruN reg_tmp/ reg_tmp_fixed/ > reg.patch
+GenPatch() {
+ diff -ruN reg_tmp/ reg_tmp_fixed/ >reg.patch
}
-Extract()
-{
- rm -rf reg_tmp_fixed && \
- mkdir reg_tmp_fixed && \
- tar xvjf reg_files.tar.bz2 -C reg_tmp_fixed
+Extract() {
+ rm -rf reg_tmp_fixed &&
+ mkdir reg_tmp_fixed &&
+ tar xvjf reg_files.tar.bz2 -C reg_tmp_fixed
}
-GenSrcInfo()
-{
- makepkg --printsrcinfo > .SRCINFO
+GenSrcInfo() {
+ makepkg --printsrcinfo >.SRCINFO
}
-Clean()
-{
+Clean() {
git clean -xfd
}
-Tar()
-{
- cd reg_tmp && \
- tar -cvjSf reg_files.tar.bz2 * && \
- mv reg_files.tar.bz2 ../ && \
- cd ../
+Tar() {
+ cd reg_tmp &&
+ tar -cvjSf reg_files.tar.bz2 * &&
+ mv reg_files.tar.bz2 ../ &&
+ cd ../
}
-Md5()
-{
+MD5() {
for i in "${PACKAGE_SUFFIX[@]}"; do
find . -type f -name "${PACKAGE_NAME}*$i" -execdir sh -c 'md5sum "$1" > "$1.md5"' _ {} \;
done
}
-HelpApp()
-{
+HelpApp() {
echo " Extra Commands:"
echo " -p/--patch Generate patch files between reg_tmp/ and reg_tmp_fixed/"
echo " -e/--extract Extract reg files from reg_files.tar.bz2 to dir reg_tmp_fixed/"
@@ -58,31 +51,31 @@ if [ -z $1 ]; then
exit 0
fi
case $1 in
- "-p" | "--patch")
- GenPatch
+"-p" | "--patch")
+ GenPatch
;;
- "-e" | "--extract")
- Extract
+"-e" | "--extract")
+ Extract
;;
- "-g" | "--gen")
- GenSrcInfo
+"-g" | "--gen")
+ GenSrcInfo
;;
- "-c" | "--clean")
- Clean
+"-c" | "--clean")
+ Clean
;;
- "-t" | "--tar")
- Tar
+"-t" | "--tar")
+ Tar
;;
- "-m" | "--md5")
- Md5
+"-m" | "--md5")
+ MD5
;;
- "-h" | "--help")
- HelpApp
+"-h" | "--help")
+ HelpApp
;;
- *)
- echo -e "\033[31mgen: unrecognized option '$1' \033[0m"
- echo "Use -h|--help to get help"
- exit 1
+*)
+ echo -e "\033[31mgen: unrecognized option '$1' \033[0m"
+ echo "Use -h|--help to get help"
+ exit 1
;;
esac
exit 0
diff --git a/run.sh b/run.sh
index f9ffc145ec09..8bc55d6b64e8 100755
--- a/run.sh
+++ b/run.sh
@@ -7,13 +7,11 @@
# Vufa <countstarlight@gmail.com>
-version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-
BOTTLENAME="Deepin-WeChat"
APPVER="3.4.0.38deepin6"
WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME"
WECHAT_FONTS="$WINEPREFIX/drive_c/windows/Fonts"
-WECHAT_VER="3.8.0.41"
+WECHAT_VER="3.8.1.26"
EXEC_PATH="c:/Program Files/Tencent/WeChat/WeChat.exe"
EXEC_FILE="$WINEPREFIX/drive_c/Program Files/Tencent/WeChat/WeChat.exe"
START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"