diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 32e085f5..b3fbeea5 100644 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -1,23 +1,43 @@ История изменений и дальнейшие планы: ----------------------------------------- В планах: +* иконка в трей для PortProton (перенести reset в GUI PortProton) +* обновление скриптов перед проверкой актуальности версии libs * создать ветку beta на github и сделать выбор версии внутри порта * добавить фикс установки dotnet * добавить кнопку очистки префикса в PortProton * проверка версий и обновления скриптов из https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.zip * EDIT DB открывается не у всех * пересоздать удаление PortProton (чистка ярлыков в меню с помощью grep "путь до порта") -* иконка в трей для PortProton (перенести reset в GUI PortProton) * добавить контроль за окнами для правильного отключения прогресс бара * зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 1105### +* для распаковки exe файлов при автоматических установках лаунчеров используется 7z вместо 7zr + +###Scripts version 1104### +* крупное обновлеение контейнера (libs_v16): + - добавлен /bin/yad_new версии 10.1 скомпилированный специально для будущего меню в трее) + - обновлен MANGOHUD (требуется проверка под OpenGL) + - обновлен 7z необходимый для будущей автоматической установки Rockstar Game Launcher +* для тестовой поддержки wayland добавлена переменная в скрипт var: GDK_BACKEND="x11" +* обновлены DXVK и VKD3D до актуального состояния на 12.06.2021 + +###Scripts version 1103### +* HOTFIX - исправление функции pw_kill_autostart + +###Scripts version 1102### +* фикс создания ярлыка после автоматической установки STEAM +* в AUTOINSTALL добавлена функция pw_kill_autostart для запрета автозапуска лаунчера после автоматической установки +* добавлены настройки в ~/.Xresources для корректного отображения текста в xterm, если данного файла нет в корне домашнего каталога + ###PortProton-87### - RELEASE -* cтабильная версия wine proton 6.3-4 +* cтабильная версия wine proton 6.3-4 * стабильные версии новых скриптов 1101 ###Scripts version 1101### * переделан запуск контейнера (исправлены проблемы с правильной подгрузкой библиотек) -* автоматическая установка DLL в префикс выполняется под контейнером +* автоматическая установка DLL в префикс выполняется под контейнером * winecmd запускается из под xterm установленного в контейнер, что избавляет xterm как зависимость. * vcrun2019 снова устанавливается в штатном режиме * исправлена ошибка в скрипте при монтировании в контейнер diff --git a/data_from_portwine/dist/lib/wine/dxvk/d3d10.dll b/data_from_portwine/dist/lib/wine/dxvk/d3d10.dll new file mode 100755 index 00000000..a0cffa04 Binary files /dev/null and b/data_from_portwine/dist/lib/wine/dxvk/d3d10.dll differ diff --git a/data_from_portwine/dist/lib/wine/dxvk/d3d10_1.dll b/data_from_portwine/dist/lib/wine/dxvk/d3d10_1.dll new file mode 100755 index 00000000..69b16162 Binary files /dev/null and b/data_from_portwine/dist/lib/wine/dxvk/d3d10_1.dll differ diff --git a/data_from_portwine/dist/lib/wine/dxvk/d3d10core.dll b/data_from_portwine/dist/lib/wine/dxvk/d3d10core.dll new file mode 100755 index 00000000..8c60eebd Binary files /dev/null and b/data_from_portwine/dist/lib/wine/dxvk/d3d10core.dll differ diff --git a/data_from_portwine/dist/lib/wine/dxvk/d3d11.dll b/data_from_portwine/dist/lib/wine/dxvk/d3d11.dll new file mode 100755 index 00000000..9618580c Binary files /dev/null and b/data_from_portwine/dist/lib/wine/dxvk/d3d11.dll differ diff --git a/data_from_portwine/dist/lib/wine/dxvk/d3d9.dll b/data_from_portwine/dist/lib/wine/dxvk/d3d9.dll new file mode 100755 index 00000000..65d09741 Binary files /dev/null and b/data_from_portwine/dist/lib/wine/dxvk/d3d9.dll differ diff --git a/data_from_portwine/dist/lib/wine/dxvk/dxgi.dll b/data_from_portwine/dist/lib/wine/dxvk/dxgi.dll new file mode 100755 index 00000000..0e391fb1 Binary files /dev/null and b/data_from_portwine/dist/lib/wine/dxvk/dxgi.dll differ diff --git a/data_from_portwine/dist/lib/wine/dxvk/dxvk_config.dll b/data_from_portwine/dist/lib/wine/dxvk/dxvk_config.dll new file mode 100755 index 00000000..02be4314 Binary files /dev/null and b/data_from_portwine/dist/lib/wine/dxvk/dxvk_config.dll differ diff --git a/data_from_portwine/dist/lib/wine/dxvk/openvr_api_dxvk.dll b/data_from_portwine/dist/lib/wine/dxvk/openvr_api_dxvk.dll new file mode 100644 index 00000000..4b06e42a Binary files /dev/null and b/data_from_portwine/dist/lib/wine/dxvk/openvr_api_dxvk.dll differ diff --git a/data_from_portwine/dist/lib/wine/dxvk/version b/data_from_portwine/dist/lib/wine/dxvk/version new file mode 100644 index 00000000..de624402 --- /dev/null +++ b/data_from_portwine/dist/lib/wine/dxvk/version @@ -0,0 +1 @@ + 01033af9a4c76c0c9bf9182fcefa31cddd29d2cd dxvk (v1.8.1-140-g01033af9) diff --git a/data_from_portwine/dist/lib/wine/vkd3d-proton/d3d12.dll b/data_from_portwine/dist/lib/wine/vkd3d-proton/d3d12.dll new file mode 100755 index 00000000..3ed0cdb1 Binary files /dev/null and b/data_from_portwine/dist/lib/wine/vkd3d-proton/d3d12.dll differ diff --git a/data_from_portwine/dist/lib/wine/vkd3d-proton/libvkd3d-proton-utils-3.dll b/data_from_portwine/dist/lib/wine/vkd3d-proton/libvkd3d-proton-utils-3.dll new file mode 100755 index 00000000..2629155c Binary files /dev/null and b/data_from_portwine/dist/lib/wine/vkd3d-proton/libvkd3d-proton-utils-3.dll differ diff --git a/data_from_portwine/dist/lib/wine/vkd3d-proton/version b/data_from_portwine/dist/lib/wine/vkd3d-proton/version new file mode 100644 index 00000000..193c46f1 --- /dev/null +++ b/data_from_portwine/dist/lib/wine/vkd3d-proton/version @@ -0,0 +1 @@ + 3b1f34217cba4d85d324fe7973e954990b6aec8e vkd3d-proton (vkd3d-1.1-2126-g3b1f3421) diff --git a/data_from_portwine/dist/lib64/wine/dxvk/d3d10.dll b/data_from_portwine/dist/lib64/wine/dxvk/d3d10.dll new file mode 100755 index 00000000..03a541af Binary files /dev/null and b/data_from_portwine/dist/lib64/wine/dxvk/d3d10.dll differ diff --git a/data_from_portwine/dist/lib64/wine/dxvk/d3d10_1.dll b/data_from_portwine/dist/lib64/wine/dxvk/d3d10_1.dll new file mode 100755 index 00000000..5c7b2756 Binary files /dev/null and b/data_from_portwine/dist/lib64/wine/dxvk/d3d10_1.dll differ diff --git a/data_from_portwine/dist/lib64/wine/dxvk/d3d10core.dll b/data_from_portwine/dist/lib64/wine/dxvk/d3d10core.dll new file mode 100755 index 00000000..f8d3cc0f Binary files /dev/null and b/data_from_portwine/dist/lib64/wine/dxvk/d3d10core.dll differ diff --git a/data_from_portwine/dist/lib64/wine/dxvk/d3d11.dll b/data_from_portwine/dist/lib64/wine/dxvk/d3d11.dll new file mode 100755 index 00000000..7174d586 Binary files /dev/null and b/data_from_portwine/dist/lib64/wine/dxvk/d3d11.dll differ diff --git a/data_from_portwine/dist/lib64/wine/dxvk/d3d9.dll b/data_from_portwine/dist/lib64/wine/dxvk/d3d9.dll new file mode 100755 index 00000000..2f569aa4 Binary files /dev/null and b/data_from_portwine/dist/lib64/wine/dxvk/d3d9.dll differ diff --git a/data_from_portwine/dist/lib64/wine/dxvk/dxgi.dll b/data_from_portwine/dist/lib64/wine/dxvk/dxgi.dll new file mode 100755 index 00000000..11a07205 Binary files /dev/null and b/data_from_portwine/dist/lib64/wine/dxvk/dxgi.dll differ diff --git a/data_from_portwine/dist/lib64/wine/dxvk/dxvk_config.dll b/data_from_portwine/dist/lib64/wine/dxvk/dxvk_config.dll new file mode 100755 index 00000000..fa9a053c Binary files /dev/null and b/data_from_portwine/dist/lib64/wine/dxvk/dxvk_config.dll differ diff --git a/data_from_portwine/dist/lib64/wine/dxvk/openvr_api_dxvk.dll b/data_from_portwine/dist/lib64/wine/dxvk/openvr_api_dxvk.dll new file mode 100644 index 00000000..114a983c Binary files /dev/null and b/data_from_portwine/dist/lib64/wine/dxvk/openvr_api_dxvk.dll differ diff --git a/data_from_portwine/dist/lib64/wine/dxvk/version b/data_from_portwine/dist/lib64/wine/dxvk/version new file mode 100644 index 00000000..de624402 --- /dev/null +++ b/data_from_portwine/dist/lib64/wine/dxvk/version @@ -0,0 +1 @@ + 01033af9a4c76c0c9bf9182fcefa31cddd29d2cd dxvk (v1.8.1-140-g01033af9) diff --git a/data_from_portwine/dist/lib64/wine/vkd3d-proton/d3d12.dll b/data_from_portwine/dist/lib64/wine/vkd3d-proton/d3d12.dll new file mode 100755 index 00000000..f818a7a7 Binary files /dev/null and b/data_from_portwine/dist/lib64/wine/vkd3d-proton/d3d12.dll differ diff --git a/data_from_portwine/dist/lib64/wine/vkd3d-proton/libvkd3d-proton-utils-3.dll b/data_from_portwine/dist/lib64/wine/vkd3d-proton/libvkd3d-proton-utils-3.dll new file mode 100755 index 00000000..daba1810 Binary files /dev/null and b/data_from_portwine/dist/lib64/wine/vkd3d-proton/libvkd3d-proton-utils-3.dll differ diff --git a/data_from_portwine/dist/lib64/wine/vkd3d-proton/version b/data_from_portwine/dist/lib64/wine/vkd3d-proton/version new file mode 100644 index 00000000..193c46f1 --- /dev/null +++ b/data_from_portwine/dist/lib64/wine/vkd3d-proton/version @@ -0,0 +1 @@ + 3b1f34217cba4d85d324fe7973e954990b6aec8e vkd3d-proton (vkd3d-1.1-2126-g3b1f3421) diff --git a/data_from_portwine/scripts/.Xresources b/data_from_portwine/scripts/.Xresources new file mode 100644 index 00000000..91daf726 --- /dev/null +++ b/data_from_portwine/scripts/.Xresources @@ -0,0 +1,85 @@ +xterm*faceSize: 12 +xterm*vt100*geometry: 120x20 +xterm*saveLines: 16384 +xterm*loginShell: true +xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48 +xterm*termName: xterm-color +xterm*eightBitInput: false + +!BLK Cursor +#define _color0 #000d18 +#define _color8 #000d18 +!RED Tag +#define _color1 #e89393 +#define _color9 #e89393 +!GRN SpecialKey +#define _color2 #9ece13 +#define _color10 #9ece13 +!YEL Keyword +#define _color3 #f0dfaf +#define _color11 #f0dfaf +!BLU Number +#define _color4 #8cd0d3 +#define _color12 #8cd0d3 +!MAG Precondit +#define _color5 #c0bed1 +#define _color13 #c0bed1 +!CYN Float +#define _color6 #dfaf8f +#define _color14 #dfaf8f +!WHT Search +#define _color7 #efefef +#define _color15 #efefef +!FMT Include, StatusLine, ErrorMsg +#define _colorBD #ffcfaf +#define _colorUL #ccdc90 +#define _colorIT #80d4aa +!TXT Normal, Normal, Cursor +#define _foreground #dcdccc +#define _background #1f1f1f +#define _cursorColor #8faf9f +URxvt*color0 : _color0 +URxvt*color1 : _color1 +URxvt*color2 : _color2 +URxvt*color3 : _color3 +URxvt*color4 : _color4 +URxvt*color5 : _color5 +URxvt*color6 : _color6 +URxvt*color7 : _color7 +URxvt*color8 : _color8 +URxvt*color9 : _color9 +URxvt*color10 : _color10 +URxvt*color11 : _color11 +URxvt*color12 : _color12 +URxvt*color13 : _color13 +URxvt*color14 : _color14 +URxvt*color15 : _color15 +URxvt*colorBD : _colorBD +URxvt*colorIT : _colorIT +URxvt*colorUL : _colorUL +URxvt*foreground : _foreground +URxvt*background : _background +URxvt*cursorColor : _cursorColor +XTerm*color0 : _color0 +XTerm*color1 : _color1 +XTerm*color2 : _color2 +XTerm*color3 : _color3 +XTerm*color4 : _color4 +XTerm*color5 : _color5 +XTerm*color6 : _color6 +XTerm*color7 : _color7 +XTerm*color8 : _color8 +XTerm*color9 : _color9 +XTerm*color10 : _color10 +XTerm*color11 : _color11 +XTerm*color12 : _color12 +XTerm*color13 : _color13 +XTerm*color14 : _color14 +XTerm*color15 : _color15 +XTerm*colorBD : _colorBD +XTerm*colorIT : _colorIT +XTerm*colorUL : _colorUL +XTerm*foreground : _foreground +XTerm*background : _background +XTerm*cursorColor : _cursorColor + diff --git a/data_from_portwine/scripts/autoinstall b/data_from_portwine/scripts/autoinstall index da358f55..8b14dddb 100644 --- a/data_from_portwine/scripts/autoinstall +++ b/data_from_portwine/scripts/autoinstall @@ -12,6 +12,23 @@ export PW_NO_FSYNC=1 export PW_NO_ESYNC=1 unset PORTWINE_CREATE_SHORTCUT_NAME +pw_kill_autostart () { + if [ "$PW_USE_RUNTIME" != 1 ] + then echo "PW_USE_RUNTIME: `echo $PW_USE_RUNTIME`" + else + sleep 10 + while true ; do + if [ -z `pgrep "$1" | head -n 1` ] && [ ! -z `pgrep wrap | head -n 1` ]; then + echo -e "PID "$1" not found" + sleep 1 + else + KILL_PORTWINE + break + fi + done + fi +} + PW_WGC () { export LAUNCH_PARAMETERS=("/VERYSILENT") [ "${update_loc}" = "RUS" ] && export WGC_LOC=RU || export WGC_LOC=EU @@ -20,16 +37,7 @@ PW_WGC () { if try_download "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}" then PW_START_PROGRESS_BAR_BLOCK "Starting WGC installation..." - while true ; do - if [ "$PW_USE_RUNTIME" != 1 ] ; then echo "PW_USE_RUNTIME: `echo $PW_USE_RUNTIME`" & break ; fi - if [ -z `pgrep wgc.exe` ] ; then - echo -e "PID WGC not found" - sleep 2 - else - KILL_PORTWINE - break - fi - done & + pw_kill_autostart wgc.exe & PW_RUN "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/wgc_api/wgc_api.exe" export PORTWINE_CREATE_SHORTCUT_NAME="Wargaming Game Center" @@ -47,6 +55,7 @@ PW_ORIGIN () { if try_download "https://download.dm.origin.com/origin/live/OriginSetup.exe" "${PW_AUTOINSTALL_EXE}" then PW_START_PROGRESS_BAR_BLOCK "Installing the Origin. Please wait..." + pw_kill_autostart Origin.exe & PW_RUN "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Origin/Origin.exe" PW_STOP_PROGRESS_BAR @@ -64,9 +73,8 @@ PW_BATTLE_NET () { if try_download "http://dist.blizzard.com/downloads/bna-installers/322d5bb9ae0318de3d4cde7641c96425/retail.1/Battle.net-Setup-${BN_LOC}.exe" "${PW_AUTOINSTALL_EXE}" then PW_START_PROGRESS_BAR "Installing the Battle Net. Please wait..." + pw_kill_autostart Battle.net.exe & PW_RUN "${PW_AUTOINSTALL_EXE}" - while [ ! -z `pgrep Battle.net* | head -n 1` ] && [ -z `pgrep Battle.net.exe | head -n 1` ] ; do sleep 2 ; done - KILL_PORTWINE portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "Battle.net.exe"` PW_STOP_PROGRESS PORTWINE_CREATE_SHORTCUT @@ -82,10 +90,11 @@ PW_EPIC () { if try_download "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" then PW_START_PROGRESS_BAR_BLOCK "Installing Epic Games Launcher. Please wait..." + pw_kill_autostart EpicGamesLauncher.exe PW_RUN msiexec /i "${PW_AUTOINSTALL_EXE}" & sleep 10 if [ ! -z `pgrep msiexec* | head -n 1` ] ; then - while [ ! -z `pgrep msiexec* | head -n 1` ] || [ ! -z `pgrep rundll32* | head -n 1` ] ; do + while [ ! -z `pgrep msiexec* | head -n 1` ] || [ ! -z `pgrep rundll32* | head -n 1` ] || [ ! -z `pgrep wrap | head -n 1` ]; do [ ! -z `pgrep rundll32* | head -n 1` ] && kill -n 9 `pgrep rundll32* | head -n 1` && echo "Kill rundll32.exe" sleep 5 done @@ -106,6 +115,7 @@ PW_GOG () { if try_download "https://content-system.gog.com/open_link/download?path=/open/galaxy/client/2.0.35.19/setup_galaxy_2.0.35.19a.exe" "${PW_AUTOINSTALL_EXE}" then PW_START_PROGRESS_BAR_CS "Installing the GOG Galaxy. Please wait..." + pw_kill_autostart GalaxyClient.exe & PW_RUN "${PW_AUTOINSTALL_EXE}" portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "GalaxyClient.exe"` try_remove_file "${PW_AUTOINSTALL_EXE}" @@ -145,6 +155,7 @@ PW_UBC () { if try_download "https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" then PW_START_PROGRESS_BAR_CS "Installing the Ubisoft Connect. Please wait..." + pw_kill_autostart UbisoftConnect.exe & PW_RUN "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Ubisoft Game Launcher/UbisoftConnect.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" @@ -162,8 +173,12 @@ PW_STEAM () { if try_download "https://cdn.cloudflare.steamstatic.com/client/installer/SteamSetup.exe" "${PW_AUTOINSTALL_EXE}" then PW_START_PROGRESS_BAR_CS "Installing the Steam. Please wait..." + pw_kill_autostart steam.exe & PW_RUN "${PW_AUTOINSTALL_EXE}" - portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Steam/Steam.exe" + if [ -f "$WINEPREFIX/drive_c/Program Files (x86)/Steam/Steam.exe" ] + then mv -f "$WINEPREFIX/drive_c/Program Files (x86)/Steam/Steam.exe" "$WINEPREFIX/drive_c/Program Files (x86)/Steam/steam.exe" + fi + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Steam/steam.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" KILL_PORTWINE PW_STOP_PROGRESS_BAR diff --git a/data_from_portwine/scripts/portwine_db/wgc b/data_from_portwine/scripts/portwine_db/wgc index 6650edd1..bab7b3ff 100644 --- a/data_from_portwine/scripts/portwine_db/wgc +++ b/data_from_portwine/scripts/portwine_db/wgc @@ -11,6 +11,6 @@ export LAUNCH_PARAMETERS="--disable-gpu" # Additional launch options export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP #export PW_NVAPI_DISABLE=1 #export WINEDLLOVERRIDES="ucrtbase,xaudio2_7,xaudio2_8=n" -export PW_DLL_INSTALL="lucida" # Install DDL in port prefix (used winetricks) +export PW_DLL_INSTALL="lucida vcrun2019" # Install DDL in port prefix (used winetricks) ##export PW_GUI_DISABLED_CS=1 ##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index b2406247..4108914e 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -186,9 +186,9 @@ PW_STOP_PROGRESS_BAR () { done } PW_LOAD_LIBS () { - if [ ! -e "${PW_WINELIB}/runtime/bin/yad" ] || [ ! -e "${PW_WINELIB}/runtime/lib/p7zip/7zr" ] \ + if [ ! -e "${PW_WINELIB}/runtime/bin/yad" ] || [ ! -e "${PW_WINELIB}/runtime/lib/p7zip/7z" ] \ || [ ! -e "${PW_WINELIB}/runtime/bin/vkcube" ] || [ ! -e "${PW_WINELIB}/runtime/bin/xterm" ] || \ - [ -e "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" ] ; then + [ -e "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" ] ; then print_info "Download and install libraries..." if try_download "https://github.com/Castro-Fidel/PortWINE/releases/download/libs${pw_libs_ver}/libs${pw_libs_ver}.tar.xz" "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" ; then if unpack_tar_xz "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" "${HOME}/.PortWINE/" ; then @@ -208,7 +208,7 @@ PW_LOAD_LIBS () { fi export pw_yad="${PW_WINELIB}/runtime/bin/yad" export pw_zstd="${PW_WINELIB}/runtime/bin/zstd" - export pw_7z="${PW_WINELIB}/runtime/lib/p7zip/7zr" + export pw_7z="${PW_WINELIB}/runtime/lib/p7zip/7z" if [ -x "`which xterm 2>/dev/null`" ]; then export SYS_XTERM=`which xterm` export PW_XTERM="${SYS_XTERM} -geometry 159x37 -e" @@ -277,6 +277,11 @@ START_PORTWINE () elif [ -x "`which xterm 2>/dev/null`" ]; then export PW_TERM="${PW_XTERM}" else export PW_TERM="${PW_XTERM}" fi + if [ ! -f "${HOME}/.Xresources" ]; then + cp -f "${PORT_SCRIPTS_PATH}/.Xresources" "${HOME}" + xrdb -merge "${HOME}/.Xresources" + fi + PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..." export WINE_GST_REGISTRY_DIR="${PORT_WINE_TMP_PATH}" @@ -317,7 +322,7 @@ START_PORTWINE () --" export PRESSURE_VESSEL_VARIABLE_DIR="${PW_WINELIB}/runtime" export PRESSURE_VESSEL_REMOVE_GAME_OVERLAY=1 - # export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=1 + export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=1 export PRESSURE_VESSEL_GC_RUNTIMES=0 export PRESSURE_VESSEL_GC_LEGACY_RUNTIMES=0 export PRESSURE_VESSEL_RUNTIME_BASE="${PW_WINELIB}" @@ -552,6 +557,7 @@ RUN_WINETRICKS_FROM_DB () { if [ "${USE_WT_FROM_DB}" == "1" ] ; then PW_STOP_PROGRESS_BAR print_info "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" + chmod -R 775 "${HOME}/.cache/winetricks" ${PW_RUNTIME} xterm -e env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${PORT_WINE_TMP_PATH}/winetricks" -q ${PW_DLL_NEED_INSTALL} fi PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..." diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh index 4f1a8fe8..283fd721 100755 --- a/data_from_portwine/scripts/setup.sh +++ b/data_from_portwine/scripts/setup.sh @@ -8,7 +8,7 @@ try_remove_file "${PORT_WINE_TMP_PATH}/init_run_suc" try_remove_file "${PORT_WINE_PATH}/data/port_on" try_remove_file "${PORT_WINE_PATH}/settings.desktop" try_remove_file "${PORT_WINE_PATH}/debug.desktop" -try_remove_file "${PORT_WINE_PATH}/restart.desktop" +try_remove_file "${PORT_WINE_PATH}/reset.desktop" try_remove_dir "${PORT_WINE_PATH}/data/pfx/dosdevices" try_remove_dir "${PORT_WINE_PATH}/Settings" @@ -16,7 +16,7 @@ try_remove_dir "${PORT_SCRIPTS_PATH}/vars" create_new_dir "/home/${USER}/.local/share/applications" -name_desktop="PortProton" +name_desktop="PortProton" echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Exec=env "${PORT_SCRIPTS_PATH}/start.sh %F"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" @@ -33,7 +33,7 @@ cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" /home/${USER}/.local/share/app update-desktop-database -q "${HOME}/.local/share/applications" xdg-mime default PortProton.desktop "application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program" -name_desktop="readme" +name_desktop="readme" echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Version=1.0" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" @@ -42,25 +42,11 @@ echo "Icon="${PORT_WINE_PATH}/data/img/readme.png"" >> "${PORT_WINE_PATH}/${name echo "URL=${urlg}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop" -for name_desktop in "reset" -do - echo ""[Desktop Entry]" - "Name=${name_desktop}" - "Exec=env "${PORT_SCRIPTS_PATH}/${name_desktop}"" - "Type=Application" - "Categories=Game" - "StartupNotify=true" - "Path="${PORT_SCRIPTS_PATH}/"" - "Icon="${PORT_WINE_PATH}/data/img/s.png""" > "${PORT_WINE_PATH}/${name_desktop}.desktop" - chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop" -done -chmod u+x "${PORT_SCRIPTS_PATH}/"* - if [ "${s_install}" = "1" ]; then echo "Installation completed successfully." else - `zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1 + `zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1 xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 -fi +fi unset INSTALLING_PORT \ No newline at end of file diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 997bbdd1..58018ede 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -20,10 +20,9 @@ export PW_WINEDBG_DISABLE=1 export PW_WINDOWS_VER="10" export WINEARCH="win64" - export mono_ver=6.1.2 export gecko_ver=2.47.2 -export pw_libs_ver="_v15" +export pw_libs_ver="_v16" export WINEDIR="${PORT_WINE_PATH}/data/dist" export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" @@ -32,6 +31,8 @@ export WINE_WIN_START="start.exe /i /unix" export porturl="http://portwine-linux.ru/" export PW_MUST_HAVE_DLL="" + +export GDK_BACKEND="x11" ######################################################################## ADD_IN_START_PORTWINE () {