aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCountStarlight2019-03-24 10:14:01 +0800
committerCountStarlight2019-03-24 10:14:01 +0800
commit17fe66c371d21f23ee2bdf4fc0ae3bcde7b8da6c (patch)
treef7ba60ed92968079ab33a3bf8d49f9b68ce9c332
parent9be7dce16f208cd7beb02bf17178c34ea6dea60c (diff)
downloadaur-17fe66c371d21f23ee2bdf4fc0ae3bcde7b8da6c.tar.gz
Clean up reg files and add fonts document.
Signed-off-by: CountStarlight <countstarlight@gmail.com>
-rw-r--r--.SRCINFO3
-rw-r--r--.travis.yml1
-rw-r--r--PKGBUILD4
-rw-r--r--README.md26
-rw-r--r--msyh.pngbin0 -> 52792 bytes
-rw-r--r--msyhb.pngbin0 -> 52116 bytes
-rw-r--r--reg_files.tar.bz2bin188925 -> 162996 bytes
-rw-r--r--simsun.pngbin0 -> 47382 bytes
-rwxr-xr-xtar.sh2
9 files changed, 27 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6237b0ff8699..76f44d26a6e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,6 @@ pkgbase = deepin-wine-qq
depends = wine-mono
depends = wine_gecko
depends = xorg-xwininfo
- depends = xdotool
depends = wqy-microhei
depends = adobe-source-han-sans-cn-fonts
depends = adobe-source-han-serif-cn-fonts
@@ -31,7 +30,7 @@ pkgbase = deepin-wine-qq
md5sums = 5135313eb131feeb6fef613ba02804cf
md5sums = e9f796f0b854381fbad5ab6fc31d8f4b
md5sums = 2622a458c78108f79007bbf4d5e85a52
- md5sums = 37af24493f4cbf092ff9bc88958fbf2b
+ md5sums = 02a7bfa7e06adbaa51cc14102f3f6204
md5sums = a66646b473a3fbad243ac1afd64da07a
pkgname = deepin-wine-qq
diff --git a/.travis.yml b/.travis.yml
index e72ca227fcdf..bd0d6e6f4159 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ arch:
- wine-mono
- wine_gecko
- xorg-xwininfo
- - xdotool
- wqy-microhei
- adobe-source-han-sans-cn-fonts
- adobe-source-han-serif-cn-fonts
diff --git a/PKGBUILD b/PKGBUILD
index 68bf97e8612c..3fe6d29e6f1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="Tencent QQ (com.qq.im) on Deepin Wine For Archlinux"
arch=("x86_64")
url="http://im.qq.com/"
license=('custom')
-depends=('p7zip' 'wine' 'wine-mono' 'wine_gecko' 'xorg-xwininfo' 'xdotool' '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' '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')
conflicts=('deepin-qq-im' 'deepin.com.qq.im')
install="deepin-wine-qq.install"
_mirror="https://mirrors.ustc.edu.cn/deepin"
@@ -22,7 +22,7 @@ source=("$_mirror/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_${deepinqqve
md5sums=('5135313eb131feeb6fef613ba02804cf'
'e9f796f0b854381fbad5ab6fc31d8f4b'
'2622a458c78108f79007bbf4d5e85a52'
- '37af24493f4cbf092ff9bc88958fbf2b'
+ '02a7bfa7e06adbaa51cc14102f3f6204'
'a66646b473a3fbad243ac1afd64da07a')
build() {
diff --git a/README.md b/README.md
index dce52566223b..56e103fa60a0 100644
--- a/README.md
+++ b/README.md
@@ -45,13 +45,31 @@ yay deepin-wine-qq
* 安装完可直接启动,以后启动时无需安装
-* **前几次运行时可能会提示 "qq安全组件异常",尝试重启系统**
+* **前几次运行时可能会提示 "qq安全组件异常",等一会再运行或重启一下系统**
-* 微软雅黑用思源黑体(`adobe-source-han-sans-cn-fonts`)替代,
+## 字体
- 宋体用思源宋体(`adobe-source-han-serif-cn-fonts`)替代,
+默认使用文泉驿微米黑(`wqy-microhei`)字体,目前有字体虚化、模糊问题,可以使用Windows平台常用字体,直接将字体文件或字体链接文件放置到字体文件夹就会生效,不会影响系统字体
- 其余中文字体用文泉驿微米黑(`wqy-microhei`)
+字体文件夹在:`$HOME/.deepinwine/Deepin-QQ/drive_c/windows/Fonts`
+
+Windows 10自带字体及版本:<https://docs.microsoft.com/en-us/typography/fonts/windows_10_font_list>
+
+* 中易宋体(SimSun):`simsun.ttf` 或 `simsun.ttc`,图为SimSun, Regular:
+
+ ![simsun](simsun.png)
+
+* 微软雅黑(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`
## 常见问题
* 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)
diff --git a/msyh.png b/msyh.png
new file mode 100644
index 000000000000..2981d7319f46
--- /dev/null
+++ b/msyh.png
Binary files differ
diff --git a/msyhb.png b/msyhb.png
new file mode 100644
index 000000000000..2e001afff794
--- /dev/null
+++ b/msyhb.png
Binary files differ
diff --git a/reg_files.tar.bz2 b/reg_files.tar.bz2
index c913f9cc3a6e..2bc4fbec9d02 100644
--- a/reg_files.tar.bz2
+++ b/reg_files.tar.bz2
Binary files differ
diff --git a/simsun.png b/simsun.png
new file mode 100644
index 000000000000..3365cc493adb
--- /dev/null
+++ b/simsun.png
Binary files differ
diff --git a/tar.sh b/tar.sh
index 3146b939c59c..389eb18d460b 100755
--- a/tar.sh
+++ b/tar.sh
@@ -4,3 +4,5 @@ cd reg_tmp && \
tar -cvjSf reg_files.tar.bz2 * && \
mv reg_files.tar.bz2 ../ && \
cd ../
+
+md5sum reg_files.tar.bz2