diff options
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | README.md | 54 | ||||
-rw-r--r-- | deepin-wine-qq.install | 2 | ||||
-rwxr-xr-x | run.sh | 8 |
5 files changed, 44 insertions, 41 deletions
@@ -1,6 +1,6 @@ pkgbase = deepin-wine-qq pkgdesc = Tencent QQ (com.qq.im) on Deepin Wine For Archlinux - pkgver = 9.4.0.27525 + pkgver = 9.4.1.27572 pkgrel = 1 url = http://im.qq.com/ install = deepin-wine-qq.install @@ -20,13 +20,13 @@ pkgbase = deepin-wine-qq depends = lib32-gnutls conflicts = deepin-qq-im conflicts = deepin.com.qq.im - source = https://ftp.sjtu.edu.cn/deepin/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_9.1.8deepin0_i386.deb - source = PCQQ2020-9.4.0.27525.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe + source = https://mirrors.njupt.edu.cn/deepin/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_9.1.8deepin0_i386.deb + source = PCQQ2020-9.4.1.27572.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe source = run.sh source = reg.patch md5sums = d35bd4abfd1ac4c5e71c7fbc5282ccbd - md5sums = dfad1e7605c1fec9ce51dbbbc1f7f1eb - md5sums = 4c94025ae6183d855433fb4a68e483c1 + md5sums = 554b662419788aa893b5e342426f8548 + md5sums = 026bed7d6008f8125d6628ef8e9249a6 md5sums = 62d7de16a69fd99bca881f801187ba13 pkgname = deepin-wine-qq @@ -1,9 +1,10 @@ # Maintainer: Codist <countstarlight@gmail.com> pkgname=deepin-wine-qq -pkgver=9.4.0.27525 +pkgver=9.4.1.27572 qq_installer=PCQQ2020 deepinqqver=9.1.8deepin0 +debpkgname="deepin.com.qq.im" pkgrel=1 pkgdesc="Tencent QQ (com.qq.im) on Deepin Wine For Archlinux" arch=("x86_64") @@ -12,14 +13,14 @@ license=('custom') 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=('deepin-qq-im' 'deepin.com.qq.im') install="deepin-wine-qq.install" -_mirror="https://ftp.sjtu.edu.cn/deepin" -source=("$_mirror/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_${deepinqqver}_i386.deb" +_mirror="https://mirrors.njupt.edu.cn" +source=("$_mirror/deepin/pool/non-free/d/${debpkgname}/${debpkgname}_${deepinqqver}_i386.deb" "${qq_installer}-${pkgver}.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/${qq_installer}.exe" "run.sh" "reg.patch") md5sums=('d35bd4abfd1ac4c5e71c7fbc5282ccbd' - 'dfad1e7605c1fec9ce51dbbbc1f7f1eb' - '4c94025ae6183d855433fb4a68e483c1' + '554b662419788aa893b5e342426f8548' + '026bed7d6008f8125d6628ef8e9249a6' '62d7de16a69fd99bca881f801187ba13') build() { diff --git a/README.md b/README.md index 4a86e2894fd1..24edbd70d597 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ </a> </p> -Deepin 打包的 QQ 容器移植到 Archlinux,不依赖 `deepin-wine`,包含定制的注册表配置,QQ 安装包替换为官方最新 +Deepin 打包的 QQ 容器移植到 Archlinux,不依赖 `deepin-wine5`,包含定制的注册表配置,QQ 安装包替换为官方最新 <!-- TOC --> @@ -108,28 +108,29 @@ md5sum -c *.md5 ## 兼容性记录 | QQ | wine | 兼容性 | 备注 | deepin-wine | 兼容性 | 备注 | -| :---------: | :----: | :--------: | :----------------: | :---------: | :----: | :--: | -| 9.4.0.27525 | 5.21 | **不支持** | | 2.18_24-3 | 支持 | | -| 9.3.9.27427 | 5.19 | 支持 | | 2.18_24-3 | 支持 | | -| 9.3.8.27381 | 5.17 | **不支持** | 无法启动 | 2.18_24-3 | 支持 | | -| 9.3.7.27301 | 5.15 | 支持 | | 2.18_24-3 | 支持 | | -| 9.3.6.27263 | 5.12 | 支持 | | 2.18_22-3 | 支持 | | -| 9.3.5.27030 | 5.10 | 支持 | | 2.18_22-3 | 支持 | | -| 9.3.3.27011 | 5.9 | 支持 | | 2.18_22-3 | 支持 | | -| 9.3.3.27009 | 5.8 | 支持 | | 2.18_22-3 | 支持 | | -| 9.3.2.26869 | 5.8 | 支持 | | 2.18_22-3 | 支持 | | -| 9.1.8.26211 | 4.20-1 | 支持 | | | | | -| 9.1.8.26211 | 4.18-1 | 部分 | 不能使用中文输入法 | | | | -| 9.1.8.26211 | 4.17-1 | 部分 | 不能使用中文输入法 | | | | -| 9.1.8.26211 | 4.16-1 | 支持 | | | | | - -## 切换到 `deepin-wine` +| :---------: | :----: | :--------: | :----------------: | :----------: | :----: | :--: | +| 9.4.1.27572 | 5.22 | **不支持** | | 5.0.16-1 | 支持 | | +| 9.4.0.27525 | 5.21 | **不支持** | | 2.18_24-3 | 支持 | | +| 9.3.9.27427 | 5.19 | 支持 | | 2.18_24-3 | 支持 | | +| 9.3.8.27381 | 5.17 | **不支持** | 无法启动 | 2.18_24-3 | 支持 | | +| 9.3.7.27301 | 5.15 | 支持 | | 2.18_24-3 | 支持 | | +| 9.3.6.27263 | 5.12 | 支持 | | 2.18_22-3 | 支持 | | +| 9.3.5.27030 | 5.10 | 支持 | | 2.18_22-3 | 支持 | | +| 9.3.3.27011 | 5.9 | 支持 | | 2.18_22-3 | 支持 | | +| 9.3.3.27009 | 5.8 | 支持 | | 2.18_22-3 | 支持 | | +| 9.3.2.26869 | 5.8 | 支持 | | 2.18_22-3 | 支持 | | +| 9.1.8.26211 | 4.20-1 | 支持 | | | | | +| 9.1.8.26211 | 4.18-1 | 部分 | 不能使用中文输入法 | | | | +| 9.1.8.26211 | 4.17-1 | 部分 | 不能使用中文输入法 | | | | +| 9.1.8.26211 | 4.16-1 | 支持 | | | | | + +## 切换到 `deepin-wine5` > 根据 [deepin-wine-wechat-arch#15](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/15#issuecomment-515455845),[deepin-wine-wechat-arch#27](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/27),由 [@feileb](https://github.com/feileb), [@violetbobo](https://github.com/violetbobo), [@HE7086](https://github.com/HE7086)提供的方法 -原版 `wine` 在 [DDE(Deepin Desktop Environment)](https://www.deepin.org/dde/) 上,有托盘图标无法响应鼠标事件([deepin-wine-tim-arch#21](https://github.com/countstarlight/deepin-wine-tim-arch/issues/21))的问题,且原版 `wine` 尚不能实现保存登录密码等功能,可以选择切换到 `deepin-wine`。 +原版 `wine` 在 [DDE(Deepin Desktop Environment)](https://www.deepin.org/dde/) 上,有托盘图标无法响应鼠标事件([deepin-wine-tim-arch#21](https://github.com/countstarlight/deepin-wine-tim-arch/issues/21))的问题,且原版 `wine` 尚不能实现保存登录密码等功能,可以选择切换到 `deepin-wine5`。 -**注意:切换前先确保 `deepin-wine` 支持** +**注意:切换前先确保 `deepin-wine5` 支持** ### 自动切换(推荐) @@ -148,15 +149,15 @@ rm ~/.deepinwine/Deepin-QQ/deepin 如果要卸载自动安装的依赖: ```bash -sudo pacman -Rns deepin-wine xsettingsd lib32-freetype2-infinality-ultimate +sudo pacman -Rns deepin-wine5 xsettingsd lib32-freetype2-infinality-ultimate ``` ### 手动切换 -#### 1. 安装 `deepin-wine` +#### 1. 安装 `deepin-wine5` ```bash -yay -S deepin-wine +yay -S deepin-wine5 ``` #### 2. 对于非 GNOME 桌面(KDE, XFCE等) @@ -173,7 +174,7 @@ sudo pacman -S xsettingsd ```diff -WINE_CMD="wine" -+WINE_CMD="deepin-wine" ++WINE_CMD="deepin-wine5" RunApp() { @@ -194,7 +195,7 @@ sudo pacman -S xsettingsd rm -rf ~/.deepinwine/Deepin-QQ ``` -#### 4. 修复 `deepin-wine` 字体渲染发虚 +#### 4. 修复 `deepin-wine5` 字体渲染发虚 kde桌面参考:[deepin-wine-wechat-arch#36](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/36) @@ -204,7 +205,7 @@ deepin 桌面: yay -S lib32-freetype2-infinality-ultimate ``` -**注意:切换到 `deepin-wine` 后,对 `wine` 的修改,如更改dpi,都改为对 `deepin-wine` 的修改** +**注意:切换到 `deepin-wine5` 后,对 `wine` 的修改,如更改dpi,都改为对 `deepin-wine5` 的修改** ## 常见问题及解决 @@ -229,7 +230,7 @@ env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" winecfg 对于 `deepin-wine` : ```bash -env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine winecfg +env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine5 winecfg ``` ### GNOME 桌面上的悬浮窗口问题 @@ -257,6 +258,7 @@ env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine winecfg <details open> <summary>2020</summary> +* 2020-12-24 QQ-9.4.1.27572 * 2020-11-12 QQ-9.4.0.27525 * 2020-10-18 QQ-9.3.9.27427 * 2020-09-13 QQ-9.3.8.27381 diff --git a/deepin-wine-qq.install b/deepin-wine-qq.install index 874341f452f4..7670a7cb4e2b 100644 --- a/deepin-wine-qq.install +++ b/deepin-wine-qq.install @@ -2,7 +2,7 @@ info() { echo -e "\033[0;34m============================提示/INFO===============================" echo -e "* 反馈问题(Report issue):" echo -e " https://github.com/countstarlight/deepin-wine-qq-arch/issues" - echo -e "* 切换到 'deepin-wine'(Switch to 'deepin-wine'):" + echo -e "* 切换到 'deepin-wine5'(Switch to 'deepin-wine5'):" echo -e " https://github.com/countstarlight/deepin-wine-qq-arch" echo -e "* 安装包下载(Installation package download):" echo -e " https://github.com/countstarlight/deepin-wine-qq-arch/releases" @@ -10,7 +10,7 @@ WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" APPDIR="/opt/deepinwine/apps/Deepin-QQ" APPVER="9.1.8deepin0" QQ_INSTALLER="PCQQ2020" -QQ_VER="9.4.0.27525" +QQ_VER="9.4.1.27572" APPTAR="files.7z" PACKAGENAME="com.qq.im" WINE_CMD="wine" @@ -20,7 +20,7 @@ HelpApp() echo " Extra Commands:" echo " -r/--reset Reset app to fix errors" echo " -e/--remove Remove deployed app files" - echo " -d/--deepin Switch to 'deepin-wine'" + echo " -d/--deepin Switch to 'deepin-wine5'" echo " -h/--help Show program help info" } CallApp() @@ -104,7 +104,7 @@ msg() SwitchToDeepinWine() { PACKAGE_MANAGER="yay" - DEEPIN_WINE_DEPENDS="deepin-wine" + DEEPIN_WINE_DEPENDS="deepin-wine5" if ! [ -x "$(command -v yay)" ]; then if ! [ -x "$(command -v yaourt)" ]; then msg 1 "Need to install 'yay' or 'yaourt' first." >&2 @@ -135,7 +135,7 @@ SwitchToDeepinWine() # Init if [ -f "$WINEPREFIX/deepin" ]; then - WINE_CMD="deepin-wine" + WINE_CMD="deepin-wine5" if [[ -z "$(ps -e | grep -o gsd-xsettings)" ]] && [[ -z "$(ps -e | grep -o xsettingsd)" ]]; then if [[ ! -f "$HOME/.xsettingsd" ]] && [[ ! -f "$HOME/.config/xsettingsd/xsettingsd.conf" ]] && [[ ! -f "/etc/xsettingsd/xsettingsd.conf" ]]; then mkdir -p "$HOME/.config/xsettingsd" && touch "$HOME/.config/xsettingsd/xsettingsd.conf" |