补个更新日志

VM/qemu.py

@@ -28,8 +28,11 @@ class qemu:
         self.vboxVersion = subprocess.getoutput(self.qemuPath + " --version")
 
     def Create(self, type = "Windows7"):
-        if(not os.path.exists(self.name)):
+        try:
-            os.makedirs(self.name)
+            if(not os.path.exists(self.name)):
+                os.makedirs(self.name)
+        except:
+            pass
         return 0
 
     def CreateDisk(self, path: str, size: int):

deb/DEBIAN/control

@@ -28,7 +28,8 @@ Depends: python3,
  tree, 
  dpkg, 
  fakeroot,
- bash
+ bash,
+ xdg-utils
 Recommends: winbind, 
  wimtools | wimlib, 
  python3-pyquery, 

deepin-wine-easy-packager.py

@@ -711,7 +711,23 @@ wineChooserList = [
     "使用 Spark Wine 打包应用"
 ]
 wineChooserIndex = 2
-wineList = ["deepin-wine-staging", "deepin-wine8-stable", "spark-wine9-wow", "spark-wine9", "spark-wine8", "spark-wine7-devel", "deepin-wine6-stable", "deepin-wine6-vannila", "spark-wine8-wow", "deepin-wine5-stable", "deepin-wine5", "deepin-wine", "spark-wine"]
+wineList = [
+    "deepin-wine-staging", 
+    "deepin-wine8-stable", 
+    "spark-wine10-wow", 
+    "spark-wine10", 
+    "spark-wine9-wow", 
+    "spark-wine9", 
+    "spark-wine8", 
+    "spark-wine7-devel", 
+    "deepin-wine6-stable", 
+    "deepin-wine6-vannila", 
+    "spark-wine8-wow", 
+    "deepin-wine5-stable", 
+    "deepin-wine5", 
+    "deepin-wine", 
+    "spark-wine"
+]
 for i in range(len(wineList)):
     if not os.system(f"which '{wineList[i]}'"):
         wineChooserIndex = i

deepin-wine-packager.py

@@ -1332,8 +1332,28 @@ 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", "okylin-wine": "okylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine8-stable": "deepin-wine8-stable", "spark-wine9": "spark-wine9", "spark-wine9-wow": "spark-wine9-wow", "spark-wine": "spark-wine", "deepin-wine-staging": "deepin-wine-staging"}
+wine = {
-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", "okylin-wine": "okylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine8-stable": "deepin-wine8-stable", "spark-wine": "spark-wine", "deepin-wine-staging": "deepin-wine-staging"}
+    "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", 
+    "okylin-wine": "okylin-wine", 
+    "spark-wine8": "spark-wine8", 
+    "spark-wine8-wow": "spark-wine8-wow", 
+    "deepin-wine6-vannila": "deepin-wine6-vannila", 
+    "deepin-wine8-stable": "deepin-wine8-stable", 
+    "spark-wine9": "spark-wine9", 
+    "spark-wine9-wow": "spark-wine9-wow", 
+    "spark-wine10": "spark-wine10", 
+    "spark-wine10-wow": "spark-wine10-wow", 
+    "spark-wine": "spark-wine", 
+    "deepin-wine-staging": "deepin-wine-staging"
+}
+wineValue = wine
 # 读取 wine 本地列表
 try:
     for i in os.listdir("/opt"):

information.json

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

mainwindow.py

@@ -2230,6 +2230,8 @@ def CheckWine():
             "spark-wine8-wow": "spark-wine8-wow",
             "spark-wine9": "spark-wine9",
             "spark-wine9-wow": "spark-wine9-wow",
+            "spark-wine10": "spark-wine10",
+            "spark-wine10-wow": "spark-wine10-wow",
             "deepin-wine": "deepin-wine", 
             "deepin-wine5": "deepin-wine5", 
             "wine": "wine", 
@@ -2498,13 +2500,14 @@ exe路径\' 参数 \'
 5、wine 容器如果没有指定，则会默认为 ~/.wine；
 6、如果可执行文件比较大的话，会出现点击“获取该程序运行情况”出现假死的情况，因为正在后台读取 SHA1，只需要等一下即可（读取速度依照您电脑处理速度、读写速度、可执行文件大小等有关）；
 7、如果非 X86 的用户的 UOS 专业版用户想要使用的话，只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序；''')
-updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、修复安全问题
+updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、修复虚拟机安装工具磁盘创建问题
-※2、更新 dxvk 版本至 2.5
+※2、更新 dxvk 版本至 2.6.1
-※3、修复打包器生成的 deb 包参数问题                                                                                          
+※3、更新 winetricks 版本
+※4、适配 spark-wine10
 ''')
 for i in information["Thank"]:
     thankText += f"{i}\n"
-updateTime = "2024年09月15日"
+updateTime = "2025年04月19日"
 aboutProgram = QtCore.QCoreApplication.translate("U", """<p>Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序。原版的 Wine 只能使用命令操作，且安装过程较为繁琐，对小白不友好。于是该运行器为了解决该痛点，内置了对Wine图形化的支持、Wine 安装器、微型应用商店、各种Wine工具、自制的Wine程序打包器、运行库安装工具等。</p>
 <p>它同时还内置了基于Qemu/VirtualBox制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作，也能在非 X86 架构安装 X86 架构的 Windows 操作系统（但是效率较低，可以运行些老系统）。</p>
 <p>而且对于部分 Wine 应用适配者来说，提供了图形化的打包工具，以及提供了一些常用工具以及运行库的安装方式，以及能安装多种不同的 Wine 以测试效果，能极大提升适配效率。</p>

off-line-shell/run-system-bwrap.sh

@@ -11,9 +11,22 @@ if [[ -d /usr/lib64 ]] && [[ -d $SHELL_FOLDER/lib64 ]]; then
     option="$option --dev-bind $SHELL_FOLDER/lib64 /usr/lib64 "
 fi
 
+if [[ -d /usr/share/fonts ]]; then
+    option="$option --dev-bind /usr/share/fonts /usr/share/fonts "
+fi
+
+if [[ -d $SHELL_FOLDER/gnemul ]]; then
+    if [[ ! -d /usr/gnemul ]]; then
+        pkexec mkdir -p /usr/gnemul
+    fi
+    option="$option --dev-bind $SHELL_FOLDER/gnemul /usr/gnemul "
+fi
+
 bwrap --dev-bind / / \
     --dev-bind "$SHELL_FOLDER/bin" /usr/bin \
+    --dev-bind "$SHELL_FOLDER/bin" /bin \
     --dev-bind "$SHELL_FOLDER/lib" /usr/lib \
+    --dev-bind "$SHELL_FOLDER/lib" /lib \
     --dev-bind /usr/lib/locale /usr/lib/locale \
     --dev-bind "$SHELL_FOLDER/share" /usr/share \
     $option \

package-script/information.json

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