From b59571d6511660fd1dc9c74a339fe653a64bb6f5 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 17:58:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冷晶川 --- com.deepinwine6.stable.json | 136 ++++++++++++++++++++++++++++++------ readme.md | 8 ++- run.sh | 3 + smb.json | 72 +++++++++++++++++++ 4 files changed, 198 insertions(+), 21 deletions(-) create mode 100644 smb.json diff --git a/com.deepinwine6.stable.json b/com.deepinwine6.stable.json index 7dc833d..218512f 100644 --- a/com.deepinwine6.stable.json +++ b/com.deepinwine6.stable.json @@ -18,7 +18,7 @@ "--share=network", "--share=ipc", "--socket=fallback-x11", - "--device=dri", + "--device=all", "--socket=wayland", "--socket=pulseaudio", "--allow=multiarch", @@ -72,25 +72,6 @@ } ] }, - { - "name": "libsasl2", - "builddir": true, - "buildsystem": "simple", - "build-commands": [ - "ar x libsasl2-2_2.1.27.1-1%2Bdde_i386.deb", - "tar xvf data.tar.xz", - "mkdir -p /app/lib/", - "cp -r ./usr/lib/i386-linux-gnu/* /app/lib/", - "ls /app/lib/" - ], - "sources": [ - { - "type": "file", - "url": "https://community-packages.deepin.com/deepin/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.27.1-1%2Bdde_i386.deb", - "sha256": "8f1b65db19239c072689a9775da2699cada23e99738c5b01d13e293cf899bdbd" - } - ] - }, { "name": "perl-modules", "buildsystem": "simple", @@ -163,6 +144,121 @@ } ] }, + { + "name": "libkrb5", + "builddir": true, + "buildsystem": "simple", + "build-commands": [ + "ar x libkrb5-3_1.17.4-1%2Beagle_i386.deb", + "tar xvf data.tar.xz", + "mkdir -p /app/lib/", + "cp -r ./usr/lib/i386-linux-gnu/* /app/lib/", + "ls /app/lib/" + ], + "sources": [ + { + "type": "file", + "url": "https://community-packages.deepin.com/deepin/pool/main/k/krb5/libkrb5-3_1.17.4-1%2Beagle_i386.deb", + "sha256": "22eea2c5bc808a13ad597e3b604c305cb42a4ba9afb1893b2421e13b707df57a" + } + ] + }, + { + "name": "libk5crypto3", + "builddir": true, + "buildsystem": "simple", + "build-commands": [ + "ar x libk5crypto3_1.17.6-deepin1_i386.deb", + "tar xvf data.tar.xz", + "mkdir -p /app/lib/", + "cp -r ./usr/lib/i386-linux-gnu/* /app/lib/", + "ls /app/lib/" + ], + "sources": [ + { + "type": "file", + "url": "https://community-packages.deepin.com/deepin/pool/main/k/krb5/libk5crypto3_1.17.6-deepin1_i386.deb", + "sha256": "ba3cf82cc74a511afb4a903fa3c0b338d8dfb365d893102d76a434ccc4a51bd9" + } + ] + }, + { + "name": "libkrb5support", + "builddir": true, + "buildsystem": "simple", + "build-commands": [ + "ar x libkrb5support0_1.17.6-deepin1_i386.deb", + "tar xvf data.tar.xz", + "mkdir -p /app/lib/", + "cp -r ./usr/lib/i386-linux-gnu/* /app/lib/", + "ls /app/lib/" + ], + "sources": [ + { + "type": "file", + "url": "https://community-packages.deepin.com/deepin/pool/main/k/krb5/libkrb5support0_1.17.6-deepin1_i386.deb", + "sha256": "4b29970c32df139bd6fe361967e2311192610885d91cb13e17b293db06871472" + } + ] + }, + { + "name": "libkeyutils", + "builddir": true, + "buildsystem": "simple", + "build-commands": [ + "ar x libkeyutils1_1.6-6_i386.deb", + "tar xvf data.tar.xz", + "mkdir -p /app/lib/", + "cp -r ./lib/i386-linux-gnu/* /app/lib/", + "ls /app/lib/" + ], + "sources": [ + { + "type": "file", + "url": "https://community-packages.deepin.com/deepin/pool/main/k/keyutils/libkeyutils1_1.6-6_i386.deb", + "sha256": "a6aee2dc20424ab6488b2f6c0a47ccc697713774472aef632f71e37966efcf44" + } + ] + }, + + { + "name": "libgssapi-krb5", + "builddir": true, + "buildsystem": "simple", + "build-commands": [ + "ar x libgssapi-krb5-2_1.17.6-deepin1_i386.deb", + "tar xvf data.tar.xz", + "mkdir -p /app/lib/", + "cp -r ./usr/lib/i386-linux-gnu/* /app/lib/", + "ls /app/lib/" + ], + "sources": [ + { + "type": "file", + "url": "https://community-packages.deepin.com/deepin/pool/main/k/krb5/libgssapi-krb5-2_1.17.6-deepin1_i386.deb", + "sha256": "9fae5c0b4924a726ac406927edd67fe82a518940dff9d15acb93b78879cf0bd2" + } + ] + }, + { + "name": "libsasl2", + "builddir": true, + "buildsystem": "simple", + "build-commands": [ + "ar x libsasl2-2_2.1.27.1-1%2Bdde_i386.deb", + "tar xvf data.tar.xz", + "mkdir -p /app/lib/", + "cp -r ./usr/lib/i386-linux-gnu/* /app/lib/", + "ls /app/lib/" + ], + "sources": [ + { + "type": "file", + "url": "https://community-packages.deepin.com/deepin/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.27.1-1%2Bdde_i386.deb", + "sha256": "8f1b65db19239c072689a9775da2699cada23e99738c5b01d13e293cf899bdbd" + } + ] + }, { "name": "install", "builddir": true, diff --git a/readme.md b/readme.md index eddfc31..6002d7f 100644 --- a/readme.md +++ b/readme.md @@ -23,5 +23,11 @@ export WINEARCH=win32 - 其他 ```shell -# 依赖包含samba,是兼容部分程序使用了 ntlm_auth +# 依赖包含krb5,是兼容部分程序使用了 ntlm_auth; x86的话可以直接安装smb服务就支持了 + +# 字体 +$WINEPREFIX/drive_c/windows/Fonts + +# 如果异常进入app,删除目录: 然后重新指定WINEPREFIX并安装window程序 +$XDG_DATA_HOME/deepinwine6 ``` diff --git a/run.sh b/run.sh index 0c5a922..4b7b495 100644 --- a/run.sh +++ b/run.sh @@ -7,6 +7,9 @@ export PATH=/app/deepin-wine6-stable/bin/:$PATH # ldd /app/deepin-wine6-stable/lib/ntdll.so # ldd /app/lib/libudis86.so.0 # ldd /app/deepin-wine6-stable/lib/wldap32.dll.so +# ldd /app/lib/libgssapi_krb5.so.2 +# http://ftp.kaist.ac.kr/debian-ports/pool-hurd-i386/main/s/samba/ winecfg # wine "/home/jcleng/Downloads/my/drive_c/Program Files/Tencent/WeChat/WeChat.exe" # wine "$XDG_DATA_HOME/deepinwine6/drive_c/Program Files/Tencent/WeChat/WeChat.exe" +# Make sure that ntlm_auth >= 3.0.25 is in your path. Usually, diff --git a/smb.json b/smb.json new file mode 100644 index 0000000..185e066 --- /dev/null +++ b/smb.json @@ -0,0 +1,72 @@ +{ + "name": "perl-modules", + "buildsystem": "simple", + "build-commands": [ + "echo 'this is a workaround for a flatpak+perl limitation'", + "tar xhf Parse-Yapp-1.21.tar.gz", + "tar xhf JSON-4.10.tar.gz", + "cd Parse-Yapp-1.21 && perl Makefile.PL PREFIX=/app && make && make install", + "cd JSON-4.10 && perl Makefile.PL PREFIX=/app && make && make install", + "ln -s /app/lib/perl5/site_perl/5.36.0/$(basename `ls -d /usr/lib/perl5/5.36.0/*-linux`) /app/lib/perl5/site_perl/5.36.0/arch" + ], + "post-install": [ + "chmod -R u+w /app/lib/perl5/site_perl" + ], + "sources": [ + { + "type": "file", + "url": "https://cpan.metacpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz", + "sha256": "3810e998308fba2e0f4f26043035032b027ce51ce5c8a52a8b8e340ca65f13e5", + "x-checker-data": { + "type": "anitya", + "project-id": 3197, + "stable-only": true, + "url-template": "https://cpan.metacpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-$version.tar.gz" + } + }, + { + "type": "file", + "url": "https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/JSON-4.10.tar.gz", + "sha256": "df8b5143d9a7de99c47b55f1a170bd1f69f711935c186a6dc0ab56dd05758e35", + "x-checker-data": { + "type": "anitya", + "project-id": 12847, + "stable-only": true, + "url-template": "https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/JSON-$version.tar.gz" + } + } + ] +}, +{ + "name": "rpcsvc-proto", + "sources": [ + { + "type": "archive", + "url": "https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4.2/rpcsvc-proto-1.4.2.tar.xz", + "sha256": "678851b9f7ddf4410d2859c12016b65a6dd1a0728d478f18aeb54d165352f17c" + } + ] +}, +{ + "name": "samba", + "buildsystem": "autotools", + "config-opts": [ + "--without-json", + "--without-ad-dc", + "--without-ldap", + "--without-ads", + "--without-pam" + ], + "build-options": { + "env": { + "PERLLIB": "/app/lib/perl5/site_perl/5.36.0:/app/lib/perl5/site_perl/5.36.0/arch" + } + }, + "sources": [ + { + "type": "archive", + "url": "https://download.samba.org/pub/samba/stable/samba-4.18.2.tar.gz", + "sha256": "5bf87e179616cd12a52d85fb8b26eec709f13709a2b67fe42b1fb0213f7e8106" + } + ] +},