aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCountStarlight2019-04-03 23:04:27 +0800
committerCountStarlight2019-04-03 23:04:27 +0800
commit0422a81464f83f7e8b3b2a3aac7f48ac530bc979 (patch)
treea3bd04919b730a5763abc3727650ed6235648e4d
parentb3945c3b01c46e99e61df125558ce5ddc22777f4 (diff)
downloadaur-0422a81464f83f7e8b3b2a3aac7f48ac530bc979.tar.gz
Remove useless dependency packages and update README.md.
Signed-off-by: CountStarlight <countstarlight@gmail.com>
-rw-r--r--.SRCINFO2
-rw-r--r--.travis.yml2
-rw-r--r--PKGBUILD4
-rw-r--r--README.md97
-rw-r--r--msyh.pngbin24767 -> 24699 bytes
-rw-r--r--msyh_fixed.pngbin0 -> 28611 bytes
-rw-r--r--msyhb.pngbin0 -> 26427 bytes
-rw-r--r--simsun.pngbin20233 -> 17335 bytes
8 files changed, 73 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5d279e66b573..097d7a6b1a32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,8 +12,6 @@ pkgbase = deepin-wine-tim
depends = wine_gecko
depends = xorg-xwininfo
depends = wqy-microhei
- depends = adobe-source-han-sans-cn-fonts
- depends = adobe-source-han-serif-cn-fonts
depends = lib32-alsa-lib
depends = lib32-alsa-plugins
depends = lib32-libpulse
diff --git a/.travis.yml b/.travis.yml
index bd0d6e6f4159..7555762f7629 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,6 @@ arch:
- wine_gecko
- xorg-xwininfo
- wqy-microhei
- - adobe-source-han-sans-cn-fonts
- - adobe-source-han-serif-cn-fonts
- lib32-alsa-lib
- lib32-alsa-plugins
- lib32-libpulse
diff --git a/PKGBUILD b/PKGBUILD
index af08a21d645f..733cab965685 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="Tencent TIM (com.qq.office) on Deepin Wine For Archlinux"
arch=("x86_64")
url="http://tim.qq.com/"
license=('custom')
-depends=('p7zip' 'wine' 'wine-mono' 'wine_gecko' 'xorg-xwininfo' 'wqy-microhei' 'adobe-source-han-sans-cn-fonts' 'adobe-source-han-serif-cn-fonts' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-gnutls')
+depends=('p7zip' 'wine' 'wine-mono' 'wine_gecko' '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://mirrors.ustc.edu.cn/deepin"
@@ -41,8 +41,6 @@ build() {
cp update.policy "${srcdir}/deepintimdir/update.policy"
cp user.reg "${srcdir}/deepintimdir/user.reg"
ln -sf "/usr/share/fonts/wenquanyi/wqy-microhei/wqy-microhei.ttc" "${srcdir}/deepintimdir/drive_c/windows/Fonts/wqy-microhei.ttc"
- ln -sf "/usr/share/fonts/adobe-source-han-sans/SourceHanSansCN-Medium.otf" "${srcdir}/deepintimdir/drive_c/windows/Fonts/SourceHanSansCN-Medium.otf"
- ln -sf "/usr/share/fonts/adobe-source-han-serif/SourceHanSerifCN-Medium.otf" "${srcdir}/deepintimdir/drive_c/windows/Fonts/SourceHanSerifCN-Medium.otf"
msg "Repackaging app archive ..."
7z a -t7z -r "${srcdir}/files.7z" "${srcdir}/deepintimdir/*"
}
diff --git a/README.md b/README.md
index 840b70e1b273..e3a2562b9432 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,30 @@
-# 在Archlinux及衍生发行版上运行TIM
+在Archlinux及衍生发行版上运行TIM
+=======
+
+<p align="center">
+ <a href="https://travis-ci.org/countstarlight/deepin-wine-tim-arch">
+ <img src="https://travis-ci.org/countstarlight/deepin-wine-tim-arch.svg?branch=master" alt="Build Status">
+ </a>
+ <a href="https://office.qq.com/download.html">
+ <img src="https://img.shields.io/badge/TIM-2.3.2.21158-blue.svg" alt="TIM Version">
+ </a>
+ <a href="https://aur.archlinux.org/packages/deepin-wine-tim/">
+ <img src="https://img.shields.io/aur/version/deepin-wine-tim.svg" alt="AUR Version">
+ </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.svg" alt="GitHub Issues">
+ </a>
+</p>
Deepin打包的TIM容器移植到Archlinux,包含定制的注册表配置,TIM安装包替换为官方最新
-构建状态: [![travis-ci](https://travis-ci.org/countstarlight/deepin-wine-tim-arch.svg?branch=master)](https://travis-ci.org/countstarlight/deepin-wine-tim-arch)
-
-感谢:
-
-* [Wuhan Deepin Technology Co.,Ltd.](http://www.deepin.org/)
-
-* [@wszqkzqk](https://github.com/wszqkzqk) 的 [wszqkzqk-deepin-wine-tim-arch](https://github.com/wszqkzqk/wszqkzqk-deepin-wine-tim-arch)
-
-* [@ssfdust](https://github.com/ssfdust) 的 [wszqkzqk-deepin-wine-tim-arch](https://github.com/ssfdust/wszqkzqk-deepin-wine-tim-arch)
-
-存在如下问题:
-
-- [ ] 1.不能视频通话
-- [ ] 2.不能记住密码
-- [ ] 3.网络连接状态改变后不能重连: [issue19](https://github.com/countstarlight/deepin-wine-tim-arch/issues/19)
+- [安装](#安装)
+- [字体](#字体)
+ - [使用其他字体](#使用其他字体)
+ - [修复字体模糊](#修复字体模糊)
+- [常见问题](#常见问题)
+- [感谢](#感谢)
+- [更新日志](#更新日志)
## 安装
@@ -35,11 +43,17 @@ Deepin打包的TIM容器移植到Archlinux,包含定制的注册表配置,TI
+Include = /etc/pacman.d/mirrorlist
```
-* 1.已添加到AUR [deepin-wine-tim](https://aur.archlinux.org/packages/deepin-wine-tim/),可使用 `yay` 安装:
+* 1.已添加到AUR [deepin-wine-tim](https://aur.archlinux.org/packages/deepin-wine-tim/),可使用 `yay` 或 `yaourt` 安装:
```shell
yay -S deepin-wine-tim
```
+如果添加了archlinuxcn源,这会直接从源里安装,源相对AUR仓库有一定的延迟,要从AUR仓库安装:
+
+```shell
+yay deepin-wine-tim
+```
+
* 2.手动安装
```shell
@@ -50,27 +64,60 @@ yay -S deepin-wine-tim
makepkg -si
```
-* 运行开始菜单中创建的TIM,点击立即安装
-* 安装完可直接启动,以后启动时无需安装
+* 运行开始菜单中创建的TIM快捷方式,开始安装TIM
+
+* 安装完可直接启动
+
## 字体
-默认使用文泉驿微米黑(`wqy-microhei`)字体,目前有字体虚化、模糊问题,可以使用Windows平台常用字体,直接将字体文件或字体链接文件放置到字体文件夹就会生效
+### 使用其他字体
+
+默认使用文泉驿微米黑(`wqy-microhei`)字体,目前有字体虚化、模糊问题,可以使用Windows平台常用字体替代,直接将字体文件或字体链接文件放置到字体文件夹就会生效,不会影响系统字体
字体文件夹在:`$HOME/.deepinwine/Deepin-TIM/drive_c/windows/Fonts`
-* 中易宋体(SimSun):`simsun.ttf` 或 `simsun.ttc`:
+Windows 10自带字体及版本:<https://docs.microsoft.com/en-us/typography/fonts/windows_10_font_list>
+
+* 中易宋体(SimSun):`simsun.ttf` 或 `simsun.ttc`,图为SimSun, Regular:
![simsun](simsun.png)
-* 微软雅黑:`msyh.ttf`:
+* 微软雅黑(Microsoft YaHei):`msyh.ttf`或`msyh.ttc`,图为Microsoft YaHei, Regular:
![msyh](msyh.png)
+ Microsoft YaHei, Bold:
+
+ ![msyhb](msyhb.png)
+
* (繁体)细明体(MingLiU):`mingliu.ttf` 或 `mingliu.ttc`
+
* (繁体)新细明体(PMingLiU):`pmingliu.ttf` 或 `pmingliu.ttc`
+
+### 修复字体模糊
+
+上述微软雅黑字体仍然比较模糊,参照[@ohmyarch的博客](https://ohmyarch.github.io/2017/01/15/Linux%E4%B8%8B%E7%BB%88%E6%9E%81%E5%AD%97%E4%BD%93%E9%85%8D%E7%BD%AE%E6%96%B9%E6%A1%88/)配置后的微软雅黑效果较好:
+
+![msyh_fixed](msyh_fixed.png)
+
+**注意:这会修改整个系统的字体配置,且配置后的宋体(SimSun)等字体效果不如之前**
+
## 常见问题
-* 1.在 2k/4k 屏幕下字体和图标都非常小, 参见[issue1](https://github.com/countstarlight/deepin-wine-tim-arch/issues/1)
-* 2.使用全局截图快捷键和解决Gnome上窗口化问题,参见[issue2](https://github.com/countstarlight/deepin-wine-tim-arch/issues/2)
+
+- [ ] 1.不能视频通话
+- [ ] 2.不能记住密码
+- [ ] 3.网络连接状态改变后不能重连: [issue19](https://github.com/countstarlight/deepin-wine-tim-arch/issues/19)
+- [x] 4.在 2k/4k 屏幕下字体和图标都非常小, 参见[issue1](https://github.com/countstarlight/deepin-wine-tim-arch/issues/1)
+- [x] 5.使用全局截图快捷键和解决Gnome上窗口化问题,参见[issue2](https://github.com/countstarlight/deepin-wine-tim-arch/issues/2)
+
+## 感谢
+
+* [Wuhan Deepin Technology Co.,Ltd.](http://www.deepin.org/)
+
+* [@wszqkzqk](https://github.com/wszqkzqk) 的 [wszqkzqk-deepin-wine-tim-arch](https://github.com/wszqkzqk/wszqkzqk-deepin-wine-tim-arch)
+
+* [@ssfdust](https://github.com/ssfdust) 的 [wszqkzqk-deepin-wine-tim-arch](https://github.com/ssfdust/wszqkzqk-deepin-wine-tim-arch)
+
## 更新日志
* 2019-03-06 TIM-2.3.2.21158
@@ -78,4 +125,4 @@ yay -S deepin-wine-tim
* 2018-02-23 TIM-2.1.5
* 2017-12-23 TIM-2.1.0
* 2017-11-28 修复音频功能(麦克风录音和播放语音消息)
-* 2017-11-21 TIM-2.0.0 \ No newline at end of file
+* 2017-11-21 TIM-2.0.0
diff --git a/msyh.png b/msyh.png
index bc2656c07638..94c6544cb8b4 100644
--- a/msyh.png
+++ b/msyh.png
Binary files differ
diff --git a/msyh_fixed.png b/msyh_fixed.png
new file mode 100644
index 000000000000..8b548b1cbef2
--- /dev/null
+++ b/msyh_fixed.png
Binary files differ
diff --git a/msyhb.png b/msyhb.png
new file mode 100644
index 000000000000..59ed0848b3b2
--- /dev/null
+++ b/msyhb.png
Binary files differ
diff --git a/simsun.png b/simsun.png
index 7a05e4397c3a..0dea38b1fb64 100644
--- a/simsun.png
+++ b/simsun.png
Binary files differ