支持识别deepin-wine6-vannila

InstallBox86-cn.sh

@@ -6,26 +6,43 @@ if [[ `whoami` != root ]]; then
     exit 1
 fi
 PCArch=`dpkg --print-architecture`
+if [[ $PCArch != "aarch64" ]] && [[ $PCArch != "arm64" ]]; then
+    echo 非 ARM 架构，无法继续
+    echo 按任意键退出
+    read
+    exit 1
+fi
+which box86
+if [[ $? == 0 ]]; then
+    echo 已安装，结束
+    echo 按回车键退出
+    read 
+    exit 1
+fi
 echo 使用国内源
 #sudo wget https://ryanfortner.github.io/box86-debs/box86.list -O /etc/apt/sources.list.d/box86.list
-#sudo bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/debian ./ > /etc/apt/sources.list.d/box86.list"
+sudo bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/debian ./ > /etc/apt/sources.list.d/box86.list"
-#wget -qO- http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg 
+wget -qO- http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg 
-#echo "adding key..."
+echo "adding key..."
-#installBox=box86-generic-arm
+installBox=box86-generic-arm
-#if [[ $PCArch == "arm64" ]]; then
+if [[ $PCArch == "arm64" ]]; then
-#    sudo bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs/debian ./ > /etc/apt/sources.list.d/box64.list"
+    sudo bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs/debian ./ > /etc/apt/sources.list.d/box64.list"
-#    wget -qO- http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg
+    wget -qO- http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg
-#    installBox="box86-generic-arm box64-generic-arm"
+    installBox="box86-generic-arm box64-generic-arm"
-#    sudo dpkg --add-architecture armhf
+    sudo dpkg --add-architecture armhf
-#fi
+fi
-wget http://deb.box86.wine-runner.gfdgdxi.top/sources/github.sh
-bash github.sh
-rm github.sh
 echo " + sudo apt update"
 sudo apt update
 sudo apt install binfmt-support -y
 sudo apt install libc6:armhf -y
-sudo apt install -y box86 
+echo apt 源添加完毕！按回车键继续安装 Box86/Box64，若想要停止安装，则请按 Ctrl+C 或按终端右上角 ×（叉叉）退出
-sudo apt install -y box64
+echo 按回车键后将会自动安装包名为 box86-generic-arm、box64-generic-arm（box64 要在 aarch64 系统才可安装）的 Box86/Box64 包（适用于通用 ARM 系统）
+echo 其他特殊版本及其包名可见如下链接（如适用于 rk3399 的版本）：
+echo "    - Box64：https://github.com/ryanfortner/box64-debs/"
+echo "    - Box86：https://github.com/ryanfortner/box86-debs/"
+echo "    - Box64（国内镜像）：http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs"
+echo "    - Box64（国内镜像）：http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs"
+read
+sudo apt install -y $installBox
 echo 安装完成！按回车键退出
 read

InstallBox86-own.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+if [[ `whoami` != root ]]; then
+    echo 请以 root 权限运行
+    echo 按任意键退出
+    read
+    exit 1
+fi
+PCArch=`dpkg --print-architecture`
+echo 使用国内源
+#sudo wget https://ryanfortner.github.io/box86-debs/box86.list -O /etc/apt/sources.list.d/box86.list
+#sudo bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/debian ./ > /etc/apt/sources.list.d/box86.list"
+#wget -qO- http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg 
+#echo "adding key..."
+#installBox=box86-generic-arm
+#if [[ $PCArch == "arm64" ]]; then
+#    sudo bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs/debian ./ > /etc/apt/sources.list.d/box64.list"
+#    wget -qO- http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg
+#    installBox="box86-generic-arm box64-generic-arm"
+#    sudo dpkg --add-architecture armhf
+#fi
+wget http://deb.box86.wine-runner.gfdgdxi.top/sources/github.sh
+bash github.sh
+rm github.sh
+echo " + sudo apt update"
+sudo apt update
+sudo apt install binfmt-support -y
+sudo apt install libc6:armhf -y
+sudo apt install -y box86 
+sudo apt install -y box64
+echo 安装完成！按回车键退出
+read

deepin-wine-easy-packager.py

@@ -646,7 +646,7 @@ if __name__ == "__main__":
         "使用 Deepin Wine2 打包应用"
     ]
     wineChooserIndex = 2
-    wineList = ["spark-wine8", "spark-wine7-devel", "deepin-wine6-stable", "deepin-wine5-stable", "deepin-wine5", "deepin-wine"]
+    wineList = ["spark-wine8", "spark-wine7-devel", "deepin-wine6-stable", "deepin-wine6-vannila", "spark-wine8-wow", "deepin-wine5-stable", "deepin-wine5", "deepin-wine"]
     if os.system("which deepin-wine6-stable"):
         for i in range(len(wineList)):
             if not os.system(f"which '{wineList[i]}'"):

deepin-wine-packager.py

@@ -2183,8 +2183,8 @@ bottleNameLock = False
 ###############
 programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 # 如果要添加其他 wine，请在字典添加其名称和执行路径
-wine = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5 stable": "deepin-wine5-stable", "deepin-wine6 stable": "deepin-wine6-stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow"}
+wine = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5 stable": "deepin-wine5-stable", "deepin-wine6 stable": "deepin-wine6-stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila"}
-wineValue = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5-stable": "deepin-wine5 stable", "deepin-wine6-stable": "deepin-wine6 stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow"}
+wineValue = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5-stable": "deepin-wine5 stable", "deepin-wine6-stable": "deepin-wine6 stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila"}
 # 读取 wine 本地列表
 for i in os.listdir("/opt"):
     if os.path.exists(f"/opt/{i}/bin/wine"):

mainwindow.py

@@ -2278,6 +2278,7 @@ def CheckWine():
             "基于 UOS exagear 的 deepin-wine6-stable": f"WINEPREDLL='{programPath}/dlls-arm' WINEDLLPATH=/opt/deepin-wine6-stable/lib /opt/exagear/bin/ubt_x64a64_al --path-prefix {get_home()}/.deepinwine/debian-buster --utmp-paths-list {get_home()}/.deepinwine/debian-buster/.exagear/utmp-list --vpaths-list {get_home()}/.deepinwine/debian-buster/.exagear/vpaths-list --opaths-list {get_home()}/.deepinwine/debian-buster/.exagear/opaths-list --smo-mode fbase --smo-severity smart --fd-limit 8192 --foreign-ubt-binary /opt/exagear/bin/ubt_x32a64_al -- /opt/deepin-wine6-stable/bin/wine ",
             "使用 Flatpak 安装的 Wine": "flatpak run org.winehq.Wine",
             "deepin-wine6 stable": "deepin-wine6-stable", 
+            "deepin-wine6-vannila": "deepin-wine6-vannila",
             "deepin-wine5 stable": "deepin-wine5-stable", 
             "spark-wine": "spark-wine",
             "spark-wine7-devel": "spark-wine7-devel", 
@@ -2540,30 +2541,9 @@ exe路径\' 参数 \'
 5、wine 容器如果没有指定，则会默认为 ~/.wine；
 6、如果可执行文件比较大的话，会出现点击“获取该程序运行情况”出现假死的情况，因为正在后台读取 SHA1，只需要等一下即可（读取速度依照您电脑处理速度、读写速度、可执行文件大小等有关）；
 7、如果非 X86 的用户的 UOS 专业版用户想要使用的话，只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序；''')
-updateThingsString = transla.transe("U", '''<b>3.4.0.1 更新内容：</b>
+updateThingsString = transla.transe("U", '''<b>3.4.1 更新内容：</b>
-※1、修复部分高性能机器打包器提示“无效的压缩参数”：https://gitee.com/gfdgd-xi/deep-wine-runner/issues/I7SMTJ
+※1、支持识别 spark-wine8-wow 且打包时可以使用该 wine
-※2、支持设置程序字体大小：https://gitee.com/gfdgd-xi/deep-wine-runner/issues/I7SAYE
+※2、替换安装 Box86 的 pkexec 为 sudo''')
-
-<b>3.4.0 更新内容：</b>
-※1、修复简易打包器无法打开的问题以及 Wine 识别错误的问题
-※2、高级打包器支持多 .desktop 分别设置不同的 MimeType
-※3、修复运行器在 Ubuntu 23 的安装问题
-※4、高级打包器支持导出/导入填写信息
-※5、Deepin 23 支持使用 Winetricks
-※6、新增视频教程
-※7、修复虚拟机工具在检测到 Qemu 磁盘但没有安装 Qemu 时无法启动的问题
-※8、修复虚拟机工具的一些问题并调整部分设置
-※9、虚拟机工具支持设置 UEFI 启动
-※10、虚拟机安装工具提供 LoongArch 新世界版本
-11、高级打包器支持隐藏输入框以及使用小字体
-12、打包器提供 bcm 和 dcm wine 支持
-13、修复星火 wine 配置错误问题
-14、打包器支持多线程打包
-15、修复升级工具问题：https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX
-16、跟进打包器 run.sh 模板
-17、云沙箱新增 cloud.vdnel.cn
-18、打包器新增分类 Game、System、AudioVideo
-19、修复安装 Box64 时源里没有 libc6:armhf 导致无法安装的问题''')
 for i in information["Thank"]:
     thankText += f"{i}\n"
 updateTime = "2023年08月18日"
@@ -2806,8 +2786,9 @@ installWineHQOrg = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/w
 installWineHQ = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/wine.png"), transla.transe("U", "安装 WineHQ（国内清华大学镜像源）"))
 installMoreWine = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/more-wine.png"), transla.transe("U", "安装更多 Wine"))
 downloadChrootBottle = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/CHROOT.png"), transla.transe("U", "下载 Chroot 容器"))
-installBox86CN = QtWidgets.QAction(QtGui.QIcon.fromTheme("box"), transla.transe("U", "安装 Box86/Box64（国内源）"))
+installBox86CN = QtWidgets.QAction(QtGui.QIcon.fromTheme("box"), transla.transe("U", "安装 Box86/Box64 日构建（国内源）"))
-#installBox86 = QtWidgets.QAction(QtGui.QIcon.fromTheme("box"), transla.transe("U", "安装 Box86/Box64（国外 Github 源）"))
+installBox86 = QtWidgets.QAction(QtGui.QIcon.fromTheme("box"), transla.transe("U", "安装 Box86/Box64 日构建（国外 Github 源）"))
+installBox86Own = QtWidgets.QAction(QtGui.QIcon.fromTheme("box"), transla.transe("U", "安装 Box86/Box64（使用自建源，支持 riscv64）"))
 addWineDebMirrorForDeepin20 = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/wine.png"), transla.transe("U", "添加 Wine 运行器源以安装较新版本的 WineHQ（支持 Deepin20/Debian10）"))
 p2 = QtWidgets.QAction(QtGui.QIcon.fromTheme("settings"), transla.transe("U", "设置程序(&S)"))
 enabledAll = QtWidgets.QAction(transla.transe("U", "强制启用所有被禁用的组件（不推荐）"))
@@ -2827,7 +2808,8 @@ programmenu.addAction(addWineDebMirrorForDeepin20)
 programmenu.addAction(installMoreWine)
 programmenu.addAction(downloadChrootBottle)
 programmenu.addAction(installBox86CN)
-#programmenu.addAction(installBox86)
+programmenu.addAction(installBox86)
+programmenu.addAction(installBox86Own)
 #programmenu.addSeparator()
 #programmenu.addAction(setMiniFont)
 #programmenu.addAction(setTinyFont)
@@ -2865,7 +2847,8 @@ downloadChrootBottle.triggered.connect(lambda: threading.Thread(target=os.system
 p2.triggered.connect(ProgramSetting.ShowWindow)
 enabledAll.triggered.connect(lambda: DisableButton(False))
 installBox86CN.triggered.connect(lambda: OpenTerminal(f"sudo bash '{programPath}/InstallBox86-cn.sh'"))
-#installBox86.triggered.connect(lambda: OpenTerminal(f"sudo bash '{programPath}/InstallBox86.sh'"))
+installBox86.triggered.connect(lambda: OpenTerminal(f"sudo bash '{programPath}/InstallBox86.sh'"))
+installBox86Own.triggered.connect(lambda: OpenTerminal(f"sudo bash '{programPath}/InstallBox86-own.sh'"))
 p3.triggered.connect(CleanProgramHistory)
 cleanCache.triggered.connect(CleanProgramCache)
 cleanProgramUnuse.triggered.connect(CleanProgram)