diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | README.md | 57 | ||||
| -rw-r--r-- | deepin-wine-tim.install | 6 | ||||
| -rwxr-xr-x | run.sh | 4 |
5 files changed, 42 insertions, 35 deletions
@@ -7,7 +7,7 @@ pkgbase = deepin-wine-tim arch = x86_64 license = custom depends = p7zip - depends = deepin-wine6-stable + depends = deepin-wine5 depends = deepin-wine-helper depends = xorg-xwininfo depends = wqy-microhei @@ -26,7 +26,7 @@ pkgbase = deepin-wine-tim source = share.7z md5sums = 5fdc20e614d945bd2ba5251420872479 md5sums = 57aa69085e451c147a6af8866f4b37b8 - md5sums = 01f1121b3cbfeb71ce87f8f272ecd650 + md5sums = 78cec653bc342c0f80972233e5479180 md5sums = 479ae2a04a9c5dcc08c67c7b1395a944 pkgname = deepin-wine-tim @@ -10,17 +10,17 @@ pkgdesc="Tencent TIM on Deepin Wine5(${timpkgname}) For Archlinux" arch=("x86_64") url="https://tim.qq.com/" license=('custom') -depends=('p7zip' 'deepin-wine6-stable' 'deepin-wine-helper' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-gnutls') +depends=('p7zip' 'deepin-wine5' 'deepin-wine-helper' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-gnutls') conflicts=('wine-tim' 'deepin.com.qq.office' 'deepin-tim-for-arch') install="deepin-wine-tim.install" -_mirror="https://cdn-package-store6.deepin.com" +_mirror="https://com-store-packages.uniontech.com" source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${debpkgver}_i386.deb" "https://dldir1.qq.com/qqfile/qq/PCTIM/TIM3.3.8/TIM${pkgver}.exe" "run.sh" "share.7z") md5sums=('5fdc20e614d945bd2ba5251420872479' '57aa69085e451c147a6af8866f4b37b8' - '01f1121b3cbfeb71ce87f8f272ecd650' + '78cec653bc342c0f80972233e5479180' '479ae2a04a9c5dcc08c67c7b1395a944') build() { diff --git a/README.md b/README.md index 5faafe7baa9c..d54a9cba3d47 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ ======== <p align="center"> - <a href="https://github.com/countstarlight/deepin-wine-tim-arch/actions"> - <img src="https://img.shields.io/github/workflow/status/countstarlight/deepin-wine-tim-arch/CI/action?logo=github&style=flat-square" alt="Build Status"> + <a href="https://github.com/vufa/deepin-wine-tim-arch/actions"> + <img src="https://img.shields.io/github/workflow/status/vufa/deepin-wine-tim-arch/CI/action?logo=github&style=flat-square" alt="Build Status"> </a> <a href="https://office.qq.com/download.html"> <img src="https://img.shields.io/badge/TIM-3.3.8.22043-blue?style=flat-square" alt="TIM Version"> @@ -11,17 +11,17 @@ <a href="https://aur.archlinux.org/packages/deepin-wine-tim/"> <img src="https://img.shields.io/aur/version/deepin-wine-tim?label=AUR&logo=arch-linux&style=flat-square" alt="AUR Version"> </a> - <a href="https://github.com/countstarlight/deepin-wine-tim-arch/releases"> - <img src="https://img.shields.io/github/downloads/countstarlight/deepin-wine-tim-arch/total?logo=github&style=flat-square" alt="GitHub Release"> + <a href="https://github.com/vufa/deepin-wine-tim-arch/releases"> + <img src="https://img.shields.io/github/downloads/vufa/deepin-wine-tim-arch/total?logo=github&style=flat-square" alt="GitHub Release"> </a> - <a href="https://github.com/countstarlight/deepin-wine-tim-arch/issues"> - <img src="https://img.shields.io/github/issues/countstarlight/deepin-wine-tim-arch?logo=github&style=flat-square" alt="GitHub Issues"> + <a href="https://github.com/vufa/deepin-wine-tim-arch/issues"> + <img src="https://img.shields.io/github/issues/vufa/deepin-wine-tim-arch?logo=github&style=flat-square" alt="GitHub Issues"> </a> </p> 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-迁移) +:warning: `deepin-wine-tim` 从 `v3.3.8.22043-2` 开始，默认使用AUR仓库 [deepin-wine5](https://aur.archlinux.org/packages/deepin-wine5/)，不再依赖 `wine`，可以进行一些清理操作来保持系统整洁，具体参照： [从 `wine`/`deepin-wine 2.x` 迁移](#从-winedeepin-wine-2x-迁移) <!-- TOC --> @@ -33,7 +33,7 @@ Deepin 打包的 QQ 容器(`com.qq.im.deepin`)移植到 Archlinux，QQ 环境修 - [兼容性记录](#兼容性记录) - [切换到 `deepin-wine`](#切换到-deepin-wine) - [自动切换(推荐)](#自动切换推荐) - - [从 `wine`/`deepin-wine 2.x`/`deepin-wine5` 迁移](#从-winedeepin-wine-2xdeepin-wine5-迁移) + - [从 `wine`/`deepin-wine 2.x` 迁移](#从-winedeepin-wine-2x-迁移) - [卸载](#卸载) - [常见问题及解决](#常见问题及解决) - [不能记住密码](#不能记住密码) @@ -41,7 +41,7 @@ Deepin 打包的 QQ 容器(`com.qq.im.deepin`)移植到 Archlinux，QQ 环境修 - [高分辨率屏幕支持](#高分辨率屏幕支持) - [GNOME 桌面上的悬浮窗口问题](#gnome-桌面上的悬浮窗口问题) - [不能启动/卡死/卡顿问题](#不能启动卡死卡顿问题) - - [使用其他字体](#使用其他字体) + - [字体发虚/使用其他字体](#字体发虚使用其他字体) - [感谢](#感谢) - [更新日志](#更新日志) @@ -78,9 +78,9 @@ yay -S deepin-wine-tim ### 用安装包安装 -> 由 [GitHub Action](https://github.com/countstarlight/deepin-wine-tim-arch/actions) 在 Docker 容器 [countstarlight/makepkg](https://hub.docker.com/r/countstarlight/makepkg) 中自动构建的 ArchLinux 安装包 +> 由 [GitHub Action](https://github.com/vufa/deepin-wine-tim-arch/actions) 在 Docker 容器 [countstarlight/makepkg](https://hub.docker.com/r/countstarlight/makepkg) 中自动构建的 ArchLinux 安装包 -在 [GitHub Release](https://github.com/countstarlight/deepin-wine-tim-arch/releases) 页面下载后缀为 `.pkg.tar.xz` 或 `.pkg.tar.zst` 的安装包，使用`pacman`安装： +在 [GitHub Release](https://github.com/vufa/deepin-wine-tim-arch/releases) 页面下载后缀为 `.pkg.tar.xz` 或 `.pkg.tar.zst` 的安装包，使用`pacman`安装： ```bash sudo pacman -U #下载的包名 @@ -95,7 +95,7 @@ md5sum -c *.md5 ### 本地打包安装 ```shell - git clone https://github.com/countstarlight/deepin-wine-tim-arch.git + git clone https://github.com/vufa/deepin-wine-tim-arch.git cd deepin-wine-tim-arch @@ -133,23 +133,28 @@ dpi，目录映射等可以在 `winecfg` 进行设置，打开 `winecfg` 的命 ## 切换到 `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)。 +:warning: `deepin-wine-tim` 从 `v3.3.8.22043-2` 开始，默认使用AUR仓库 [deepin-wine5](https://aur.archlinux.org/packages/deepin-wine5/)，无需再进行任何切换操作，对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 ### 自动切换(推荐) -对于之前的版本，可以查看[旧版README](https://github.com/countstarlight/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 +对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 -### 从 `wine`/`deepin-wine 2.x`/`deepin-wine5` 迁移 +### 从 `wine`/`deepin-wine 2.x` 迁移 -更新到 `deepin-wine-tim v3.3.8.22043-1` 及之后的版本后，依赖变更为 `deepin-wine6-stable`， +更新到 `deepin-wine-tim v3.3.8.22043-2` 及之后的版本后，依赖变更为 `deepin-wine5`， -如果此时没有其他应用在使用 `wine` 和旧版 `deepin-wine`，就可以放心的卸载旧版 `wine`, `deepin-wine` 及其依赖： +如果此时没有其他应用在使用 `wine`, `deepin-wine 2.x` 和 `deepin-wine6-stable`，就可以放心的卸载 `wine`, `deepin-wine 2.x` 和 `deepin-wine6-stable` 及其依赖： ```bash +# 卸载 deepin-wine 2.x (如果有) 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 及其依赖(如果有) +sudo pacman -Rns deepin-wine xsettingsd # 卸载 deepin-wine 2.x + +# 卸载 deepin-wine6-stable (如果有) +sudo pacman -Rns deepin-wine6-stable + +# 卸载 wine (如果有) +sudo pacman -Rns wine wine-mono wine-gecko ``` 同时，`deepin-wine-helper` 改为使用AUR仓库[deepin-wine-helper](https://aur.archlinux.org/packages/deepin-wine-helper)，可以删除之前的 `deepin-wine-helper`： @@ -174,11 +179,11 @@ TIM在本地保存的数据不会被删除，如保存在用户文档下的数 ### 不能记住密码 -对于之前的版本，可以查看[旧版README](https://github.com/countstarlight/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 +对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 ### 网络连接状态改变后不能重连 -对于之前的版本，可以查看[旧版README](https://github.com/countstarlight/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 +对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。 ### 高分辨率屏幕支持 @@ -186,24 +191,26 @@ TIM在本地保存的数据不会被删除，如保存在用户文档下的数 ### GNOME 桌面上的悬浮窗口问题 -> 根据 [deepin-wine-tim-arch#2](https://github.com/countstarlight/deepin-wine-tim-arch/issues/2)，由[EricDracula](https://github.com/EricDracula)提供的方法 +> 根据 [deepin-wine-tim-arch#2](https://github.com/vufa/deepin-wine-tim-arch/issues/2)，由[EricDracula](https://github.com/EricDracula)提供的方法 安装 GNOME 插件: [TopIcons Plus](https://extensions.gnome.org/extension/1031/topicons/) ### 不能启动/卡死/卡顿问题 -> 参照 [deepin-wine-qq-arch#19](https://github.com/countstarlight/deepin-wine-qq-arch/issues/19) +> 参照 [deepin-wine-qq-arch#19](https://github.com/vufa/deepin-wine-qq-arch/issues/19) 用原版 `dwrite.dll` 替换 `$HOME/.deepinwine/Deepin-TIM/drive_c/windows/system32/dwrite.dll` 再参照[设置](#设置)打开 `winecfg`，在 `Libraries` 中新增一项 `dwrite`，将新增的 `dwrite` 设置为原装先于内建(Native then Builtin)。 -### 使用其他字体 +### 字体发虚/使用其他字体 默认使用文泉驿微米黑(`wqy-microhei`)字体，可以使用Windows平台常用字体替代，直接将字体文件或字体链接文件放置到字体文件夹就会生效，不会影响系统字体 字体文件夹在：`$HOME/.deepinwine/Deepin-TIM/drive_c/windows/Fonts` +经测试将 `微软雅黑` 伪装成 `宋体(simsun)` 的显示效果最好，具体可以参照 [bbs.deepin.org](https://bbs.deepin.org/zh/post/213530?offset=0&postId=1269543)，将 `fake_simsun.ttc` 放到字体文件夹 + ## 感谢 * [Wuhan Deepin Technology Co.,Ltd.](http://www.deepin.org/) diff --git a/deepin-wine-tim.install b/deepin-wine-tim.install index 955fd240d660..9732b478ee64 100644 --- a/deepin-wine-tim.install +++ b/deepin-wine-tim.install @@ -1,11 +1,11 @@ info() { echo -e "\033[0;34m============================提示/INFO===============================" echo -e "* 反馈问题(Report issue):" - echo -e " https://github.com/countstarlight/deepin-wine-tim-arch/issues" + echo -e " https://github.com/vufa/deepin-wine-tim-arch/issues" echo -e "* 切换到 'deepin-wine5'(Switch to 'deepin-wine5'):" - echo -e " https://github.com/countstarlight/deepin-wine-tim-arch" + echo -e " https://github.com/vufa/deepin-wine-tim-arch" echo -e "* 安装包下载(Installation package download):" - echo -e " https://github.com/countstarlight/deepin-wine-tim-arch/releases" + echo -e " https://github.com/vufa/deepin-wine-tim-arch/releases" echo -e "====================================================================\033[0m" } post_install() { @@ -5,7 +5,7 @@ # Author: Li LongYu <lilongyu@linuxdeepin.com> # Peng Hao <penghao@linuxdeepin.com> -# Codist <countstarlight@gmail.com> +# Vufa <countstarlight@gmail.com> version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } @@ -18,7 +18,7 @@ START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" TIM_INSTALLER_PATH="c:/Program Files/Tencent/TIM$TIM_VER.exe" export MIME_TYPE="" export DEB_PACKAGE_NAME="com.qq.office.deepin" -export APPRUN_CMD="deepin-wine6-stable" +export APPRUN_CMD="deepin-wine5" DISABLE_ATTACH_FILE_DIALOG="" export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH` |