依赖变动deepin-wine -> deepin-wine5

[zx900930]

run.sh有三处要改动

#!/bin/sh

#   Copyright (C) 2016 Deepin, Inc.
#
#   Author:     Li LongYu <lilongyu@linuxdeepin.com>
#               Peng Hao <penghao@linuxdeepin.com>

#               Codist <countstarlight@gmail.com>
WINEPREFIX="$HOME/.deepinwine/Deepin-QQ"
APPDIR="/opt/deepinwine/apps/Deepin-QQ"
APPVER="9.1.8deepin0"
QQ_INSTALLER="PCQQ2020"
QQ_VER="9.4.0.27525"
APPTAR="files.7z"
PACKAGENAME="com.qq.im"
WINE_CMD="deepin-wine5"

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 " -h/--help      Show program help info"
}
CallApp()
{
    if [ ! -f $WINEPREFIX/reinstalled ]
    then
        touch $WINEPREFIX/reinstalled
        env WINEPREFIX=$WINEPREFIX $WINE_CMD $APPDIR/$QQ_INSTALLER-$QQ_VER.exe &
    else
        #Support use native file dialog
        export ATTACH_FILE_DIALOG=1

        env WINEPREFIX="$WINEPREFIX" $WINE_CMD "c:\\Program Files\\Tencent\\QQ\\Bin\\QQ.exe" &
    fi
}
ExtractApp()
{
    mkdir -p "$1"
    7z x "$APPDIR/$APPTAR" -o"$1"
    mv "$1/drive_c/users/@current_user@" "$1/drive_c/users/$USER"
    sed -i "s#@current_user@#$USER#" $1/*.reg
    #sed -i "s/deepin-wine/wine/" $1/drive_c/deepin/EnvInit.sh
}
DeployApp()
{
    ExtractApp "$WINEPREFIX"
    echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
}
RemoveApp()
{
    rm -rf "$WINEPREFIX"
}
ResetApp()
{
    echo "Reset $PACKAGENAME....."
    read -p "*  Are you sure?(Y/N)" ANSWER
    if [ "$ANSWER" = "Y" -o "$ANSWER" = "y" -o -z "$ANSWER" ]; then
        EvacuateApp
        DeployApp
        CallApp
    fi
}
UpdateApp()
{
    if [ -f "$WINEPREFIX/PACKAGE_VERSION" ] && [ "$(cat "$WINEPREFIX/PACKAGE_VERSION")" = "$APPVER" ]; then
        return
    fi
    if [ -d "${WINEPREFIX}.tmpdir" ]; then
        rm -rf "${WINEPREFIX}.tmpdir"
    fi
    ExtractApp "${WINEPREFIX}.tmpdir"
    /opt/deepinwine/tools/updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
    rm -rf "${WINEPREFIX}.tmpdir"
    echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
}
RunApp()
{
    if [[ -z "$(ps -e | grep -o xsettingsd)" ]]
    then
        /usr/bin/xsettingsd &
    fi
    if [ -d "$WINEPREFIX" ]; then
        UpdateApp
    else
        DeployApp
    fi
    CallApp $1
}

CreateBottle()
{
    if [ -d "$WINEPREFIX" ]; then
        UpdateApp
    else
        DeployApp
    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-wine5"
    if ! [ -x "$(command -v yay)" ]; then
        if ! [ -x "$(command -v yaourt)" ]; then
            msg 1 "Need to install 'yay' or 'yaourt' first." >&2
            exit 1
        else
            $PACKAGE_MANAGER="yaourt"
        fi
    fi
    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
    msg 0 "Reversing the patch ..."
    patch -p1 -R -d  ${WINEPREFIX} < $APPDIR/reg.patch
    msg 0 "Creating flag file '$WINEPREFIX/deepin' ..."
    touch -f $WINEPREFIX/deepin
    msg 0 "Done."
}

# Init
if [ -f "$WINEPREFIX/deepin" ]; then
    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"
        fi
        /usr/bin/xsettingsd &
    fi
fi

if [ -z $1 ]; then
    RunApp
    exit 0
fi
case $1 in
    "-r" | "--reset")
        ResetApp
        ;;
    "-c" | "--create")
        CreateBottle
        ;;
    "-e" | "--remove")
        RemoveApp
        ;;
    "-d" | "--deepin")
        SwitchToDeepinWine
        ;;
    "-u" | "--uri")
        RunApp $2
        ;;
    "-h" | "--help")
        HelpApp
        ;;
    *)
        echo "Invalid option: $1"
        echo "Use -h|--help to get help"
        exit 1
        ;;
esac
exit 0

改完以后还得重新运行run.sh -d切换版本

改完以后可以重新登录

可能可以解决下面这个问题 https://github.com/countstarlight/deepin-wine-qq-arch/issues/23

[DavidPisces]

确实，改了以后就能在deepin-wine5上运行了

[taotieren]

已修复 https://github.com/countstarlight/deepin-wine-qq-arch/pull/31

[vufa]

已更新：https://github.com/countstarlight/deepin-wine-qq-arch/commit/011ada8d48c55b4f5e50abadfb42c52d42dedde4