From bc6da41b2bbecd25ce5be9c965d49fa3b20a760f Mon Sep 17 00:00:00 2001 From: Codist Date: Sat, 19 Oct 2019 20:07:40 +0800 Subject: [PATCH] Upgrade WeChat to 2.7.1.82 Signed-off-by: Codist --- .SRCINFO | 4 +-- .travis.yml | 2 +- PKGBUILD | 4 +-- README.md | 89 ++++++++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 86 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 493bb21..85d808e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = deepin-wine-wechat pkgdesc = Tencent WeChat (com.wechat) on Deepin Wine For Archlinux - pkgver = 2.6.8.65 + pkgver = 2.7.1.82 pkgrel = 1 url = https://weixin.qq.com/ install = deepin-wine-wechat.install @@ -24,7 +24,7 @@ pkgbase = deepin-wine-wechat source = run.sh source = reg.patch md5sums = c66a173fe6817afd898e0061d9eaf42e - md5sums = 55704ea3ffe49ca189a0c1ade1e4d350 + md5sums = b41f7944b030d617d0b2e7128a149796 md5sums = 88abd550ffce483a3f9627d84e4d5e3a md5sums = 9c9d51ff585ff630473ce827159a8230 diff --git a/.travis.yml b/.travis.yml index d229052..58db726 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required services: - docker -arch: +archlinux: repos: - archlinuxfr=http://repo.archlinux.fr/$arch packages: diff --git a/PKGBUILD b/PKGBUILD index 2d0282c..88ea280 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: CountStarlight pkgname=deepin-wine-wechat -pkgver=2.6.8.65 +pkgver=2.7.1.82 wechat_installer=WeChatSetup deepinwechatver=2.6.2.31deepin0 pkgrel=1 @@ -18,7 +18,7 @@ source=("$_mirror/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_${deepinwe "run.sh" "reg.patch") md5sums=('c66a173fe6817afd898e0061d9eaf42e' - '55704ea3ffe49ca189a0c1ade1e4d350' + 'b41f7944b030d617d0b2e7128a149796' '88abd550ffce483a3f9627d84e4d5e3a' '9c9d51ff585ff630473ce827159a8230') diff --git a/README.md b/README.md index 0390d6a..9e41cc2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Build Status - WeChat Version + WeChat Version AUR Version @@ -24,9 +24,15 @@ Deepin打包的微信(WeChat)容器移植到Archlinux，不依赖`deepin-wine` - [安装](#安装) - - [从 AUR 安装](#从-aur-安装) - - [从 GitHub Release 安装](#从-github-release-安装) - - [从源码安装](#从源码安装) + - [从AUR安装](#从aur安装) + - [用安装包安装](#用安装包安装) + - [本地打包安装](#本地打包安装) +- [切换到 `deepin-wine`](#切换到-deepin-wine) + - [1. 安装 deepin-wine](#1-安装-deepin-wine) + - [2. 修改 `deepin-wine-wechat` 的启动文件](#2-修改-deepin-wine-wechat-的启动文件) + - [3. 如果是 GNOME 桌面](#3-如果是-gnome-桌面) + - [4. 删除原先的微信目录](#4-删除原先的微信目录) + - [5. 修复 `deepin-wine` 字体渲染发虚](#5-修复-deepin-wine-字体渲染发虚) - [常见问题](#常见问题) - [感谢](#感谢) - [更新日志](#更新日志) @@ -50,7 +56,7 @@ Deepin打包的微信(WeChat)容器移植到Archlinux，不依赖`deepin-wine` +Include = /etc/pacman.d/mirrorlist ``` -### 从 AUR 安装 +### 从AUR安装 已添加到AUR [deepin-wine-wechat](https://aur.archlinux.org/packages/deepin-wine-wechat/)，可使用 `yay` 或 `yaourt` 安装: @@ -58,7 +64,7 @@ Deepin打包的微信(WeChat)容器移植到Archlinux，不依赖`deepin-wine` yay -S deepin-wine-wechat ``` -### 从 GitHub Release 安装 +### 用安装包安装 > 由 [Travis CI](https://travis-ci.org/countstarlight/deepin-wine-wechat-arch) 在 Docker 容器 [mikkeloscar/arch-travis](https://hub.docker.com/r/mikkeloscar/arch-travis) 中自动构建的 ArchLinux 安装包 @@ -68,7 +74,7 @@ yay -S deepin-wine-wechat sudo pacman -U #下载的包名 ``` -### 从源码安装 +### 本地打包安装 ```shell git clone https://github.com/countstarlight/deepin-wine-wechat-arch.git @@ -79,12 +85,78 @@ sudo pacman -U #下载的包名 ``` * 运行应用菜单中创建的WeChat，开始安装 + + **注意：安装微信时不需要修改安装路径，如果修改默认路径，要对应修改 `deepin-wine-wechat` 的启动脚本：** + + `/opt/deepinwine/apps/Deepin-WeChat/run.sh` + + ```bash + env WINEPREFIX="$WINEPREFIX" WINEDEBUG=-msvcrt $WINE_CMD "c:\\Program Files\\Tencent\\WeChat\\WeChat.exe" & + ``` + + 改为修改后的安装路径，否则只有安装后第一次能够运行 + * 安装完可直接启动 +## 切换到 `deepin-wine` + +由于原版 `wine` 在 [DDE(Deepin Desktop Environment)](https://www.deepin.org/dde/) 上，存在托盘图标无法响应鼠标事件([deepin-wine-tim-arch#21](https://github.com/countstarlight/deepin-wine-tim-arch/issues/21))，边框穿透显示([deepin-wine-wechat-arch#15](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/15)), 无法截图等问题，且原版 `wine` 尚不能实现保存登录密码等功能，可以选择切换到 `deepin-wine`。 + +根据 [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)提供的方法： + +### 1. 安装 deepin-wine + +```bash +yay -S deepin-wine +``` + + +### 2. 修改 `deepin-wine-wechat` 的启动文件 + +修改如下两个文件中的 `WINE_CMD` 的值： + +`/opt/deepinwine/apps/Deepin-WeChat/run.sh` + +` /opt/deepinwine/tools/run.sh` + +```diff +-WINE_CMD="wine" ++WINE_CMD="deepin-wine" +``` + +### 3. 如果是 GNOME 桌面 + +需要安装 `gnome-settings-daemon` + +```bash +sudo pacman -Sy gnome-settings-daemon +``` +并在 `/opt/deepinwine/apps/Deepin-WeChat/run.sh` 文件开头插入一行 + +``` +/usr/lib/gsd-xsettings & +``` + +**注意：对 `/opt/deepinwine/apps/Deepin-WeChat/run.sh` 的修改会在 `deepin-wine-wechat` 更新或重装时被覆盖，可以单独拷贝一份作为启动脚本** + +### 4. 删除原先的微信目录 + +``` +rm -rf ~/.deepinwine/Deepin-WeChat +``` + +### 5. 修复 `deepin-wine` 字体渲染发虚 + +```bash +yay -S lib32-freetype2-infinality-ultimate +``` + +**注意：切换到 `deepin-wine` 后，对 `wine` 的修改，如更改dpi，都改为对 `deepin-wine` 的修改** + ## 常见问题 - [ ] 1.不能视频通话 -- [ ] 2.不能截图 +- [x] 2.不能截图(切换到 `deepin-wine` 后解决) - [x] 3.在 2k/4k 屏幕下字体和图标都非常小, 参见[issue1](https://github.com/countstarlight/deepin-wine-tim-arch/issues/1) - [x] 4.使用全局截图快捷键和解决Gnome上窗口化问题，参见[issue2](https://github.com/countstarlight/deepin-wine-tim-arch/issues/2) @@ -94,6 +166,7 @@ sudo pacman -U #下载的包名 ## 更新日志 +* 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