diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control index 0b0c02a..b202173 100755 --- a/deb/DEBIAN/control +++ b/deb/DEBIAN/control @@ -9,7 +9,7 @@ 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, deepin-terminal-gtk | 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, spark-deepin-wine-runner-qemu-system-extra, deepin-wine8-stable | 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 +Recommends: winbind, wimtools, python3-pyqt5.qtwebengine, binfmt-support, libc6:i386, libc6:armhf, libwine, qemu-system, qemu-full, alien, spark-deepin-wine-runner-qemu-system-extra, deepin-wine8-stable | 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, 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 Replaces: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52 diff --git a/deepin-wine-easy-packager.py b/deepin-wine-easy-packager.py index e2b13d4..341a22d 100755 --- a/deepin-wine-easy-packager.py +++ b/deepin-wine-easy-packager.py @@ -220,10 +220,22 @@ BOTTLENAME="@@@Package@@@" APPVER="@@@Version@@@" EXEC_PATH="@@@EXEC_PATH@@@" ##### 软件在wine中的启动路径 +##### 软件在wine中的启动路径 +SHELL_DIR=$(dirname $(realpath $0)) +START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" +if [ -e "/opt/apps/deepin-wine-runner/helper/deepinwine/tools/spark_run_v4.sh" ] ;then + # 方便在找不到 helper 依赖的情况下临时使用 Wine 运行器作为顶替 + START_SHELL_PATH="/opt/apps/deepin-wine-runner/helper/deepinwine/tools/spark_run_v4.sh" +fi +if [ -e "$SHELL_DIR/deepinwine/tools/spark_run_v4.sh" ] ;then + # 如果 helper 在 run.sh 相同目录的 deepinwine/tools/spark_run_v4.sh 则可以调用 + START_SHELL_PATH="$SHELL_DIR/deepinwine/tools/spark_run_v4.sh" +fi +if [ -e "/opt/deepinwine/tools/run_v4.sh" ] ;then + START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" +fi if [ -e "/opt/deepinwine/tools/spark_run_v4.sh" ] ;then START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh" -else - START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" fi ENABLE_DOT_NET="" ####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono @@ -557,7 +569,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 | com.{chooseWine}.deepin, spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepin, fonts-wqy-microhei, fonts-wqy-zenhei" + debDepends = f"{chooseWine} | {chooseWine}-bcm | {chooseWine}-dcm | com.{chooseWine}.deepin, spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepin | spark-deepin-wine-runner (>= 3.9.3), 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'") diff --git a/deepin-wine-packager.py b/deepin-wine-packager.py index bab962f..f668780 100755 --- a/deepin-wine-packager.py +++ b/deepin-wine-packager.py @@ -410,7 +410,7 @@ class make_deb_threading(QtCore.QThread): "Architecture": debFirstArch.currentText(), "Depends": [ 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 | 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 | deepin-wine-helper | com.wine-helper.deepin | spark-deepin-wine-runner (>= 3.9.3), fonts-wqy-microhei, fonts-wqy-zenhei" ][int(chooseWineHelperValue.isChecked())], "postinst": ['', f'''#!/bin/bash PACKAGE_NAME="{e1_text.text()}" @@ -537,10 +537,21 @@ BOTTLENAME="@@@BOTTLENAME@@@" APPVER="@@@APPVER@@@" EXEC_PATH="@@@EXEC_PATH@@@" ##### 软件在wine中的启动路径 +SHELL_DIR=$(dirname $(realpath $0)) +START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" +if [ -e "/opt/apps/deepin-wine-runner/helper/deepinwine/tools/spark_run_v4.sh" ] ;then + # 方便在找不到 helper 依赖的情况下临时使用 Wine 运行器作为顶替 + START_SHELL_PATH="/opt/apps/deepin-wine-runner/helper/deepinwine/tools/spark_run_v4.sh" +fi +if [ -e "$SHELL_DIR/deepinwine/tools/spark_run_v4.sh" ] ;then + # 如果 helper 在 run.sh 相同目录的 deepinwine/tools/spark_run_v4.sh 则可以调用 + START_SHELL_PATH="$SHELL_DIR/deepinwine/tools/spark_run_v4.sh" +fi +if [ -e "/opt/deepinwine/tools/run_v4.sh" ] ;then + START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" +fi if [ -e "/opt/deepinwine/tools/spark_run_v4.sh" ] ;then START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh" -else - START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" fi ENABLE_DOT_NET="" ####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono @@ -1054,10 +1065,22 @@ BOTTLENAME="@@@BOTTLENAME@@@" APPVER="@@@APPVER@@@" EXEC_PATH="@@@EXEC_PATH@@@" ##### 软件在wine中的启动路径 +##### 软件在wine中的启动路径 +SHELL_DIR=$(dirname $(realpath $0)) +START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" +if [ -e "/opt/apps/deepin-wine-runner/helper/deepinwine/tools/spark_run_v4.sh" ] ;then + # 方便在找不到 helper 依赖的情况下临时使用 Wine 运行器作为顶替 + START_SHELL_PATH="/opt/apps/deepin-wine-runner/helper/deepinwine/tools/spark_run_v4.sh" +fi +if [ -e "$SHELL_DIR/deepinwine/tools/spark_run_v4.sh" ] ;then + # 如果 helper 在 run.sh 相同目录的 deepinwine/tools/spark_run_v4.sh 则可以调用 + START_SHELL_PATH="$SHELL_DIR/deepinwine/tools/spark_run_v4.sh" +fi +if [ -e "/opt/deepinwine/tools/run_v4.sh" ] ;then + START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" +fi if [ -e "/opt/deepinwine/tools/spark_run_v4.sh" ] ;then START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh" -else - START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" fi ENABLE_DOT_NET="" ####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono @@ -1341,7 +1364,7 @@ true print("c") if os.path.exists(wine[wineVersion.currentText()]): debInformation[0]["Depends"] = ["deepin-wine-helper | com.wine-helper.deepin", - "spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepin" + "spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepin | spark-deepin-wine-runner (>= 3.9.3)" ][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") debInformation[0]["run.sh"] = f'''#!/bin/sh @@ -1892,14 +1915,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 | 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 | 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 | deepin-wine-helper | com.wine-helper.deepin | spark-deepin-wine-runner (>= 3.9.3), 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 | com.wine-helper.deepin", - "spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepin" + "spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepin | spark-deepin-wine-runner (>= 3.9.3)" ][int(chooseWineHelperValue.isChecked())]) #if "deepin-wine5-stable" in wine[wineVersion.currentText()]: # debDepends.setText("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")