diff options
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 52 |
1 files changed, 19 insertions, 33 deletions
diff --git a/README.md b/README.md index 79d80518f622..285e8cf586c3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,9 @@ </a> </p> -Deepin 打包的 QQ 容器(`com.qq.im.deepin`)移植到 Archlinux,QQ 环境修改为 TIM,不依赖 `deepin-wine`,包含定制的运行脚本,TIM 安装包为官方最新 +Deepin 打包的 QQ 容器(`com.qq.im.deepin`)移植到 Archlinux,QQ 环境修改为 TIM,包含定制的运行脚本,TIM 安装包为官方最新 + +:warning: `deepin-wine-tim` 从 `v3.3.8.22043-1` 开始,默认使用AUR仓库 [deepin-wine6-stable](https://aur.archlinux.org/packages/deepin-wine6-stable/),不再依赖 `wine`,可以进行一些清理操作来保持系统整洁,具体参照: [从 `wine`/`deepin-wine 2.x`/`deepin-wine5` 迁移](#从-winedeepin-wine-2xdeepin-wine5-迁移) <!-- TOC --> @@ -31,7 +33,7 @@ Deepin 打包的 QQ 容器(`com.qq.im.deepin`)移植到 Archlinux,QQ 环境修 - [兼容性记录](#兼容性记录) - [切换到 `deepin-wine`](#切换到-deepin-wine) - [自动切换(推荐)](#自动切换推荐) - - [从 `deepin-wine 2.x` 迁移](#从-deepin-wine-2x-迁移) + - [从 `wine`/`deepin-wine 2.x`/`deepin-wine5` 迁移](#从-winedeepin-wine-2xdeepin-wine5-迁移) - [卸载](#卸载) - [常见问题及解决](#常见问题及解决) - [不能记住密码](#不能记住密码) @@ -46,7 +48,7 @@ Deepin 打包的 QQ 容器(`com.qq.im.deepin`)移植到 Archlinux,QQ 环境修 ## 安装 -`deepin-wine-tim` 依赖`Multilib`仓库中的 `wine`,`wine-gecko` 和 `wine-mono`,Archlinux 默认没有开启 `Multilib`仓库,需要编辑`/etc/pacman.conf`,取消对应行前面的注释([Archlinux wiki](https://wiki.archlinux.org/index.php/Official_repositories#multilib)): +`deepin-wine-tim` 依赖`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, @@ -130,45 +132,29 @@ dpi,目录映射等可以在 `winecfg` 进行设置,打开 `winecfg` 的命 ## 切换到 `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)提供的方法 - -`deepin-wine-tim` 默认使用官方仓库中的 `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))的问题,且原版 `wine` 尚不能实现保存登录密码等功能,可以选择切换到 `deepin-wine`。 - -:warning: **注意:切换前先确保 `deepin-wine` 支持** +:warning: `deepin-wine-tim` 从 `v3.3.8.22043-1` 开始,默认使用AUR仓库 [deepin-wine6-stable](https://aur.archlinux.org/packages/deepin-wine6-stable/),无需再进行任何切换操作,对于之前的版本,可以查看[旧版README](https://github.com/countstarlight/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 ### 自动切换(推荐) -```bash -/opt/apps/com.qq.office.deepin/files/run.sh -d -``` - -这会安装需要的依赖,移除已安装的 TIM 目录并回退对注册表文件的修改 +对于之前的版本,可以查看[旧版README](https://github.com/countstarlight/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 -> 从 `v3.3.0.22020-1` 开始,该命令会切换到 AUR 仓库:[deepin-wine5](https://aur.archlinux.org/packages/deepin-wine5) +### 从 `wine`/`deepin-wine 2.x`/`deepin-wine5` 迁移 +更新到 `deepin-wine-tim v3.3.8.22043-1` 及之后的版本后,依赖变更为 `deepin-wine6-stable`, -如果想切换回原版 `wine` 并卸载为 `deepin-wine` 自动安装的依赖: +如果此时没有其他应用在使用 `wine` 和旧版 `deepin-wine`,就可以放心的卸载旧版 `wine`, `deepin-wine` 及其依赖: ```bash -rm $HOME/.deepinwine/Deepin-TIM/deepin -sudo pacman -Rns deepin-wine5 -``` - -### 从 `deepin-wine 2.x` 迁移 - -若之前使用的是 `deepin-wine 2.x`,更新到 `deepin-wine-tim v3.3.0.22020-1` 及之后的版本会自动切换回 `wine`,运行命令: - -```bash -/opt/apps/com.qq.office.deepin/files/run.sh -d +sudo pacman -S lib32-freetype2 #用原版替换lib32-freetype2-infinality-ultimate +sudo pacman -Rns deepin-wine xsettingsd # 卸载 deepin-wine 2.x (如果有) +sudo pacman -Rns deepin-wine5 # 卸载 deepin-wine5 (如果有) +sudo pacman -Rns wine wine-mono wine-gecko # 卸载 wine 及其依赖(如果有) ``` -就会自动安装并切换到 `deepin-wine5` - -若此时没有其他应用在使用旧版 `deepin-wine`,就可以放心的卸载旧版 `deepin-wine` 及其依赖: +同时,`deepin-wine-helper` 改为使用AUR仓库[deepin-wine-helper](https://aur.archlinux.org/packages/deepin-wine-helper),可以删除之前的 `deepin-wine-helper`: ```bash -sudo pacman -S lib32-freetype2 #用原版替换lib32-freetype2-infinality-ultimate -sudo pacman -Rns deepin-wine xsettingsd +rm -rf $HOME/.deepinwine/deepin-wine-helper ``` ## 卸载 @@ -187,11 +173,11 @@ TIM在本地保存的数据不会被删除,如保存在用户文档下的数 ### 不能记住密码 -参照[切换到 `deepin-wine`](#切换到-deepin-wine) 解决 +对于之前的版本,可以查看[旧版README](https://github.com/countstarlight/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 ### 网络连接状态改变后不能重连 -参照[切换到 `deepin-wine`](#切换到-deepin-wine) 解决 +对于之前的版本,可以查看[旧版README](https://github.com/countstarlight/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 ### 高分辨率屏幕支持 @@ -257,4 +243,4 @@ TIM在本地保存的数据不会被删除,如保存在用户文档下的数 * 2017-11-28 修复音频功能(麦克风录音和播放语音消息) * 2017-11-21 TIM-2.0.0 -</details>
\ No newline at end of file +</details> |