aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCountStarlight2019-03-25 13:31:36 +0800
committerCountStarlight2019-03-25 13:31:36 +0800
commit82225bffd13d53ccae2cc94c36437da03c4f209e (patch)
tree67be940f65f171dcd4d4d2259d19933721311b0a
parent17fe66c371d21f23ee2bdf4fc0ae3bcde7b8da6c (diff)
downloadaur-82225bffd13d53ccae2cc94c36437da03c4f209e.tar.gz
Reg files base on latest offical package.
Signed-off-by: CountStarlight <countstarlight@gmail.com>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--README.md55
-rw-r--r--msyh.pngbin52792 -> 59228 bytes
-rw-r--r--msyhb.pngbin52116 -> 58721 bytes
-rw-r--r--reg_files.tar.bz2bin162996 -> 166729 bytes
-rw-r--r--simsun.pngbin47382 -> 51338 bytes
-rwxr-xr-xtar.sh12
8 files changed, 48 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 76f44d26a6e0..b10ad2cbf625 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = deepin-wine-qq
pkgdesc = Tencent QQ (com.qq.im) on Deepin Wine For Archlinux
pkgver = 9.1.0.24712
- pkgrel = 5
+ pkgrel = 6
url = http://im.qq.com/
install = deepin-wine-qq.install
arch = x86_64
@@ -30,7 +30,7 @@ pkgbase = deepin-wine-qq
md5sums = 5135313eb131feeb6fef613ba02804cf
md5sums = e9f796f0b854381fbad5ab6fc31d8f4b
md5sums = 2622a458c78108f79007bbf4d5e85a52
- md5sums = 02a7bfa7e06adbaa51cc14102f3f6204
+ md5sums = 4ca277470d368834dc3e2f1b6ea1b766
md5sums = a66646b473a3fbad243ac1afd64da07a
pkgname = deepin-wine-qq
diff --git a/PKGBUILD b/PKGBUILD
index 3fe6d29e6f1d..7d3a782d5abc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=deepin-wine-qq
pkgver=9.1.0.24712
deepinqqver=8.9.19983deepin23
-pkgrel=5
+pkgrel=6
pkgdesc="Tencent QQ (com.qq.im) on Deepin Wine For Archlinux"
arch=("x86_64")
url="http://im.qq.com/"
@@ -22,7 +22,7 @@ source=("$_mirror/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_${deepinqqve
md5sums=('5135313eb131feeb6fef613ba02804cf'
'e9f796f0b854381fbad5ab6fc31d8f4b'
'2622a458c78108f79007bbf4d5e85a52'
- '02a7bfa7e06adbaa51cc14102f3f6204'
+ '4ca277470d368834dc3e2f1b6ea1b766'
'a66646b473a3fbad243ac1afd64da07a')
build() {
diff --git a/README.md b/README.md
index 56e103fa60a0..800796245599 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,23 @@
-# 在Archlinux及衍生发行版上运行QQ
+在Archlinux及衍生发行版上运行QQ
+========
Deepin打包的QQ容器移植到Archlinux,包含定制的注册表配置,QQ安装包替换为官方最新
构建状态: [![travis-ci](https://travis-ci.org/countstarlight/deepin-wine-qq-arch.svg?branch=master)](https://travis-ci.org/countstarlight/deepin-wine-qq-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)
+- [安装](#安装)
+- [字体](#字体)
+- [常见问题](#常见问题)
+- [感谢](#感谢)
+- [更新日志](#更新日志)
## 安装
-* 1.已添加到AUR [deepin-wine-qq](https://aur.archlinux.org/packages/deepin-wine-qq/),可使用 `yay/yaourt` 安装:
+* 1.已添加到AUR [deepin-wine-qq](https://aur.archlinux.org/packages/deepin-wine-qq/),可使用 `yay` 或 `yaourt` 安装:
```shell
yay -S deepin-wine-qq
```
-如果添加了archlinuxcn源,这会直接从源里安装,源相比AUR仓库有一定的延迟,或选择从AUR仓库安装:
+如果添加了archlinuxcn源,这会直接从源里安装,源相对AUR仓库有一定的延迟,要从AUR仓库安装:
```shell
yay deepin-wine-qq
@@ -41,15 +33,17 @@ yay deepin-wine-qq
makepkg -si
```
-* 运行开始菜单中创建的QQ,点击立即安装
+* 运行开始菜单中创建的QQ快捷方式,开始安装QQ
-* 安装完可直接启动,以后启动时无需安装
+* 安装完可直接启动
* **前几次运行时可能会提示 "qq安全组件异常",等一会再运行或重启一下系统**
## 字体
-默认使用文泉驿微米黑(`wqy-microhei`)字体,目前有字体虚化、模糊问题,可以使用Windows平台常用字体,直接将字体文件或字体链接文件放置到字体文件夹就会生效,不会影响系统字体
+### 使用其他字体
+
+默认使用文泉驿微米黑(`wqy-microhei`)字体,目前有字体虚化、模糊问题,可以使用Windows平台常用字体替代,直接将字体文件或字体链接文件放置到字体文件夹就会生效,不会影响系统字体
字体文件夹在:`$HOME/.deepinwine/Deepin-QQ/drive_c/windows/Fonts`
@@ -70,9 +64,26 @@ Windows 10自带字体及版本:<https://docs.microsoft.com/en-us/typography/f
* (繁体)细明体(MingLiU):`mingliu.ttf` 或 `mingliu.ttc`
* (繁体)新细明体(PMingLiU):`pmingliu.ttf` 或 `pmingliu.ttc`
+
+### 修复字体模糊
+
+参见:[deepin-wine-tim-arch#修复字体模糊](https://github.com/countstarlight/deepin-wine-tim-arch#%E4%BF%AE%E5%A4%8D%E5%AD%97%E4%BD%93%E6%A8%A1%E7%B3%8A)
## 常见问题
-* 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)
## 更新日志
diff --git a/msyh.png b/msyh.png
index 2981d7319f46..8d9110f5afe7 100644
--- a/msyh.png
+++ b/msyh.png
Binary files differ
diff --git a/msyhb.png b/msyhb.png
index 2e001afff794..b1be716aad4f 100644
--- a/msyhb.png
+++ b/msyhb.png
Binary files differ
diff --git a/reg_files.tar.bz2 b/reg_files.tar.bz2
index 2bc4fbec9d02..fcfe19df59ed 100644
--- a/reg_files.tar.bz2
+++ b/reg_files.tar.bz2
Binary files differ
diff --git a/simsun.png b/simsun.png
index 3365cc493adb..dd2af634aed0 100644
--- a/simsun.png
+++ b/simsun.png
Binary files differ
diff --git a/tar.sh b/tar.sh
index 389eb18d460b..d282d2322fae 100755
--- a/tar.sh
+++ b/tar.sh
@@ -1,8 +1,18 @@
#!/bin/sh
+pre_reg_md5=`md5sum reg_files.tar.bz2|cut -d ' ' -f1`
+
cd reg_tmp && \
tar -cvjSf reg_files.tar.bz2 * && \
mv reg_files.tar.bz2 ../ && \
cd ../
-md5sum reg_files.tar.bz2
+new_reg_md5=`md5sum reg_files.tar.bz2|cut -d ' ' -f1`
+
+if [ "$pre_reg_md5" = "$new_reg_md5" ];
+then
+ echo -e "\033[33mReg files have not changed\033[0m"
+else
+ sed -i "s#$pre_reg_md5#$new_reg_md5#" PKGBUILD
+ echo Done
+fi