3.9.1初步

README.md

@@ -1,18 +1,22 @@
 <p width=100px align="center"><img src="https://storage.deepin.org/thread/202208031419283599_deepin-wine-runner.png"></p>
-<h1 align="center">Wine 运行器 3.8.1</h1>
+<h1 align="center">Wine 运行器 3.9.1</h1>
 <hr>
 <a href='https://gitee.com/gfdgd-xi/deep-wine-runner/stargazers'><img src='https://gitee.com/gfdgd-xi/deep-wine-runner/badge/star.svg?theme=dark' alt='star'></img></a>
 <a href='https://gitee.com/gfdgd-xi/deep-wine-runner/members'><img src='https://gitee.com/gfdgd-xi/deep-wine-runner/badge/fork.svg?theme=dark' alt='fork'></img></a>  
 
 ## 介绍
 Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序。原版的 Wine 只能使用命令操作，且安装过程较为繁琐，对小白不友好。于是该运行器为了解决该痛点，内置了对Wine图形化的支持、Wine 安装器、微型应用商店、各种Wine工具、自制的Wine程序打包器、运行库安装工具等。  
-它同时还内置了基于Qemu/VirtualBox制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作，也能在非 X86 架构安装 X86 架构的 Windows 操作系统（但是效率较低，可以运行些老系统）。  
+它同时还内置了基于Qemu/VirtualBox制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作，也能在非 X86 架构安装 X86 架构的 Windows 操作系统（但是效率较低，可以运行些老系统）。    
+
 而且对于部分 Wine 应用适配者来说，提供了图形化的打包工具，以及提供了一些常用工具以及运行库的安装方式，以及能安装多种不同的 Wine 以测试效果，能极大提升适配效率。  
 且对于 Deepin23 用户做了特别优化，以便能在缺少 i386 运行库的情况下运行 Wine32。同时也为非 X86 架构用户提供了 Box86/64、Qemu User 的安装方式  
 
 注：  
 **在使用运行器时不要随便动  .deepinwine 下的容器，否则会导致安装的 wine 应用无法正常打开**  
 **除非你有把握不会损坏容器**  
+
+
+Wine Runner is a program that allows Linux users to run Windows applications more conveniently. It has built-in support for Wine graphics, various Wine tools, self-made Wine program packager and runtime installation tools. It also has a built-in Windows virtual machine installation tool based on VirtualBox, which is specially used by Xiaobai. You can download the system image and click Install without considering the installation, creation and partitioning of virtual machines.   
  
 ![截图_选择区域_20221002221112.png](https://storage.deepin.org/thread/202210022215217037_截图_选择区域_20221002221112.png)  
 
@@ -143,6 +147,10 @@ desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与de
 ![image.png](https://storage.deepin.org/thread/202207190822204627_image.png)
 
 ## 更新日志 
+### 3.9.1（2024/06/07）
+**※1、修复 Windows 虚拟机安装工具安装程序在 Mips 架构无法正确启动虚拟机的问题**  
+**※2、优化打包器依赖**  
+
 ### 3.9.0（2024年06月01日）
 **※1、UOS Mips64（如 3a4000）用户无需手动降级 Qemu 即可正常开启使用虚拟机**  
 **※2、修复开启部分 exe 提示参数有误的问题**  
@@ -173,6 +181,16 @@ desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与de
 8、修复问题 https://gitee.com/gfdgd-xi/deep-wine-runner/issues/I9B4L0  
 9、针对 Loongarch ACE 做特别优化  
 
+**※1. Repair system/application library download failed problem**  
+**※2. Support building loong64, loongarch64, armhf and amd64 architecture deb with packager** 
+**※3. Update Geek Uninstaller version**  
+**※4. Enable English translation by default**  
+**※5. Update dxvk version**  
+**※6. Repair virtual machine running problem with newer Qemu**  
+**※7. Support adding space with Qemu virtual disk**  
+8. Fixed an issue related to https://gitee.com/gfdgd-xi/deep-wine-runner/issues/I9B4L0  
+9. Added support for Loongarch ACE
+
 ![image.png](https://storage.deepin.org/thread/202404271014409954_image.png)
 
 

ShellList/repair-arm-package-problem-to-uos.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+import os
+import sys
+
+def Replace(path):
+    "spark-dwine-helper | store.spark-app.spark-dwine-helper"
+    "deepin-wine-helper (>= 5.1.30-1)"
+    "com.wine-helper.deepin"
+    with open(f"{path}/DEBIAN/control", "r") as file:
+        data = file.read()
+    
+    isReplace = False
+    isSparkHelper = False
+    # 替换 Wine 包名
+    data = data.replace("deepin-wine6-stable,", "deepin-wine6-stable | com.deepin-wine6-stable.deepin,")
+    data = data.replace("deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm,", "deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm | com.deepin-wine6-stable.deepin,")
+    if "spark-dwine-helper | store.spark-app.spark-dwine-helper" in data and not isReplace:
+        isReplace = True
+        isSparkHelper = True
+        data = data.replace("spark-dwine-helper | store.spark-app.spark-dwine-helper", "deepin-wine-helper | com.wine-helper.deepin")
+        
+    if "deepin-wine-helper (>= 5.1.30-1)" in data and not isReplace:
+        isReplace = True
+        data = data.replace("deepin-wine-helper (>= 5.1.30-1)", "deepin-wine-helper | com.wine-helper.deepin")
+    with open(f"{path}/DEBIAN/control", "w") as file:
+        file.write(data)
+    if isSparkHelper:
+        ReplaceSparkHelper(path)
+
+def ReplaceSparkHelper(path):
+    name = os.listdir(f"{path}/opt/apps/")[0]
+    with open(f"{path}/opt/apps/{name}/files/run.sh", "r") as file:
+        data = file.read().replace("/opt/deepinwine/tools/spark_run_v4.sh", "/opt/deepinwine/tools/run_v4.sh")
+    with open(f"{path}/opt/apps/{name}/files/run.sh", "w") as file:
+        file.write(data)
+
+if len(sys.argv) <= 1:
+    print(f"请加参数，命令示例： {sys.argv[0]} xxx.deb")
+    exit(1)
+
+tempPath = "/tmp/turn-deb"
+for i in sys.argv[1:]:
+    os.system(f"rm -rf '{tempPath}'")
+    os.system(f"dpkg -x '{i}' '{tempPath}'")
+    os.system(f"dpkg -e '{i}' '{tempPath}/DEBIAN'")
+    fileName = os.path.splitext(i)[0]
+    # 修改 control 文件
+    Replace(tempPath)
+    
+    os.system(f"dpkg-deb -Z xz -z 0 -b '{tempPath}' '{fileName}-new.deb'")

VM-source/qemu.cpp

@@ -331,7 +331,7 @@ QString qemu::GetArch()
     process.start("uname", QStringList() << "-m");
     process.waitForStarted();
     process.waitForFinished();
-    QString data = process.readAllStandardError();
+    QString data = process.readAllStandardOutput();
     process.close();
     return data.replace("\n", "").replace(" ", "");
 }

deb/DEBIAN/control

@@ -8,7 +8,7 @@ Certainty: possible
 Check: binaries
 Type: binary, udeb
 Priority: optional
-Depends: python3, python3-pil, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar | unrar-free , unzip, python3-requests, python3-pyqt5, python3-psutil, xfce4-terminal | deepin-terminal | mate-terminal | gnome-terminal, python3-dbus, python3-pip, p7zip-full (<< 16.02+transitional.1) | p7zip-legacy (>= 16.02+dfsg-8+Mejituu-2024022216), sudo, python3-pyperclip, bubblewrap, zenity, tree, dpkg, fakeroot
+Depends: python3, python3-pil, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar | unrar-free , unzip, python3-requests, python3-pyqt5, python3-psutil, xfce4-terminal | deepin-terminal | mate-terminal | gnome-terminal, python3-dbus, python3-pip, p7zip-full | p7zip-legacy, sudo, python3-pyperclip, bubblewrap, zenity, tree, dpkg, fakeroot
 Recommends: winbind, wimtools, python3-pyqt5.qtwebengine, binfmt-support, libc6:i386, libc6:armhf, libwine, qemu-system, qemu-full, alien
 Section: utils
 Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52

deepin-wine-easy-packager.py

@@ -221,7 +221,7 @@ BOTTLENAME="@@@Package@@@"
 APPVER="@@@Version@@@"
 EXEC_PATH="@@@EXEC_PATH@@@"
 ##### 软件在wine中的启动路径
-START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
+START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
 ENABLE_DOT_NET=""
 ####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 export MIME_TYPE=""
@@ -549,7 +549,7 @@ class RunThread(QtCore.QThread):
                 self.RunCommand(f"cp -rv '{folderExePath}' '{bottlePath}/drive_c/Program Files'")
                 debPackageVersion = self.GetEXEVersion(exePath.text(), bottlePath)
             debDescription = f"{exeName} By Build By Wine Runner Easy Packager"
-            debDepends = f"{chooseWine} | {chooseWine}-bcm | {chooseWine}-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
+            debDepends = f"{chooseWine} | {chooseWine}-bcm | {chooseWine}-dcm | com.{chooseWine}.deepin, deepin-wine-helper | com.wine-helper.deepin, fonts-wqy-microhei, fonts-wqy-zenhei"
             self.RunCommand(f"mkdir -pv '{debBuildPath}/DEBIAN'")
             self.RunCommand(f"mkdir -pv '{debBuildPath}/opt/apps/{debPackageName}/files'")
             self.RunCommand(f"mkdir -pv '{debBuildPath}/opt/apps/{debPackageName}/entries/applications'")

deepin-wine-packager.py

@@ -409,7 +409,7 @@ class make_deb_threading(QtCore.QThread):
                     "Wine": wine[wineVersion.currentText()],
                     "Architecture": debFirstArch.currentText(),
                     "Depends": [
-                        f"{wine[wineVersion.currentText()]}, deepin-wine-helper (>= 5.1.30-1), fonts-wqy-microhei, fonts-wqy-zenhei",
+                        f"{wine[wineVersion.currentText()]}, deepin-wine-helper | com.wine-helper.deepin, fonts-wqy-microhei, fonts-wqy-zenhei",
                         f"{wine[wineVersion.currentText()]}, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
                         ][int(chooseWineHelperValue.isChecked())],
                     "postinst": ['', f'''#!/bin/bash
@@ -1295,7 +1295,7 @@ true
             ]
             print("c")
             if os.path.exists(wine[wineVersion.currentText()]):
-                debInformation[0]["Depends"] = ["deepin-wine-helper (>= 5.1.30-1)",
+                debInformation[0]["Depends"] = ["deepin-wine-helper | com.wine-helper.deepin",
                         "spark-dwine-helper | store.spark-app.spark-dwine-helper"
                         ][int(chooseWineHelperValue.isChecked())] #+ ["", "libasound2 (>= 1.0.16), libc6 (>= 2.28), libglib2.0-0 (>= 2.12.0), libgphoto2-6 (>= 2.5.10), libgphoto2-port12 (>= 2.5.10), libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), liblcms2-2 (>= 2.2+git20110628), libldap-2.4-2 (>= 2.4.7), libmpg123-0 (>= 1.13.7), libopenal1 (>= 1.14), libpcap0.8 (>= 0.9.8), libpulse0 (>= 0.99.1), libudev1 (>= 183), libvkd3d1 (>= 1.0), libx11-6, libxext6, libxml2 (>= 2.9.0), ocl-icd-libopencl1 | libopencl1, udis86, zlib1g (>= 1:1.1.4), libasound2-plugins, libncurses6 | libncurses5 | libncurses, deepin-wine-plugin-virtual\nRecommends: libcapi20-3, libcups2, libdbus-1-3, libfontconfig1, libfreetype6, libglu1-mesa | libglu1, libgnutls30 | libgnutls28 | libgnutls26, libgsm1, libgssapi-krb5-2, libjpeg62-turbo | libjpeg8, libkrb5-3, libodbc1, libosmesa6, libpng16-16 | libpng12-0, libsane | libsane1, libsdl2-2.0-0, libtiff5, libv4l-0, libxcomposite1, libxcursor1, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, libxslt1.1, libxxf86vm1"][]
                 print("d")
@@ -1846,14 +1846,14 @@ def BrowserHelperConfigPathText():
 
 def ChangeWine():
     useInstallWineArch.setEnabled(os.path.exists(wine[wineVersion.currentText()]))
-    debDepends.setText([f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm, deepin-wine-helper (>= 5.1.30-1), fonts-wqy-microhei, fonts-wqy-zenhei",
-                        f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
+    debDepends.setText([f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm | com.{wine[wineVersion.currentText()]}.deepin, deepin-wine-helper | com.wine-helper.deepin, fonts-wqy-microhei, fonts-wqy-zenhei",
+                        f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm | com.{wine[wineVersion.currentText()]}.deepin, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
                         ][int(chooseWineHelperValue.isChecked())])
     debRecommend.setText("")
     helperConfigPathText.setEnabled(chooseWineHelperValue.isChecked())
     helperConfigPathButton.setEnabled(chooseWineHelperValue.isChecked())
     if os.path.exists(wine[wineVersion.currentText()]):
-        debDepends.setText(["deepin-wine-helper (>= 5.1.30-1)",
+        debDepends.setText(["deepin-wine-helper | com.wine-helper.deepin",
                         "spark-dwine-helper | store.spark-app.spark-dwine-helper"
                         ][int(chooseWineHelperValue.isChecked())])
         #if "deepin-wine5-stable" in wine[wineVersion.currentText()]:

information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "3.9.0",
+    "Version": "3.9.1",
     "Time": "未知",
     "Thank": [
         "感谢 @ёжезийлёзйз 进行 Loongarch 架构的测试（旧世界，远程）",

package-script/package.py

@@ -84,7 +84,7 @@ export deb_version_string="{versionName.text()}"
 #读取和最终解压的包名
 export bottle_name="{bottonName.text()}"
 
-export package_depends="deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper"
+export package_depends="deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm, deepin-wine-helper | com.wine-helper.deepin"
 export apprun_cmd="deepin-wine6-stable"
 #export package_depends="deepin-wine5-stable | deepin-wine5-stable-bcm | deepin-wine5-stable-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper"
 #export apprun_cmd="deepin-wine5-stable"