diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | README.md | 24 | ||||
| -rwxr-xr-x | run.sh | 29 |
4 files changed, 41 insertions, 26 deletions
@@ -1,6 +1,6 @@ pkgbase = deepin-wine-qq pkgdesc = Tencent QQ (com.qq.im) on Deepin Wine For Archlinux - pkgver = 9.3.5.27030 + pkgver = 9.3.6.27263 pkgrel = 1 url = http://im.qq.com/ install = deepin-wine-qq.install @@ -21,12 +21,12 @@ pkgbase = deepin-wine-qq conflicts = deepin-qq-im conflicts = deepin.com.qq.im source = https://mirrors.ustc.edu.cn/deepin/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_9.1.8deepin0_i386.deb - source = PCQQ2020-9.3.5.27030.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe + source = PCQQ2020-9.3.6.27263.exe::https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/PCQQ2020.exe source = run.sh source = reg.patch md5sums = d35bd4abfd1ac4c5e71c7fbc5282ccbd - md5sums = a936531d3ff7bf4765a22d228d44655a - md5sums = f0a133a0d588c9d926e36ecc68185941 + md5sums = b3f3654f709f85fb26bf8f879920cfc0 + md5sums = da18a31ea048426f3edbdaa39bea6e0c md5sums = 4b131fb1e7cf8fdf695876032842b39d pkgname = deepin-wine-qq @@ -1,7 +1,7 @@ # Maintainer: Codist <countstarlight@gmail.com> pkgname=deepin-wine-qq -pkgver=9.3.5.27030 +pkgver=9.3.6.27263 qq_installer=PCQQ2020 deepinqqver=9.1.8deepin0 pkgrel=1 @@ -18,8 +18,8 @@ source=("$_mirror/pool/non-free/d/deepin.com.qq.im/deepin.com.qq.im_${deepinqqve "run.sh" "reg.patch") md5sums=('d35bd4abfd1ac4c5e71c7fbc5282ccbd' - 'a936531d3ff7bf4765a22d228d44655a' - 'f0a133a0d588c9d926e36ecc68185941' + 'b3f3654f709f85fb26bf8f879920cfc0' + 'da18a31ea048426f3edbdaa39bea6e0c' '4b131fb1e7cf8fdf695876032842b39d') build() { diff --git a/README.md b/README.md index 66aec3871bb4..3715f07a92e6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ <img src="https://travis-ci.org/countstarlight/deepin-wine-qq-arch.svg?branch=master" alt="Build Status"> </a> <a href="https://im.qq.com/download/"> - <img src="https://img.shields.io/badge/QQ-9.3.5.27030-blue.svg" alt="QQ Version"> + <img src="https://img.shields.io/badge/QQ-9.3.6.27263-blue.svg" alt="QQ Version"> </a> <a href="https://aur.archlinux.org/packages/deepin-wine-qq/"> <img src="https://img.shields.io/aur/version/deepin-wine-qq.svg" alt="AUR Version"> @@ -97,16 +97,17 @@ sudo pacman -U #下载的包名 ## 兼容性记录 -| QQ版本 | wine版本 | 兼容性 | 备注 | deepin-wine版本 | 兼容性 | 备注 | -| :---------: | :------: | :----: | :----------------: | :-------------: | :----: | :--: | -| 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 | 支持 | | | | | +| QQ | wine | 兼容性 | 备注 | deepin-wine | 兼容性 | 备注 | +| :---------: | :----: | :----: | :----------------: | :---------: | :----: | :--: | +| 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` @@ -236,6 +237,7 @@ env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine winecfg ## 更新日志 +* 2020-07-19 QQ-9.3.6.27263 * 2020-06-19 QQ-9.3.5.27030 * 2020-06-05 QQ-9.3.3.27011 * 2020-05-22 QQ-9.3.3.27009 @@ -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.3.5.27030" +QQ_VER="9.3.6.27263" APPTAR="files.7z" PACKAGENAME="com.qq.im" WINE_CMD="wine" @@ -95,29 +95,42 @@ CreateBottle() fi } +msg() +{ + ECHO_LEVEL=("\033[1;32m==> " "\033[1;31m==> ERROR: ") + echo -e "${ECHO_LEVEL[$1]}\033[1;37m$2\033[0m" +} + SwitchToDeepinWine() { PACKAGE_MANAGER="yay" + DEEPIN_WINE_DEPENDS="deepin-wine" if ! [ -x "$(command -v yay)" ]; then if ! [ -x "$(command -v yaourt)" ]; then - echo "Error: Need to install 'yay' or 'yaourt' first." >&2 + msg 1 "Need to install 'yay' or 'yaourt' first." >&2 exit 1 else $PACKAGE_MANAGER="yaourt" fi fi - echo -e "\033[0;34mInstalling dependencies ...\033[0m" - $PACKAGE_MANAGER -S deepin-wine xsettingsd lib32-freetype2-infinality-ultimate --needed - echo -e "\033[0;34mRedeploying app ...\033[0m" + if [[ -z "$(ps -e | grep -o gsd-xsettings)" ]]; then + DEEPIN_WINE_DEPENDS="${DEEPIN_WINE_DEPENDS} xsettingsd" + fi + if [ "$XDG_CURRENT_DESKTOP" = "Deepin" ]; then + DEEPIN_WINE_DEPENDS="${DEEPIN_WINE_DEPENDS} lib32-freetype2-infinality-ultimate" + fi + msg 0 "Installing dependencies: ${DEEPIN_WINE_DEPENDS} ..." + $PACKAGE_MANAGER -S ${DEEPIN_WINE_DEPENDS} --needed + msg 0 "Redeploying app ..." if [ -d "$WINEPREFIX" ]; then RemoveApp fi DeployApp - echo -e "\033[0;34mReversing the patch ...\033[0m" + msg 0 "Reversing the patch ..." patch -p1 -R -d ${WINEPREFIX} < $APPDIR/reg.patch - echo -e "\033[0;34mCreating flag file '$WINEPREFIX/deepin' ...\033[0m" + msg 0 "Creating flag file '$WINEPREFIX/deepin' ..." touch -f $WINEPREFIX/deepin - echo -e "\033[0;34mDone.\033[0m" + msg 0 "Done." } # Init |