修复昵称方框问题

3 files changed, 37 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b1308722cae1..5d3bb5cfd1b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,9 @@ pkgbase = com.qq.tim.dcs
 	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
 
 pkgname = com.qq.tim.dcs
 
diff --git a/PKGBUILD b/PKGBUILD
index 6b15b9934042..819be1469835 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Rand01ph <tanyawei1991@gmail.com>
+# Maintainer: 9r0k <tanyawei1991@gmail.com>
 pkgname=com.qq.tim.dcs
 pkgver=3.1.0.21789
 pkgrel=1
@@ -20,13 +20,30 @@ backup=()
 options=()
 install=tim.install
 changelog=
-source=("http://dcstore.shenmo.tech/store/chat/${pkgname}/${pkgname}_${pkgver}_i386.deb")
-sha512sums=('84de5249869940898324977c7312f1ad61567748fb4a6b5a513da64b1308fbad98bcb6af7a87a9c39a9284d97b96a9f3901abcb9d296b0ef778df051792ccdfe')
+source=("http://dcstore.shenmo.tech/store/chat/${pkgname}/${pkgname}_${pkgver}_i386.deb"
+    "reg.patch")
+sha512sums=('84de5249869940898324977c7312f1ad61567748fb4a6b5a513da64b1308fbad98bcb6af7a87a9c39a9284d97b96a9f3901abcb9d296b0ef778df051792ccdfe'
+    '8d5f49ec2867e91fac30a2af417520a0d9502fa29195136b2fd03d734d23b1db33a704363be1311a7457ed2988f1389495016548d57cd4643a7abda582292032')
 validpgpkeys=()
 
+build() {
+  msg "Extracting DPKG package ..."
+  mkdir -p "${srcdir}/dpkgdir"
+  tar -xvf data.tar.xz -C "${srcdir}/dpkgdir"
+  msg "Extracting Deepin Wine TIM archive ..."
+  7z x -aoa "${srcdir}/dpkgdir/opt/apps/com.qq.tim.dcs/files/files.7z" -o"${srcdir}/deepintimdir"
+  msg "Patching reg files ..."
+  patch -p1 -d "${srcdir}/deepintimdir/" < "${srcdir}/reg.patch"
+  msg "Repackaging app archive ..."
+  7z a -t7z -r "${srcdir}/files.7z" "${srcdir}/deepintimdir/*"
+}
+
+
 package() {
-	cd ${pkgdir}
-	tar xpvf ${srcdir}/data.tar.xz --xattrs-include='*' --numeric-owner
-	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
new file mode 100644
index 000000000000..7f1445663d2c
--- /dev/null
+++ b/reg.patch
@@ -0,0 +1,11 @@
+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"