设置默认不勾选打包器wine生态适配活动容器清理脚本选项

Signed-off-by: gfdgd_xi <3025613752@qq.com>

StartVM.sh

@@ -161,7 +161,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
             $qemuMore qemu-system-aarch64 --enable-kvm -name Wine运行器虚拟机工具 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
                 -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
                 -m ${use}G -display gtk -usb -nic model=rtl8139 $qemuUEFI \
-                -cpu max -M virt \
+                -cpu cortex-a76 -M virt \
                 -device virtio-gpu-pci \
                 -device nec-usb-xhci,id=xhci,addr=0x1b \
                 -device usb-tablet,id=tablet,bus=xhci.0,port=1 \
@@ -174,7 +174,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         $qemuMore qemu-system-aarch64 -name Wine运行器虚拟机工具 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
             -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
             -m ${use}G -display gtk -usb -nic model=rtl8139 $qemuUEFI \
-            -cpu max -M virt \
+            -cpu cortex-a76 -M virt \
             -device virtio-gpu-pci \
             -device nec-usb-xhci,id=xhci,addr=0x1b \
             -device usb-tablet,id=tablet,bus=xhci.0,port=1 \

VM/qemu.py

@@ -112,7 +112,7 @@ class qemu:
         if(subprocess.getoutput("arch").replace("\n", "").replace(" ", "") == "aarch64" and not os.system((self.applicationDirPath() + "/kvm-ok"))):
             return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk --enable-kvm -cpu host -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
     
-        return os.system((qemuPath + " -name Wine运行器虚拟机工具 --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -cpu max -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+        return os.system((qemuPath + " -name Wine运行器虚拟机工具 --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -cpu cortex-a76 -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
 
     def StartLoong64(self):
         return 1

deb/DEBIAN/control

@@ -42,7 +42,7 @@ Recommends: winbind,
  qemu,
  alien, 
  spark-deepin-wine-runner-qemu-system-extra, 
- deepin-wine-staging | deepin-wine8-stable | hangover-wine | spark-wine | spark-wine9 | spark-wine9-wow | spark-wine8 | spark-wine8-wow | spark-wine7-devel | deepin-wine6-stable | deepin-wine5-stable | deepin-wine5 | deepin-wine | wine | libwine, 
+ deepin-wine10-stable | deepin-wine-staging | deepin-wine8-stable | hangover-wine | spark-wine | spark-wine11 | spark-wine11-wow | spark-wine10 | spark-wine10-wow | spark-wine9 | spark-wine9-wow | spark-wine8 | spark-wine8-wow | spark-wine7-devel | deepin-wine6-stable | deepin-wine5-stable | deepin-wine5 | deepin-wine | wine | libwine, 
  spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepin
 Section: utils
 Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52, spark-deepin-wine-runner-termux, termux-exec

deepin-wine-easy-packager.py

@@ -713,7 +713,10 @@ wineChooserList = [
 wineChooserIndex = 2
 wineList = [
     "deepin-wine-staging", 
+    "deepin-wine10-stable", 
     "deepin-wine8-stable", 
+    "spark-wine11-wow", 
+    "spark-wine11", 
     "spark-wine10-wow", 
     "spark-wine10", 
     "spark-wine9-wow", 

deepin-wine-packager.py

@@ -1346,10 +1346,13 @@ wine = {
     "spark-wine8-wow": "spark-wine8-wow", 
     "deepin-wine6-vannila": "deepin-wine6-vannila", 
     "deepin-wine8-stable": "deepin-wine8-stable", 
+    "deepin-wine10-stable": "deepin-wine10-stable", 
     "spark-wine9": "spark-wine9", 
     "spark-wine9-wow": "spark-wine9-wow", 
     "spark-wine10": "spark-wine10", 
     "spark-wine10-wow": "spark-wine10-wow", 
+    "spark-wine11": "spark-wine11", 
+    "spark-wine11-wow": "spark-wine11-wow", 
     "spark-wine": "spark-wine", 
     "deepin-wine-staging": "deepin-wine-staging"
 }
@@ -1675,7 +1678,7 @@ except:
     pass
 rmBash.setChecked(True)
 disabledMono.setChecked(True)
-cleanBottonByUOS.setChecked(True)
+#cleanBottonByUOS.setChecked(True)
 chooseWineHelperValue.setChecked(True)
 e12_text.setText(f"{get_desktop_path()}/demo_1.0.0_all.deb")
 widget.setLayout(widgetLayout)

information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "4.1.6",
+    "Version": "4.1.7",
     "Time": "未知",
     "Thank": [
         "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",

mainwindow.py

@@ -2220,6 +2220,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-wine-staging": "deepin-wine-staging",
+            "deepin-wine10-stable": "deepin-wine10-stable",
             "deepin-wine8-stable": "deepin-wine8-stable",
             "deepin-wine6 stable": "deepin-wine6-stable", 
             "deepin-wine6-vannila": "deepin-wine6-vannila",
@@ -2232,6 +2233,8 @@ def CheckWine():
             "spark-wine9-wow": "spark-wine9-wow",
             "spark-wine10": "spark-wine10",
             "spark-wine10-wow": "spark-wine10-wow",
+            "spark-wine11": "spark-wine11",
+            "spark-wine11-wow": "spark-wine11-wow",
             "deepin-wine": "deepin-wine", 
             "deepin-wine5": "deepin-wine5", 
             "wine": "wine", 

package-script/information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "4.1.6",
+    "Version": "4.1.7",
     "Time": "未知",
     "Thank": [
         "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",