From b3b2a1f841a09ffa41e4679a13d48edf4b213d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E6=99=B6=E5=B7=9D?= Date: Fri, 26 May 2023 15:17:06 +0800 Subject: [PATCH] init --- .github/workflows/build.yml | 39 +++++++++++++++++ .gitignore | 2 + com.deepinwine6.stable.json | 85 +++++++++++++++++++++++++++++++++++++ ld.so.conf | 3 ++ readme.md | 21 +++++++++ run.sh | 9 ++++ 6 files changed, 159 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .gitignore create mode 100644 com.deepinwine6.stable.json create mode 100644 ld.so.conf create mode 100644 readme.md create mode 100644 run.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..0546e84 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,39 @@ +on: + push: + tags: + - "*" + +name: RUN BUILD +jobs: + flatpak: + name: "Flatpak" + runs-on: ubuntu-latest + permissions: + contents: write + container: + image: bilelmoussaoui/flatpak-github-actions:freedesktop-22.08 + options: --privileged + steps: + - name: Checkout + uses: actions/checkout@main + + - name: flatpak action + uses: flatpak/flatpak-github-actions/flatpak-builder@v4 + with: + bundle: com.deepinwine6.stable.flatpak + manifest-path: com.deepinwine6.stable.json + cache-key: flatpak-wine60525 + + - name: Release set path + run: | + touch release.txt + # echo "🔗 [cloudupload](${{ steps.cloudupload.outputs.url }})" >> release.txt + echo "RELEASE_PATH=$PWD" >> $GITHUB_ENV + echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV + + - name: Release + uses: ncipollo/release-action@v1 + with: + artifacts: ${{ env.RELEASE_PATH }}/*.flatpak + bodyFile: release.txt + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8423336 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.flatpak-builder +build-dir diff --git a/com.deepinwine6.stable.json b/com.deepinwine6.stable.json new file mode 100644 index 0000000..9200773 --- /dev/null +++ b/com.deepinwine6.stable.json @@ -0,0 +1,85 @@ +{ + "app-id": "com.deepinwine6.stable", + "runtime": "org.freedesktop.Platform", + "runtime-version": "22.08", + "sdk": "org.freedesktop.Sdk", + "add-extensions": { + "org.freedesktop.Platform.Compat.i386": { + "directory": "lib/i386-linux-gnu", + "version": "22.08" + }, + "org.freedesktop.Sdk.Extension.toolchain-i386": { + "directory": "lib/i386-linux-toolchain", + "version": "22.08" + } + }, + "command": "/app/bin/run.sh", + "finish-args": [ + "--share=network", + "--share=ipc", + "--socket=fallback-x11", + "--device=dri", + "--socket=wayland", + "--socket=pulseaudio", + "--allow=multiarch", + "--share=ipc", + "--socket=x11", + "--allow=devel", + "--system-talk-name=org.freedesktop.UDisks2", + "--system-talk-name=org.freedesktop.NetworkManager", + "--filesystem=xdg-desktop", + "--filesystem=xdg-documents", + "--filesystem=xdg-pictures", + "--filesystem=xdg-music", + "--filesystem=xdg-videos", + "--filesystem=xdg-download" + ], + "modules": [ + { + "name": "libudis86", + "builddir": true, + "buildsystem": "simple", + "build-commands": [ + "ar x udis86_1.72-4_i386.deb", + "tar xvf data.tar.xz", + "mkdir -p /app/lib/", + "cp -r ./usr/lib/* /app/lib/" + ], + "sources": [ + { + "type": "file", + "url": "https://community-packages.deepin.com/deepin/pool/non-free/u/udis86/udis86_1.72-4_i386.deb", + "sha256": "ec874ecdf12f95d634c038a4dd2915951aae09753f4baba50b2074d154e04374" + } + ] + }, + { + "name": "install", + "builddir": true, + "buildsystem": "simple", + "build-commands": [ + "install -Dm777 run.sh /app/bin/run.sh", + "install -Dm644 -t ${FLATPAK_DEST}/etc ld.so.conf", + "ar -p deepin-wine6-stable_6.0.0.42-1_amd64.deb data.tar.xz > data.tar.xz", + "tar xvf data.tar.xz", + "cp -r opt/deepin-wine6-stable /app/", + "mkdir -p /app/lib/i386-linux-gnu", + "mkdir -p /app/lib/i386-linux-toolchain", + "chmod 777 /app/lib/i386-linux-gnu", + "chmod 777 /app/lib/i386-linux-toolchain" + ], + "sources": [ + { + "type": "dir", + "path": "./", + "skip": ".flatpak-builder" + }, + { + "type": "file", + "url": "https://com-store-packages.uniontech.com/appstore/pool/appstore/d/deepin-wine6-stable/deepin-wine6-stable_6.0.0.42-1_amd64.deb", + "sha256": "8e4055cc56c70ad1d4dedff515714b625a6264c11e727e99f05bf4b936a77939" + } + ] + } + ] +} diff --git a/ld.so.conf b/ld.so.conf new file mode 100644 index 0000000..c118708 --- /dev/null +++ b/ld.so.conf @@ -0,0 +1,3 @@ +/app/lib/ +/app/lib/i386-linux-gnu +/app/deepin-wine6-stable/lib/ diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..282093d --- /dev/null +++ b/readme.md @@ -0,0 +1,21 @@ +# deepin-wine6-stable + +- for 32位支持 + +```shell +# 需要安装依赖 +org.freedesktop.Platform.Compat.i386 +org.freedesktop.Sdk.Extension.toolchain-i386 +``` + +- 运行 + +```shell +flatpak run com.deepinwine6.stable + +# 或者自行运行 +flatpak run --command=sh com.deepinwine6.stable +export WINEPREFIX=$XDG_DATA_HOME/deepinwine6 +export WINEARCH=win32 +/app/deepin-wine6-stable/bin/winecfg +``` diff --git a/run.sh b/run.sh new file mode 100644 index 0000000..356bebc --- /dev/null +++ b/run.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +# 创建新的运行文件夹 +export WINEPREFIX=$XDG_DATA_HOME/deepinwine6 +export WINEARCH=win32 +export PATH=/app/deepin-wine6-stable/bin/:$PATH +# ldd /app/deepin-wine6-stable/lib/ntdll.so +# ldd /app/lib/libudis86.so.0 + +winecfg