From 104d197e4bd95d85972007e6b80f41b515307d65 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Sat, 20 Jul 2024 22:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BE=9D=E8=B5=96=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E4=BB=A5=E5=9C=A8termux=E5=8F=AF=E4=BB=A5=E8=8E=B7?= =?UTF-8?q?=E5=BE=97=E6=9B=B4=E5=A5=BD=E7=9A=84=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 9 +++++++++ deb-termux/DEBIAN/control | 15 ++++++++++++--- .../spark-deepin-wine-package-builder.desktop | 4 ++-- ...park-deepin-wine-packager-easy-builder.desktop | 4 ++-- ...spark-deepin-wine-packager-with-script.desktop | 4 ++-- .../spark-deepin-wine-runner-control-vm.desktop | 4 ++-- .../spark-deepin-wine-runner-start-vm.desktop | 4 ++-- .../applications/spark-deepin-wine-runner.desktop | 4 ++-- 8 files changed, 33 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index e1e9f4f..629d3b5 100755 --- a/Makefile +++ b/Makefile @@ -197,10 +197,19 @@ package-termux-deb: make copy-files -j$(nproc) # 替换 DEBIAN sudo rm -rf /tmp/spark-deepin-wine-runner-builder/DEBIAN + sudo rm -rf /tmp/spark-deepin-wine-runner-builder/usr/bin/* + sudo rm -rf /tmp/spark-deepin-wine-runner-builder/usr/share/applications/* + sudo rm -rf /tmp/spark-deepin-wine-runner-builder/opt/apps/deepin-wine-runner/entries/applications/* sudo mkdir -pv /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/ sudo mv /tmp/spark-deepin-wine-runner-builder/usr/ /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/ -v sudo mv /tmp/spark-deepin-wine-runner-builder/opt /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/opt -v + sudo ln -s /data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/bin/deepin-wine-runner + sudo ln -s /data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-packager.py /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/bin/deepin-wine-package-builder + sudo ln -s /data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-packager-with-script.py /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/bin/deepin-wine-packager-with-script + sudo ln -s /data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-easy-packager.py /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/bin/deepin-wine-packager-easy-builder sudo cp deb-termux/DEBIAN /tmp/spark-deepin-wine-runner-builder/DEBIAN -rv + sudo cp -rv deb-termux/usr/share/applications /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/entries/applications + sudo cp -rv deb-termux/usr/share/applications /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/share/applications sudo bash builddeb/ChangeDebVersion.sh dpkg-deb -Z xz -z 9 -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner-termux.deb make remove-copy-files -j$(nproc) diff --git a/deb-termux/DEBIAN/control b/deb-termux/DEBIAN/control index d496912..3b0ca37 100755 --- a/deb-termux/DEBIAN/control +++ b/deb-termux/DEBIAN/control @@ -21,8 +21,12 @@ Depends: python3, zenity, tree, dpkg, - fakeroot， - which + fakeroot, + which, + git, + xfwm4, + tigervnc, + proot Recommends: winbind, wimtools | wimlib, python3-pyquery, @@ -34,9 +38,14 @@ Recommends: winbind, qemu-system, qemu-full, qemu, + qemu-system-x86-64, + qemu-system-i386, + qemu-system-arm, + qemu-system-aarch64, + qemu-utils, 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, + 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 | wine-stable, 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 diff --git a/deb-termux/usr/share/applications/spark-deepin-wine-package-builder.desktop b/deb-termux/usr/share/applications/spark-deepin-wine-package-builder.desktop index cb4fe1a..f9b47c5 100644 --- a/deb-termux/usr/share/applications/spark-deepin-wine-package-builder.desktop +++ b/deb-termux/usr/share/applications/spark-deepin-wine-package-builder.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application X-Categories=System;Wine; -Exec=/usr/bin/deepin-wine-package-builder "~/.wine" %F -Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg +Exec=/data/data/com.termux/files/usr/bin/deepin-wine-package-builder "~/.wine" %F +Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg Name=Wine Package Builder Name[zh]=Wine 打包器 Terminal=false diff --git a/deb-termux/usr/share/applications/spark-deepin-wine-packager-easy-builder.desktop b/deb-termux/usr/share/applications/spark-deepin-wine-packager-easy-builder.desktop index 4d5909b..cefe13a 100644 --- a/deb-termux/usr/share/applications/spark-deepin-wine-packager-easy-builder.desktop +++ b/deb-termux/usr/share/applications/spark-deepin-wine-packager-easy-builder.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application X-Categories=System;Wine; -Exec=/usr/bin/deepin-wine-packager-easy-builder %F -Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg +Exec=/data/data/com.termux/files/usr/bin/deepin-wine-packager-easy-builder %F +Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg Name=Wine Package Builder Name[zh]=Wine 简易打包器 Terminal=false diff --git a/deb-termux/usr/share/applications/spark-deepin-wine-packager-with-script.desktop b/deb-termux/usr/share/applications/spark-deepin-wine-packager-with-script.desktop index e67f51c..d8eac5e 100644 --- a/deb-termux/usr/share/applications/spark-deepin-wine-packager-with-script.desktop +++ b/deb-termux/usr/share/applications/spark-deepin-wine-packager-with-script.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application X-Categories=System;Wine; -Exec=/usr/bin/deepin-wine-packager-with-script -Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg +Exec=/data/data/com.termux/files/usr/bin/deepin-wine-packager-with-script +Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg Name=Wine Package Builder For UOS NoDisplay=true Name[zh]=Wine 打包器(基于活动脚本) diff --git a/deb-termux/usr/share/applications/spark-deepin-wine-runner-control-vm.desktop b/deb-termux/usr/share/applications/spark-deepin-wine-runner-control-vm.desktop index 35eacdc..c7e08b3 100644 --- a/deb-termux/usr/share/applications/spark-deepin-wine-runner-control-vm.desktop +++ b/deb-termux/usr/share/applications/spark-deepin-wine-runner-control-vm.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application X-Categories=System;Wine; -Exec=/opt/apps/deepin-wine-runner/RunVM.sh %F -Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg +Exec=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/RunVM.sh %F +Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg Name=Setting VirtualMachine Name[zh]=设置 Windows 虚拟机 NoDisplay=true diff --git a/deb-termux/usr/share/applications/spark-deepin-wine-runner-start-vm.desktop b/deb-termux/usr/share/applications/spark-deepin-wine-runner-start-vm.desktop index 1271f09..1545fd4 100644 --- a/deb-termux/usr/share/applications/spark-deepin-wine-runner-start-vm.desktop +++ b/deb-termux/usr/share/applications/spark-deepin-wine-runner-start-vm.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application X-Categories=System; -Exec=/opt/apps/deepin-wine-runner/StartVM.sh %F -Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg +Exec=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/StartVM.sh %F +Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg Name=Start Windows VirtualMachine Name[zh]=开启 Windows 虚拟机 Terminal=false diff --git a/deb-termux/usr/share/applications/spark-deepin-wine-runner.desktop b/deb-termux/usr/share/applications/spark-deepin-wine-runner.desktop index af220ee..5a30cc4 100644 --- a/deb-termux/usr/share/applications/spark-deepin-wine-runner.desktop +++ b/deb-termux/usr/share/applications/spark-deepin-wine-runner.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application X-Categories=System;Wine; -Exec=/usr/bin/deepin-wine-runner %F -Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg +Exec=/data/data/com.termux/files/usr/bin/deepin-wine-runner %F +Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg Name=Wine Runner Name[zh]=Wine 运行器 Terminal=false