优化字体显示

3 files changed, 70 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d3bb5cfd1b3..5cd63cd5f227 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,12 +12,12 @@ pkgbase = com.qq.tim.dcs
 	depends = p7zip
 	depends = xdg-utils
 	depends = hicolor-icon-theme
+	depends = noto-fonts-cjk
 	optdepends = ttf-ms-fonts: Microsoft Core fonts
-	optdepends = noto-fonts-cjk: Google Noto CJK fonts
 	source = http://dcstore.shenmo.tech/store/chat/com.qq.tim.dcs/com.qq.tim.dcs_3.1.0.21789_i386.deb
 	source = reg.patch
 	sha512sums = 84de5249869940898324977c7312f1ad61567748fb4a6b5a513da64b1308fbad98bcb6af7a87a9c39a9284d97b96a9f3901abcb9d296b0ef778df051792ccdfe
-	sha512sums = 8d5f49ec2867e91fac30a2af417520a0d9502fa29195136b2fd03d734d23b1db33a704363be1311a7457ed2988f1389495016548d57cd4643a7abda582292032
+	sha512sums = 5730066dc9bf3689e3db1c08ba83b516efc0bcc7fe6ff47198b43dd352718a6942d01190da87fe010816bf1e9e0e453a09fd15314e4004c309e7f52725b32528
 
 pkgname = com.qq.tim.dcs
 
diff --git a/PKGBUILD b/PKGBUILD
index 819be1469835..07d4115e25b6 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,11 +8,10 @@ arch=('i686' 'x86_64')
 url="http://tim.qq.com/"
 license=('unknown')
 groups=()
-depends=('deepin-wine5' 'p7zip' 'xdg-utils' 'hicolor-icon-theme')
+depends=('deepin-wine5' 'p7zip' 'xdg-utils' 'hicolor-icon-theme' 'noto-fonts-cjk')
 makedepends=('tar')
 checkdepends=()
-optdepends=('ttf-ms-fonts: Microsoft Core fonts'
-			'noto-fonts-cjk: Google Noto CJK fonts')
+optdepends=('ttf-ms-fonts: Microsoft Core fonts')
 provides=()
 #conflicts=('deepin-wine-tim')
 replaces=()
@@ -23,7 +22,7 @@ changelog=
 source=("http://dcstore.shenmo.tech/store/chat/${pkgname}/${pkgname}_${pkgver}_i386.deb"
     "reg.patch")
 sha512sums=('84de5249869940898324977c7312f1ad61567748fb4a6b5a513da64b1308fbad98bcb6af7a87a9c39a9284d97b96a9f3901abcb9d296b0ef778df051792ccdfe'
-    '8d5f49ec2867e91fac30a2af417520a0d9502fa29195136b2fd03d734d23b1db33a704363be1311a7457ed2988f1389495016548d57cd4643a7abda582292032')
+    '5730066dc9bf3689e3db1c08ba83b516efc0bcc7fe6ff47198b43dd352718a6942d01190da87fe010816bf1e9e0e453a09fd15314e4004c309e7f52725b32528')
 validpgpkeys=()
 
 build() {
@@ -40,10 +39,10 @@ build() {
 
 
 package() {
-  cd ${pkgdir}
-  tar xpvf ${srcdir}/data.tar.xz --xattrs-include='*' --numeric-owner
-  install -m644 "${srcdir}/files.7z" "${pkgdir}/opt/apps/com.qq.tim.dcs/files"
-  msg "Preparing icons ..."
-  install -d usr/share
-  mv opt/apps/${pkgname}/entries/* usr/share
+	cd ${pkgdir}
+	tar xpvf ${srcdir}/data.tar.xz --xattrs-include='*' --numeric-owner
+    install -m644 "${srcdir}/files.7z" "${pkgdir}/opt/apps/com.qq.tim.dcs/files"
+    msg "Preparing icons ..."
+	install -d usr/share
+	mv opt/apps/${pkgname}/entries/* usr/share
 }
diff --git a/reg.patch b/reg.patch
index 7f1445663d2c..2630a2562a57 100644
--- a/reg.patch
+++ b/reg.patch
@@ -1,11 +1,61 @@
 diff --color -ruN reg_tmp/user.reg reg_tmp_fixed/user.reg
 --- reg_tmp/user.reg	2020-09-01 11:44:36.513202681 +0800
-+++ reg_tmp_fixed/user.reg	2020-09-01 11:45:49.973202202 +0800
-@@ -1748,6 +1748,7 @@
- "SimHei"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
- "SimKai"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
- "SimSun"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
-+"STXihei"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
- "\x4eff\x5b8b"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
- "\x4eff\x5b8b_GB2312"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
- "\x5b8b\x4f53"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
++++ reg_tmp_fixed/user.reg	2020-09-03 12:47:45.205390078 +0800
+@@ -1729,35 +1729,36 @@
+ "Arial"="MS Sans Serif"
+ "Arial Unicode MS"="Noto Sans CJK SC Regular"
+ "Batang"="UnBatang"
+-"DFKai-SB"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
++"DFKai-SB"="Noto Sans CJK SC Regular"
+ "Dotum"="UnDotum"
+-"FangSong"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
++"FangSong"="Noto Sans CJK SC Regular"
+ "Gulim"="UnDotum"
+-"KaiTi"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
++"KaiTi"="Noto Sans CJK SC Regular"
+ "Lucida Console"="MS Sans Serif"
+-"Microsoft JhengHei"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"Microsoft YaHei"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"MingLiU"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
++"Microsoft JhengHei"="Noto Sans CJK SC Regular"
++"Microsoft YaHei"="Noto Sans CJK SC Regular"
++"MingLiU"="Noto Sans CJK SC Regular"
+ "MS Gothic"="Ume Gothic"
+ "MS Mincho"="Ume Mincho"
+ "MS PGothic"="Ume P Gothic"
+ "MS PMincho"="Ume P Mincho"
+ "MS UI Gothic"="Ume UI Gothic"
+-"NSimSun"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"PMingLiU"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"SimHei"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"SimKai"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"SimSun"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"\x4eff\x5b8b"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"\x4eff\x5b8b_GB2312"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"\x5b8b\x4f53"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"\x5fae\x8f6f\x96c5\x9ed1"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"\x65b0\x5b8b\x4f53"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"\x65b0\x7d30\x660e\x9ad4"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"\x6977\x4f53"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"\x6977\x4f53_GB2312"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"\x96b6\x4e66"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
+-"\x9ed1\x4f53"=str(7):"Source Han Sans SC Regular\0Noto Sans CJK SC Regular\0WenQuanYi Micro Hei\0"
++"NSimSun"="Noto Sans CJK SC Regular"
++"PMingLiU"="Noto Sans CJK SC Regular"
++"SimHei"="Noto Sans CJK SC Regular"
++"SimKai"="Noto Sans CJK SC Regular"
++"SimSun"="Noto Sans CJK SC Medium"
++"STXihei"="Noto Sans CJK SC Regular"
++"\x4eff\x5b8b"="Noto Sans CJK SC Regular"
++"\x4eff\x5b8b_GB2312"="Noto Sans CJK SC Regular"
++"\x5b8b\x4f53"="Noto Sans CJK SC Regular"
++"\x5fae\x8f6f\x96c5\x9ed1"="Noto Sans CJK SC Regular"
++"\x65b0\x5b8b\x4f53"="Noto Sans CJK SC Regular"
++"\x65b0\x7d30\x660e\x9ad4"="Noto Sans CJK SC Regular"
++"\x6977\x4f53"="Noto Sans CJK SC Regular"
++"\x6977\x4f53_GB2312"="Noto Sans CJK SC Regular"
++"\x96b6\x4e66"="Noto Sans CJK SC Regular"
++"\x9ed1\x4f53"="Noto Sans CJK SC Regular"
+ "\xff2d\xff33\xff30\x30b4\x30b7\x30c3\x30af"="Ume P Gothic"
+ 
+ [Software\\Wine\\MenuFiles] 1486371076