diff --git a/data_from_portwine/LICENSE b/data_from_portwine/LICENSE deleted file mode 100644 index 69c95ec4..00000000 --- a/data_from_portwine/LICENSE +++ /dev/null @@ -1,221 +0,0 @@ -Copyright (c) 2018-2020, Valve Corporation -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Browse the source code for more information - - https://github.com/ValveSoftware/Proton - ----- ---- ---- ---- - -This software contains a modified version of Wine licensed under the LGPL 2.1. Wine is - - Copyright (c) 1993-2020 the Wine project authors - -Visit Wine at - - https://winehq.org - -View our modifications at - - https://github.com/ValveSoftware/wine - ----- ---- ---- ---- - -This software contains a modified version of DXVK licensed under the zlib/libpng license. DXVK is - - Copyright (c) 2017-2020 Philip Rebohle - Copyright (c) 2019-2020 Joshua Ashton - -Visit DXVK at - - https://github.com/doitsujin/dxvk - -View our modifications at - - https://github.com/ValveSoftware/dxvk - ----- ---- ---- ---- - -This software contains FAudio licensed under the zlib license. FAudio is - - Copyright (c) 2011-2020 Ethan Lee, Luigi Auriemma, and the MonoGame Team - -Visit FAudio at - - https://github.com/FNA-XNA/FAudio - ----- ---- ---- ---- - -This software contains some Liberation Fonts licensed under the SIL Open Font License, available at LICENSE.OFL. These fonts are - - Copyright (c) 2010 Google Corporation - Copyright (c) 2012 Red Hat, Inc. - -Visit Liberation Fonts at - - https://github.com/liberationfonts/liberation-fonts - ----- ---- ---- ---- - -This software contains Source Han Sans licensed under the SIL Open Font License, available at LICENSE.OFL. This font is - - Copyright 2014-2019 Adobe (http://www.adobe.com/) - -Visit Source Han Sans at - - https://github.com/adobe-fonts/source-han-sans - ----- ---- ---- ---- - -This software contains wine-mono, parts of which are included under a variety of licenses. - - Parts of Mono (mono/) are variously licensed under the GPL, LGPL, and MIT X11 licenses. All parts are available as LGPL or MIT X11 except for the following: - * The ICSharpCode.SharpZipLib library is available as GPL with an exception (see mono/mcs/class/ICSharpCode.SharpZipLib/README). - * mcs/jay is BSD-licensed. - - The Visual Basic class libraries (mono-basic/) are MIT X11. The compiler is LGPL v2. - - FNA is a mix of MSPL and MIT. It has the following library dependencies: - * FAudio, MojoShader, Theorafile, SDL2, SDL_image_compact, and SDL2-CS are zlib-licensed. SDL2-CS is built into FNA.dll. - * FNA.NetStub is MSPL. - - The winforms and wpf libraries are MIT. - -wine-mono itself is included under the MIT license. wine-mono is - - Copyright (c) 2012 Vincent Povirk for CodeWeavers - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - -Visit wine-mono at - - https://github.com/madewokherd/wine-mono - -View wine-mono's complete license at - - https://github.com/madewokherd/wine-mono/blob/master/COPYING - ----- ---- ---- ---- - -This software contains wine-gecko, parts of which are included under a variety of licenses. - -wine-gecko itself is included under the Mozilla Public License 2.0. - -wine-gecko is available in Source Code form at - - https://sourceforge.net/p/wine/wine-gecko - ----- ---- ---- ---- - -This software contains a modified version of Vkd3d licensed under the LGPL 2.1. Vkd3d is - - Copyright 2016-2019 the Vkd3d project authors - -Visit Vkd3d at - - https://source.winehq.org/git/vkd3d.git - -View our modifications at - - https://github.com/ValveSoftware/vkd3d - ----- ---- ---- ---- - -Parts of this software are based on the OpenVR SDK, which is - - Copyright (c) 2015, Valve Corporation - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation and/or - other materials provided with the distribution. - - 3. Neither the name of the copyright holder nor the names of its contributors - may be used to endorse or promote products derived from this software without - specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Visit OpenVR at - - https://github.com/ValveSoftware/openvr - ----- ---- ---- ---- - -Parts of this software are based on the AMD AGS library, which is - - Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index d89b9f01..32e085f5 100644 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -2,29 +2,32 @@ ----------------------------------------- В планах: * создать ветку beta на github и сделать выбор версии внутри порта -* перенести reset в GUI PortProton * добавить фикс установки dotnet * добавить кнопку очистки префикса в PortProton * проверка версий и обновления скриптов из https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.zip * EDIT DB открывается не у всех * пересоздать удаление PortProton (чистка ярлыков в меню с помощью grep "путь до порта") -* проверить windows steam и под PortProton работают только с Proton GE -* создать defaut префикс и сделать авто симлинки в другие префиксы (games, programm files, users) -* иконка в трей для PortProton +* иконка в трей для PortProton (перенести reset в GUI PortProton) * добавить контроль за окнами для правильного отключения прогресс бара -* добавлено отображение скорости интернета и примерный остаток времени при скачивании библиотек libs, gecko, mono * зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- -###Scripts version 1097### -* HOTFIX - исправлена ошибка в скрипте при монтировании +###PortProton-87### - RELEASE +* cтабильная версия wine proton 6.3-4 +* стабильные версии новых скриптов 1101 -###Scripts version 1096### -* HOTFIX - определение переменной PW_RUNTIME возвращено в скрипт runlib +###Scripts version 1101### +* переделан запуск контейнера (исправлены проблемы с правильной подгрузкой библиотек) +* автоматическая установка DLL в префикс выполняется под контейнером +* winecmd запускается из под xterm установленного в контейнер, что избавляет xterm как зависимость. +* vcrun2019 снова устанавливается в штатном режиме +* исправлена ошибка в скрипте при монтировании в контейнер +* добавлено отображение скорости интернета и примерный остаток времени при скачивании libs, gecko, mono -###Scripts version 1095### -* для систем основанных на Arch добавлен автоматический проброс /run/media -* все основные настройки контейнера перенесены в скрипт var: PW_RT_MOUNT_RO - только для чтения; PW_RT_MOUNT_RW - чтение и запись (пути писать в ковычках и разделять пробелом) Пример: PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}") -* vcrun2019 снова устанавливается в штатном режиме за счет использования версии winetricks от GE (https://raw.githubusercontent.com/GloriousEggroll/protonfixes/master/winetricks) +###PortProton-86### +* обновлен wine до версии Proton 6.9 GE 2 +* обновлены либы до версии libs_v15 + +### Скрипты с версии 1095 по 1100 - эксперементальные ### ###Scripts version 1094### * немного ускорена инициализация префикса @@ -32,6 +35,10 @@ * исправлено определение использования RUNTIME в логах * ${HOME}/.PortWINE под контейнетом всегда доступен, но только для чтения * добавлен автоматический проброс /media и /mnt в контейнер порта что позволяет запускать игры и программы установленные не в домашнем каталоге, как если бы порт работал без контейнера +* в AUTOINSTALL добавлены лаунчены UPLAY и STEAM +* тестовый фикс пропадания текстур под DXVK на некоторых системах +* для систем основанных на Arch добавлен автоматический проброс /run/media +* все основные настройки контейнера перенесены в скрипт var: PW_RT_MOUNT_RO - только для чтения; PW_RT_MOUNT_RW - чтение и запись (пути писать в ковычках и разделять пробелом) Пример: PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}") ###Scripts version 1093### * возвращена переменная в скрипте var: WINE_WIN_START="start.exe /i /unix" что возвращает запуск .bat файлов и решает проблему с запуском игры WoT из WGC @@ -40,11 +47,9 @@ * исправлена автоустановка WGC под запуском в контейнерном режиме * добавлен фикс работы старых версий порта с новыми скриптами * частичный откат кода со скриптов от PortProton-78 -* Установка xact_x64 совместно c xact по умолчанию с любым db файлом * контейнерный режим включен по умолчанию и отключается в скрипте "каталог_порта/data/scripts/var" переменной PW_USE_RUNTIME=(1 - включен; 0 - выключен) -###Scripts version 1091### -* Установка xact по умолчанию с любым db файлом + ###PortProton-85### 27.05.2021 ###Scripts version 1090### * для подготовки к релизу используется стабилная версия wine: Proton 6.3-4 diff --git a/data_from_portwine/img/gui/steam.png b/data_from_portwine/img/gui/steam.png new file mode 100644 index 00000000..e506d6a2 Binary files /dev/null and b/data_from_portwine/img/gui/steam.png differ diff --git a/data_from_portwine/img/gui/ubc.png b/data_from_portwine/img/gui/ubc.png new file mode 100644 index 00000000..6b7e544d Binary files /dev/null and b/data_from_portwine/img/gui/ubc.png differ diff --git a/data_from_portwine/scripts/autoinstall b/data_from_portwine/scripts/autoinstall index 4a2c7fe3..da358f55 100644 --- a/data_from_portwine/scripts/autoinstall +++ b/data_from_portwine/scripts/autoinstall @@ -13,30 +13,23 @@ export PW_NO_ESYNC=1 unset PORTWINE_CREATE_SHORTCUT_NAME PW_WGC () { - export LAUNCH_PARAMETERS=("/SILENT" "/SP-") + export LAUNCH_PARAMETERS=("/VERYSILENT") [ "${update_loc}" = "RUS" ] && export WGC_LOC=RU || export WGC_LOC=EU - export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Wargaming_Game_Center_Install_WoT_RU.exe" + export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" START_PORTWINE 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}" = 0 ] - then echo "PW_USE_RUNTIME: `echo $PW_USE_RUNTIME`" & break - fi + 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 - echo -e "PID WGC: `pgrep wgc.exe` \nPID Cont: `pidof -s bwrap`" - while [ ! -z `pgrep wgc.exe` ]; do - echo -e "PID WGC found: `pgrep wgc.exe` \nPID_Status: `echo $?`" - sleep 2 - KILL_PORTWINE - done + KILL_PORTWINE break fi done & - PW_START_PROGRESS_BAR_CS "Starting WGC installation..." 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" @@ -144,3 +137,37 @@ PW_EVE () { fi STOP_PORTWINE } + +PW_UBC () { + export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Ubisoft Game Launcher") + export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/UbisoftConnectInstaller.exe" + START_PORTWINE + 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_RUN "${PW_AUTOINSTALL_EXE}" + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Ubisoft Game Launcher/UbisoftConnect.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + KILL_PORTWINE + PW_STOP_PROGRESS_BAR + PORTWINE_CREATE_SHORTCUT + fi + STOP_PORTWINE +} + +PW_STEAM () { + export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Steam") + export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SteamSetup.exe" + START_PORTWINE + 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_RUN "${PW_AUTOINSTALL_EXE}" + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Steam/Steam.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + KILL_PORTWINE + PW_STOP_PROGRESS_BAR + PORTWINE_CREATE_SHORTCUT + fi + STOP_PORTWINE +} diff --git a/data_from_portwine/scripts/portwine_db/FL64 b/data_from_portwine/scripts/portwine_db/FL64 new file mode 100755 index 00000000..8c109b46 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/FL64 @@ -0,0 +1,39 @@ +#!/bin/bash + #Author: xuser + #FL.exe + #FL64.exe + #Rating=1-5 + ################################################ + export PW_VULKAN_USE=0 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP +##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) +export WINEDLLOVERRIDES="FLEngine,FLEngine_x64=n" +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +##export PW_DXVK_VER=1.8.1 +##export PW_VKD3D_VER=2.2 +##export PW_DXR_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_NVAPI_DISABLE=1 +##export PW_OLD_GL_STRING=0 +##export PW_HIDE_NVIDIA_GPU=0 +##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_VKD3D_FEATURE_LEVEL=0 +##export PW_DXGI_FROM_DXVK=0 +##export PW_VIRTUAL_DESKTOP=1 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +export PW_FORCE_DISABLED_GAMEMOD=1 # Force disabele gamemod +##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. +##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +##export PW_HEAP_DELAY_FREE=0 +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_USE_TERMINAL=0 # Force run in terminal +##export PW_LOG=0 # Enable debug mode fo terminal +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##ADD_IN_START_PORTWINE () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/Game-TS3 b/data_from_portwine/scripts/portwine_db/Game-TS3 new file mode 100755 index 00000000..b92cdc06 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Game-TS3 @@ -0,0 +1,7 @@ +#!/bin/bash +#Author: +#Game-TS3.exe +#Rating=5 +################################################ +export PW_VULKAN_USE=0 +export LAUNCH_PARAMETERS="" diff --git a/data_from_portwine/scripts/portwine_db/Medal Of Honor -Allied Assault b/data_from_portwine/scripts/portwine_db/Medal Of Honor -Allied Assault new file mode 100755 index 00000000..c842a9db --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Medal Of Honor -Allied Assault @@ -0,0 +1,10 @@ +#!/bin/bash +#Author: Ridbowt (Nikola P.) +#MOHAA.exe +#moh_spearhead.exe +#moh_breakthrough.exe +#Rating=5 +################################################ +export PW_VULKAN_USE=0 +export LAUNCH_PARAMETERS="" +export MESA_EXTENSION_MAX_YEAR=2002 diff --git a/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher b/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher new file mode 100755 index 00000000..9d570aca --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher @@ -0,0 +1,23 @@ +#!/bin/bash + #Author: cefeiko + #WorldOfTanksEnCoreLauncher.exe + #Rating=1-5 + ################################################ + export PW_VULKAN_USE=dxvk + export PW_USE_TERMINAL=0 + export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_dotnet/" + export PW_DLL_INSTALL="vcrun2017 vcrun6 mfc42 vb6run physx dotnet40 " # Install DDL in port prefix (used winetricks) + export PW_COMMENT_DB="World Of Tanks EnCore" + ## export DXVK_HUD=fps,devinfo + ## export PW_MANGOHUD=1 +#####################examples########################### +while [ `pidof -s dotNetFx40_Full_x86_x64.exe` ] ; do + if [ $? -eq 0 ] ; then + sleep 1 + elif + export dotnet_pids=`ps -ax | grep mscorsvw.exe | awk '{print $1}' | uniq` + [ ! -z $dotnet_pids ] + kill -n 9 $dotnet_pids + sleep 1 + fi +done diff --git a/data_from_portwine/scripts/reset b/data_from_portwine/scripts/reset deleted file mode 100755 index d8fdee7c..00000000 --- a/data_from_portwine/scripts/reset +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# Author: PortWINE-Linux.ru -. "$(dirname $(readlink -f "$0"))/runlib" -KILL_PORTWINE -if [ -e "${PORT_WINE_TMP_PATH}/pw_vulkan" ]; then - rm -f "${PORT_WINE_TMP_PATH}/pw_vulkan" -fi diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index e131c8e7..b2406247 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -1,6 +1,6 @@ #!/bin/bash # Author: Castro-Fidel (PortWINE-Linux.ru) -# Development assistants: Cefeiko; Rus_Nor; gavr; RidBowt; Dezert1r +# Development assistants: Cefeiko; Rus_Nor; gavr; RidBowt; Dezert1r; Taz_mania; Anton_Famillianov ######################################################################## echo ' ████─████─████─███─█───█─███─█──█─███ @@ -83,7 +83,7 @@ try_force_link_dir () { try_download () { set -o pipefail wget -c -t 5 -T 2 "$1" --output-document="$2" 2>&1 | \ - sed -u 's/^[a-zA-Z\-].*//; s/.* \{1,2\}\([0-9]\{1,3\}\)%.*/\1\n#Downloading... \1%/; s/^20[0-9][0-9].*/#Done./' | \ + sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 } @@ -163,7 +163,7 @@ pw_clear_pfx () { try_remove_dir "${WINEPREFIX}/drive_c/Program Files (x86)/Common Files" try_remove_dir "${WINEPREFIX}/drive_c/Program Files (x86)/Windows Media Player" try_remove_dir "${WINEPREFIX}/drive_c/Program Files (x86)/Windows NT" - try_remove_dir "${PORT_WINE_TMP_PATH}/mesa_shader_cache" + try_remove_dir "${PORT_WINE_TMP_PATH}/mesa_shader_cache" rm -f "${PORT_WINE_TMP_PATH}"/*.bin rm -f "${PORT_WINE_TMP_PATH}"/*.foz } @@ -182,11 +182,11 @@ PW_START_PROGRESS_BAR_BLOCK () { } PW_STOP_PROGRESS_BAR () { while [ ! -z "`pgrep -a yad | grep "\-\-progress" | awk '{print $1}'`" ] - do kill -n 9 `pgrep -a yad | grep "\-\-progress" | awk '{print $1}' | head -n 1` + do kill -n 9 `pgrep -a yad | grep "\-\-progress" | awk '{print $1}' | head -n 1` &> /dev/null done } PW_LOAD_LIBS () { - if [ ! -e "${PW_WINELIB}/run-in-soldier" ] || [ ! -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/7zr" ] \ || [ ! -e "${PW_WINELIB}/runtime/bin/vkcube" ] || [ ! -e "${PW_WINELIB}/runtime/bin/xterm" ] || \ [ -e "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" ] ; then print_info "Download and install libraries..." @@ -279,15 +279,26 @@ START_PORTWINE () fi PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..." + export WINE_GST_REGISTRY_DIR="${PORT_WINE_TMP_PATH}" + export MEDIACONV_AUDIO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/audio.foz + export MEDIACONV_AUDIO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_audio.foz + export MEDIACONV_VIDEO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/video.foz + export MEDIACONV_VIDEO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_video.foz + export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0" + export STAGING_SHARED_MEMORY=1 + export PW_FORCE_LARGE_ADDRESS_AWARE=1 + export WINE="${WINEDIR}/bin/wine" export WINELOADER="${WINEDIR}/bin/wine" export WINESERVER="${WINEDIR}/bin/wineserver" export WINEDLLPATH="${WINEDIR}/lib/wine" + export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib" + create_new_dir "${WINEDIR}/share/wine/" - try_remove_dir"${WINEDIR}"/share/wine/gecko - try_remove_dir"${WINEDIR}"/share/wine/mono + try_remove_dir "${WINEDIR}"/share/wine/gecko + try_remove_dir "${WINEDIR}"/share/wine/mono try_force_link_dir "${HOME}/.PortWINE/gecko" "${WINEDIR}"/share/wine/ try_force_link_dir "${HOME}/.PortWINE/mono" "${WINEDIR}"/share/wine/ - if [ -d ${PATH_TO_GAME} ] + if [ -d "${PATH_TO_GAME}" ] then export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine:${PATH_TO_GAME}" else export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" fi @@ -295,12 +306,22 @@ START_PORTWINE () then export PATH="${WINEDIR}/bin:${PATH}" else export PATH="${WINEDIR}/bin" fi - export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib" if [ "${PW_USE_RUNTIME}" = 0 ] ; then export PW_RUNTIME="" echo "RUNTIME is disabled" else - export PW_RUNTIME="${PW_WINELIB}/run-in-soldier --share-home --filesystem="${PORT_WINE_PATH}" --runtime=runtime --" + export PW_AND_RUNTIME_LIBRARY_PATH="/overrides/lib/x86_64-linux-gnu:/overrides/lib/x86_64-linux-gnu/aliases:/overrides/lib/i386-linux-gnu:/overrides/lib/i386-linux-gnu/aliases:" + export PW_RUNTIME="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \ + --share-home \ + --runtime=${PW_WINELIB}/runtime \ + --" + 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_GC_RUNTIMES=0 + export PRESSURE_VESSEL_GC_LEGACY_RUNTIMES=0 + export PRESSURE_VESSEL_RUNTIME_BASE="${PW_WINELIB}" + export PRESSURE_VESSEL_PREFIX="${PW_WINELIB}/pressure-vessel" unset PRESSURE_VESSEL_FILESYSTEMS_RO unset PRESSURE_VESSEL_FILESYSTEMS_RW for PWRTMRO in ${PW_RT_MOUNT_RO[*]} ; do @@ -315,22 +336,11 @@ START_PORTWINE () else export PRESSURE_VESSEL_FILESYSTEMS_RW="${PWRTMRW}" fi done - ln -sf "${WINEDIR}"/lib64/*so* "${PW_WINELIB}/runtime/lib/x86_64-linux-gnu/" - ln -sf "${WINEDIR}"/lib/*so* "${PW_WINELIB}/runtime/lib/i386-linux-gnu/" echo "RUNTIME is enabled" fi - export WINE="${WINELOADER}" - export WINE_GST_REGISTRY_DIR="${PORT_WINE_TMP_PATH}" - export MEDIACONV_AUDIO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/audio.foz - export MEDIACONV_AUDIO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_audio.foz - export MEDIACONV_VIDEO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/video.foz - export MEDIACONV_VIDEO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_video.foz - export GST_PLUGIN_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0" - export STAGING_SHARED_MEMORY=1 - export PW_FORCE_LARGE_ADDRESS_AWARE=1 if [ ! -z "${PW_LOG}" ] && [ "${PW_LOG}" != 0 ] ; then - export WINEDEBUG="fixme+all,err+loaddll,err+dll,err+file,err+reg" + export WINEDEBUG="fixme-all,err+loaddll,err+dll,err+file,err+reg" export DXVK_LOG_LEVEL="info" export VKD3D_DEBUG="warn" export WINE_MONO_TRACE="E:System.NotImplementedException" @@ -490,7 +500,7 @@ STOP_PORTWINE () { } UPDATE_WINETRICKS () { - W_TRX_URL="https://raw.githubusercontent.com/GloriousEggroll/protonfixes/master/winetricks" + W_TRX_URL="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" W_TRX_EXT_VER="$(curl -s --list-only ${W_TRX_URL} | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" print_info "Version winetricks on server: ${W_TRX_EXT_VER}" W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" @@ -509,7 +519,7 @@ UPDATE_WINETRICKS () { } RUN_WINETRICKS_FROM_DB () { - UPDATE_WINETRICKS + # UPDATE_WINETRICKS if [ ! -z "${PW_MUST_HAVE_DLL}" ] then export PW_DLL_INSTALL="${PW_MUST_HAVE_DLL} ${PW_DLL_INSTALL}" fi @@ -520,6 +530,7 @@ RUN_WINETRICKS_FROM_DB () { if [ ! -e "${WINEPREFIX}/winetricks.log" ] ; then touch "${WINEPREFIX}/winetricks.log" fi + try_remove_dir "${HOME}/.cache/winetricks/vcrun2019/" for need_install_dll_to_pfx in ${PW_DLL_INSTALL} ; do if [ "${need_install_dll_to_pfx}" == "vcrun2015" ] || [ "${need_install_dll_to_pfx}" == "vcrun2017" ] ; then need_install_dll_to_pfx="vcrun2019" @@ -539,10 +550,9 @@ RUN_WINETRICKS_FROM_DB () { fi done if [ "${USE_WT_FROM_DB}" == "1" ] ; then - UPDATE_WINETRICKS PW_STOP_PROGRESS_BAR - print_info "Need to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" - ${PW_TERM} "${PORT_WINE_TMP_PATH}/winetricks" -q --force ${PW_DLL_NEED_INSTALL} + print_info "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" + ${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..." fi @@ -550,8 +560,9 @@ RUN_WINETRICKS_FROM_DB () { if [ ! -z "${PW_WINDOWS_VER}" ] && [ `echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/'` == "xp" ] ; then export PW_WINDOWS_VER="xp64" fi - ${PW_RUNTIME} "${WINELOADER}" winecfg -v `echo "win${PW_WINDOWS_VER}" | sed 's/.*/\L&/'` + ${PW_RUNTIME} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" winecfg -v `echo "win${PW_WINDOWS_VER}" | sed 's/.*/\L&/'` echo "Set to win${PW_WINDOWS_VER}" + WAIT_WINESERVER fi } PW_INIT_DB () { @@ -653,20 +664,20 @@ PW_INIT_PFX () { create_new_dir "${WINEPREFIX}/drive_c/windows/system32/" [ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:" [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:" - PW_STOP_PROGRESS_BAR - PW_START_PROGRESS_BAR_BLOCK "Updating prefix... Please wait..." - KILL_PORTWINE - ${PW_RUNTIME} "${WINELOADER}" wineboot -u - WAIT_WINESERVER - KILL_PORTWINE - PW_STOP_PROGRESS_BAR - PW_START_PROGRESS_BAR_CS "Initialization prefix..." create_new_dir "${WINEPREFIX}/drive_c/windows/Fonts/" try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arial.ttf try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arialbd.ttf try_copy_file "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"times.ttf try_copy_file "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"cour.ttf try_copy_file "${WINEDIR}/share/fonts/"SourceHanSansSCRegular.otf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf + PW_STOP_PROGRESS_BAR + PW_START_PROGRESS_BAR_BLOCK "Updating prefix... Please wait..." + KILL_PORTWINE + ${PW_RUNTIME} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -u + WAIT_WINESERVER + KILL_PORTWINE + PW_STOP_PROGRESS_BAR + PW_START_PROGRESS_BAR_CS "Initialization prefix..." fi [ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:" [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:" @@ -689,6 +700,8 @@ PW_INIT_PFX () { if ! try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" then try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" fi + try_copy_file "${WINEDIR}/lib/wine/dxvk/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + try_copy_file "${WINEDIR}/lib64/wine/dxvk/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/system32/" if [ "${PW_VULKAN_USE}" = "0" ] ; then export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}" export __GLX_VENDOR_LIBRARY_NAME=nvidia @@ -715,20 +728,22 @@ PW_INIT_PFX () { export VKD3D_FEATURE_LEVEL="12_0" echo "Use VKD3D-PROTON only (DX12 to vulkan)" else - export CP_DXVK_FILES="d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi dxvk_config" + export CP_DXVK_FILES="d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi" echo "Try copy native DXVK files" for wine_dxvk_dll in ${CP_DXVK_FILES} ; do try_copy_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" try_copy_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" var_winedlloverride_update "${wine_dxvk_dll}=n" done - echo "Try copy native VKD3D files" - for wine_vkd3d_dll in d3d12 libvkd3d-proton-utils-3 ; do - try_copy_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" - var_winedlloverride_update "${wine_vkd3d_dll}=n" - done - echo "Use DXVK + VKD3D-PROTON" + # echo "Try copy native VKD3D files" + # for wine_vkd3d_dll in d3d12 libvkd3d-proton-utils-3 ; do + # try_copy_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + # try_copy_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" + # var_winedlloverride_update "${wine_vkd3d_dll}=n" + # done + # echo "Use DXVK + VKD3D-PROTON" + var_winedlloverride_update "d3d12,libvkd3d-proton-utils-3=" + echo "Use DXVK" fi PW_OTHER_FIXES @@ -792,27 +807,24 @@ PW_RUN () { pw_mangohud_check print_var "WINEDIR" "WINEARCH" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_VULKAN_USE" "VKD3D_CONFIG" if [ "${PW_LOG}" == 1 ] ; then - export PW_TERM="" export PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log" if [ ! -z "${PW_GAMEMODERUN}" ] && [ "${PW_GAMEMODERUN}" != 0 ] ; then - echo "Use logging with gamemode" - echo "Full command line: $PW_TERM ${optirun_on} gamemoderun ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" "&>>${PW_LOG_TO_FILE}" - $PW_TERM ${optirun_on} gamemoderun ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}" + echo "Full command line: $PW_TERM ${optirun_on} gamemoderun ${RUN_MANGOHUD} ${PW_RUNTIME} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" "&>>${PW_LOG_TO_FILE}" + ${optirun_on} gamemoderun ${RUN_MANGOHUD} ${PW_RUNTIME} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}" else - echo "Use logging without gamemode" - echo "Full command line: $PW_TERM ${optirun_on} ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" "&>>${PW_LOG_TO_FILE}" - $PW_TERM ${optirun_on} ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}" + echo "Full command line: $PW_TERM ${optirun_on} ${RUN_MANGOHUD} ${PW_RUNTIME} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" "&>>${PW_LOG_TO_FILE}" + ${optirun_on} ${PW_RUNTIME} ${RUN_MANGOHUD} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}" fi else [ "${PW_USE_TERMINAL}" != "1" ] && export PW_TERM="" if [ ! -z "${PW_GAMEMODERUN}" ] && [ "${PW_GAMEMODERUN}" != 0 ] ; then echo "Use gamemode without terminal" - echo "Full command line: $PW_TERM ${optirun_on} gamemoderun ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" - $PW_TERM ${optirun_on} gamemoderun ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} + echo "Full command line: $PW_TERM ${optirun_on} gamemoderun ${RUN_MANGOHUD} ${PW_RUNTIME} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" + $PW_TERM ${optirun_on} gamemoderun ${PW_RUNTIME} ${RUN_MANGOHUD} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} else echo "Don\`t use gamemode without terminal" - echo "Full command line: $PW_TERM ${optirun_on} ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" - $PW_TERM ${optirun_on} ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} + echo "Full command line: $PW_TERM ${optirun_on} ${RUN_MANGOHUD} ${PW_RUNTIME} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" + $PW_TERM ${optirun_on} ${RUN_MANGOHUD} ${PW_RUNTIME} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} fi fi } @@ -840,6 +852,7 @@ export PW_FTP_URL="https://portwine-linux.ru/ftp" export PW_WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" export install_ver=`cat "${PORT_WINE_TMP_PATH}/${portname}_ver" | head -n 1` +export WINETRICKS_DOWNLOADER="curl" if [ -z "${INSTALLING_PORT}" ] ; then PW_LOAD_LIBS diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 78ad3565..c62c137b 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -192,7 +192,8 @@ PW_WINEFILE () { PW_WINECMD () { export PW_USE_TERMINAL=1 START_PORTWINE - PW_RUN cmd + cd "${WINEPREFIX}/drive_c" + ${PW_RUNTIME} xterm -e env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" cmd } PW_WINEREG () { START_PORTWINE @@ -202,7 +203,7 @@ PW_WINETRICKS () { UPDATE_WINETRICKS export PW_USE_TERMINAL=1 START_PORTWINE - ${PW_TERM} "${PORT_WINE_TMP_PATH}/winetricks" -q --force + ${PW_TERM} "${PORT_WINE_TMP_PATH}/winetricks" -q } PW_EDIT_DB () { xdg-open "${PORTWINE_DB_FILE}" @@ -285,6 +286,8 @@ else --field=" Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png":"BTN" '@bash -c "button_click PW_BATTLE_NET"' \ --field=" Epic Games Launcher"!"$PW_GUI_ICON_PATH/epicgames.png":"BTN" '@bash -c "button_click PW_EPIC"' \ --field=" GoG Galaxy Launcher"!"$PW_GUI_ICON_PATH/gog.png":"BTN" '@bash -c "button_click PW_GOG"' \ + --field=" Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png":"BTN" '@bash -c "button_click PW_UBC"' \ + --field=" Steam Client Launcher"!"$PW_GUI_ICON_PATH/steam.png":"BTN" '@bash -c "button_click PW_STEAM"' \ --field=" EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png":"BTN" '@bash -c "button_click PW_EVE"' \ --field=" Origin Launcher"!"$PW_GUI_ICON_PATH/origin.png":"BTN" '@bash -c "button_click PW_ORIGIN"' & \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index d4ea74c9..997bbdd1 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -8,7 +8,7 @@ export PW_USE_RUNTIME=1 # 0 - disabled; 1 - enabled export PW_RT_MOUNT_RO=("${HOME}/.PortWINE") -export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}") +export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}") export PW_USE_GAMEMODE=1 export PW_FORCE_USE_VSYNC=2 @@ -23,7 +23,7 @@ export WINEARCH="win64" export mono_ver=6.1.2 export gecko_ver=2.47.2 -export pw_libs_ver="_v14" +export pw_libs_ver="_v15" export WINEDIR="${PORT_WINE_PATH}/data/dist" export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" @@ -31,7 +31,7 @@ export WINE_WIN_START="start.exe /i /unix" export porturl="http://portwine-linux.ru/" -export PW_MUST_HAVE_DLL="xact xact_x64" +export PW_MUST_HAVE_DLL="" ######################################################################## ADD_IN_START_PORTWINE () { diff --git a/data_from_portwine/tmp/winetricks b/data_from_portwine/tmp/winetricks index c189b920..9fa0ce19 100755 --- a/data_from_portwine/tmp/winetricks +++ b/data_from_portwine/tmp/winetricks @@ -1341,13 +1341,17 @@ w_download_to() ;; esac - if test ! "${WINETRICKS_CONTINUE_DOWNLOAD}" ; then + if test "${WINETRICKS_FORCE}" != 1; then case ${LANG} in pl*) w_warn "Niezgodność sum kontrolnych dla ${_W_cache}/${_W_file}, pobieram ponownie" ;; ru*) w_warn "Контрольная сумма файла ${_W_cache}/${_W_file} не совпадает, попытка повторной загрузки" ;; *) w_warn "Checksum for ${_W_cache}/${_W_file} did not match, retrying download" ;; esac mv -f "${_W_cache}/${_W_file}" "${_W_cache}/${_W_file}".bak + else + w_warn "Checksum for ${_W_cache}/${_W_file} did not match, but --force was used, so ignoring and trying anyway." + checksum_ok=1 + break fi else # file exists, no checksum known, declare success and exit loop @@ -1408,7 +1412,7 @@ w_download_to() winetricks_wget_progress \ -O "${_W_file}" \ -nd \ - -c\ + -c \ --read-timeout 300 \ --retry-connrefused \ --timeout "${WINETRICKS_DOWNLOADER_TIMEOUT}" \ @@ -5567,18 +5571,18 @@ Angegebene Verben ausführen. Jedes Verb installiert eine Anwendung oder ändert eine Einstellung. Optionen: - --country=CC Set country code to CC and don't detect your IP address + --country=CC Ländercode auf CC setzen und IP Adresse nicht auslesen -f, --force Nicht prüfen ob Pakete bereits installiert wurden --gui GUI Diagnosen anzeigen, auch wenn von der Kommandozeile gestartet --isolate Jedes Programm oder Spiel in eigener Bottle (WINEPREFIX) installieren - --self-update Update this application to the last version - --update-rollback Rollback the last self update + --self-update Dieses Programm auf die neueste Version aktualisieren + --update-rollback Rollback des letzten Self Update -k, --keep_isos ISOs local speichern (erlaubt spätere Installation ohne Disk) --no-clean Temp Verzeichnisse nicht löschen (nützlich beim debuggen) -q, --unattended Keine Fragen stellen, alles automatisch installieren -r, --ddrescue Alternativer Zugriffsmodus (hilft bei zerkratzten Disks) --t --torify Run downloads under torify, if available - --verify Wenn Möglisch automatische GUI Tests für Verben starten +-t --torify Wenn möglich Downloads unter torify ausführen + --verify Wenn möglich automatische GUI Tests für Verben starten -v, --verbose Alle ausgeführten Kommandos anzeigen -h, --help Diese Hilfemeldung anzeigen -V, --version Programmversion anzeigen und Beenden @@ -6056,7 +6060,7 @@ w_metadata comctl32 dlls \ publisher="Microsoft" \ year="2001" \ media="download" \ - file1="cc32inst.exe" \ + file1="CC32inst.exe" \ installed_file1="${W_SYSTEM32_DLLS_WIN}/comctl32.dll" load_comctl32() @@ -6069,7 +6073,7 @@ load_comctl32() w_download https://downloads.sourceforge.net/project/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe d68c0cca721870aed39f5f2efd80dfb74f3db66d5f9a49e7578b18279edfa4a7 - w_try "${WINE}" "${W_CACHE}"/comctl32/cc32inst.exe "/T:${W_TMP_WIN}" /c ${W_OPT_UNATTENDED:+/q} + w_try "${WINE}" "${W_CACHE}/${W_PACKAGE}/${file1}" "/T:${W_TMP_WIN}" /c ${W_OPT_UNATTENDED:+/q} w_try_unzip "${W_TMP}" "${W_TMP}"/comctl32.exe w_try "${WINE}" "${W_TMP}"/x86/50ComUpd.Exe "/T:${W_TMP_WIN}" /c ${W_OPT_UNATTENDED:+/q} w_try cp "${W_TMP}"/comcnt.dll "${W_SYSTEM32_DLLS}"/comctl32.dll @@ -8636,7 +8640,7 @@ load_dotnet11() w_package_unsupported_win64 # https://www.microsoft.com/en-us/download/details.aspx?id=26 - w_download https://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe ba0e58ec93f2ffd54fc7c627eeca9502e11ab3c6fc85dcbeff113bd61d995bce + w_download https://web.archive.org/web/20210505032023/http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe ba0e58ec93f2ffd54fc7c627eeca9502e11ab3c6fc85dcbeff113bd61d995bce w_call remove_mono w_call corefonts @@ -8993,11 +8997,11 @@ load_dotnet20sp2() if [ "${W_ARCH}" = "win32" ]; then # https://www.microsoft.com/en-us/download/details.aspx?id=1639 - w_download https://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe 6e3f363366e7d0219b7cb269625a75d410a5c80d763cc3d73cf20841084e851f + w_download https://web.archive.org/web/20210329003118/http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe 6e3f363366e7d0219b7cb269625a75d410a5c80d763cc3d73cf20841084e851f exe="NetFx20SP2_x86.exe" elif [ "${W_ARCH}" = "win64" ]; then # https://www.microsoft.com/en-us/download/details.aspx?id=1639 - w_download https://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe + w_download https://web.archive.org/web/20210328110521/http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe 430315c97c57ac158e7311bbdbb7130de3e88dcf5c450a25117c74403e558fbe exe="NetFx20SP2_x64.exe" fi @@ -9375,7 +9379,7 @@ w_metadata dotnet45 dlls \ load_dotnet45() { w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 - w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 + w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 6.6 w_package_warn_win64 @@ -9425,7 +9429,7 @@ w_metadata dotnet452 dlls \ load_dotnet452() { w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 - w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 + w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 6.6 w_package_warn_win64 @@ -9669,7 +9673,7 @@ w_metadata dotnet48 dlls \ load_dotnet48() { w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 - w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 + w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 6.6 w_package_warn_win64 @@ -10220,6 +10224,22 @@ load_galliumnine07() helper_galliumnine "${file1}" } +w_metadata galliumnine08 dlls \ + title="Gallium Nine Standalone (v0.8)" \ + publisher="Gallium Nine Team" \ + year="2021" \ + media="download" \ + file1="gallium-nine-standalone-v0.8.tar.gz" \ + installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9-nine.dll" \ + installed_file2="${W_SYSTEM32_DLLS_WIN}/ninewinecfg.exe" \ + homepage="https://github.com/iXit/wine-nine-standalone" + +load_galliumnine08() +{ + w_download "https://github.com/iXit/wine-nine-standalone/releases/download/v0.8/gallium-nine-standalone-v0.8.tar.gz" 8d73dcf78e4b5edf7a3aea8c339459b5138acd1c957c91c5c06432cb2fc51893 + helper_galliumnine "${file1}" +} + w_metadata galliumnine dlls \ title="Gallium Nine Standalone (latest)" \ publisher="Gallium Nine Team" \ @@ -10380,10 +10400,13 @@ load_gmdls() w_try_cabextract -d "${W_TMP}" -F DirectX.cab "${W_CACHE}"/directx9/directx_apr2006_redist.exe w_try_cabextract -d "${W_TMP}" -F gm16.dls "${W_TMP}"/DirectX.cab + + # When running in a 64bit prefix, syswow64/drivers doesn't exist + w_try mkdir -p "${W_SYSTEM32_DLLS}"/drivers w_try mv "${W_TMP}"/gm16.dls "${W_SYSTEM32_DLLS}"/drivers/gm.dls + if test "${W_ARCH}" = "win64"; then - w_try_cd "${W_SYSTEM64_DLLS}"/drivers - w_try ln -s ../../syswow64/drivers/gm.dls + w_try ln -s "${W_SYSTEM32_DLLS}"/drivers/gm.dls "${W_SYSTEM64_DLLS}"/drivers fi } @@ -10710,7 +10733,7 @@ load_jet40() # https://support.microsoft.com/kb/239114 # See also https://bugs.winehq.org/show_bug.cgi?id=6085 # FIXME: "failed with error 2" - w_download https://download.microsoft.com/download/4/3/9/4393c9ac-e69e-458d-9f6d-2fe191c51469/jet40sp8_9xnt.exe b060246cd499085a31f15873689d5fa7df817e407c8261a5c71fa6b9f7042560 + w_download https://web.archive.org/web/20210225171713/http://download.microsoft.com/download/4/3/9/4393c9ac-e69e-458d-9f6d-2fe191c51469/Jet40SP8_9xNT.exe b060246cd499085a31f15873689d5fa7df817e407c8261a5c71fa6b9f7042560 w_try_cd "${W_CACHE}/${W_PACKAGE}" w_try "${WINE}" jet40sp8_9xnt.exe ${W_OPT_UNATTENDED:+/q} @@ -11304,7 +11327,7 @@ load_msxml4() # MS07-042: https://www.microsoft.com/en-us/download/details.aspx?id=2386 # w_download https://download.microsoft.com/download/9/4/2/9422e6b6-08ee-49cb-9f05-6c6ee755389e/msxml4-KB936181-enu.exe 1ce9ff868816cfc9bf33e93fdf1552afce5b491443892babb521e74c05e45242 # SP3 (2009): https://www.microsoft.com/en-us/download/details.aspx?id=15697 - w_download https://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi 47c2ae679c37815da9267c81fc3777de900ad2551c11c19c2840938b346d70bb + w_download https://web.archive.org/web/20210506101448/http://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi 47c2ae679c37815da9267c81fc3777de900ad2551c11c19c2840938b346d70bb w_override_dlls native,builtin msxml4 w_try_cd "${W_CACHE}/${W_PACKAGE}" w_try "${WINE}" msiexec /i msxml.msi ${W_OPT_UNATTENDED:+/q} @@ -12228,7 +12251,7 @@ load_vb6run() { # https://support.microsoft.com/kb/290887 if test ! -f "${W_CACHE}"/vb6run/vbrun60sp6.exe; then - w_download https://download.microsoft.com/download/5/a/d/5ad868a0-8ecd-4bb0-a882-fe53eb7ef348/VB6.0-KB290887-X86.exe 467b5a10c369865f2021d379fc0933cb382146b702bbca4bcb703fc86f4322bb + w_download https://lon-01.lo4d.com/files/visual-basic-runtime-files/VB6.0-KB290887-X86.exe 467b5a10c369865f2021d379fc0933cb382146b702bbca4bcb703fc86f4322bb w_try "${WINE}" "${W_CACHE}"/vb6run/VB6.0-KB290887-X86.exe "/T:${W_TMP_WIN}" /c ${W_OPT_UNATTENDED:+/q} if test ! -f "${W_TMP}"/vbrun60sp6.exe; then @@ -12260,7 +12283,7 @@ winetricks_vcrun6_helper() { if test ! -f "${W_CACHE}"/vcrun6/vcredist.exe; then w_download_to vcrun6 https://download.microsoft.com/download/vc60pro/Update/2/W9XNT4/EN-US/VC6RedistSetup_deu.exe c2eb91d9c4448d50e46a32fecbcc3b418706d002beab9b5f4981de552098cee7 - w_try "${WINE}" "${W_CACHE}"/vcrun6/vc6redistsetup_deu.exe "/T:${W_TMP_WIN}" /c ${W_OPT_UNATTENDED:+/q} + w_try "${WINE}" "${W_CACHE}"/vcrun6/VC6RedistSetup_deu.exe "/T:${W_TMP_WIN}" /c ${W_OPT_UNATTENDED:+/q} if test ! -f "${W_TMP}"/vcredist.exe; then w_die vcredist.exe not found fi @@ -12273,7 +12296,7 @@ w_metadata vcrun6 dlls \ publisher="Microsoft" \ year="2000" \ media="download" \ - file1="vc6redistsetup_deu.exe" \ + file1="VC6RedistSetup_deu.exe" \ installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc42.dll" load_vcrun6() @@ -12305,7 +12328,7 @@ w_metadata mfc42 dlls \ publisher="Microsoft" \ year="2000" \ media="download" \ - file1="../vcrun6/vc6redistsetup_deu.exe" \ + file1="../vcrun6/VC6RedistSetup_deu.exe" \ installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc42u.dll" load_mfc42() @@ -12320,7 +12343,7 @@ w_metadata msvcirt dlls \ publisher="Microsoft" \ year="2000" \ media="download" \ - file1="../vcrun6/vc6redistsetup_deu.exe" \ + file1="../vcrun6/VC6RedistSetup_deu.exe" \ installed_file1="${W_SYSTEM32_DLLS_WIN}/msvcirt.dll" load_msvcirt() @@ -12341,16 +12364,16 @@ w_metadata vcrun6sp6 dlls \ publisher="Microsoft" \ year="2004" \ media="download" \ - file1="Vs6sp6.exe" \ + file1="VS6SP6.EXE" \ installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc42.dll" load_vcrun6sp6() { - w_download https://download.microsoft.com/download/1/9/f/19fe4660-5792-4683-99e0-8d48c22eed74/Vs6sp6.exe 7fa1d1778824b55a5fceb02f45c399b5d4e4dce7403661e67e587b5f455edbf3 + w_download https://www.ddsystem.com.br/update/setup/vb6+sp6/VS6SP6.EXE 7fa1d1778824b55a5fceb02f45c399b5d4e4dce7403661e67e587b5f455edbf3 # No EULA is presented when passing command-line extraction arguments, # so we'll simplify extraction with cabextract. - w_try_cabextract "${W_CACHE}"/vcrun6sp6/Vs6sp6.exe -d "${W_TMP}" -F vcredist.exe + w_try_cabextract "${W_CACHE}/${W_PACKAGE}/${file1}" -d "${W_TMP}" -F vcredist.exe w_try_cd "${W_TMP}" # Delete some fake DLLs to avoid vcredist installer warnings @@ -12430,7 +12453,9 @@ load_vcrun2005() # 2011/06: Security update, see # https://technet.microsoft.com/library/security/ms11-025 or # https://support.microsoft.com/kb/2538242 - w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 4ee4da0fe62d5fa1b5e80c6e6d88a4a2f8b3b140c35da51053d0d7b72a381d29 + # Originally: 4ee4da0fe62d5fa1b5e80c6e6d88a4a2f8b3b140c35da51053d0d7b72a381d29 + # 2021/05/25: 8648c5fc29c44b9112fe52f9a33f80e7fc42d10f3b5b42b2121542a13e44adfd + w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 8648c5fc29c44b9112fe52f9a33f80e7fc42d10f3b5b42b2121542a13e44adfd # For native to be used, msvc* dlls must either be set to native only, OR # set to native, builtin and remove wine's builtin manifest. Setting to native only breaks several apps, @@ -12445,7 +12470,9 @@ load_vcrun2005() w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q} if [ "${W_ARCH}" = "win64" ] ;then - w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE 0551a61c85b718e1fa015b0c3e3f4c4eea0637055536c00e7969286b4fa663e0 + # Originally: 0551a61c85b718e1fa015b0c3e3f4c4eea0637055536c00e7969286b4fa663e0 + # 2021/05/25: 4487570bd86e2e1aac29db2a1d0a91eb63361fcaac570808eb327cd4e0e2240d + w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE 4487570bd86e2e1aac29db2a1d0a91eb63361fcaac570808eb327cd4e0e2240d w_try "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q} fi } @@ -12460,7 +12487,7 @@ w_metadata mfc80 dlls \ load_mfc80() { - w_download_to vcrun2005 https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 4ee4da0fe62d5fa1b5e80c6e6d88a4a2f8b3b140c35da51053d0d7b72a381d29 + w_download_to vcrun2005 https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 8648c5fc29c44b9112fe52f9a33f80e7fc42d10f3b5b42b2121542a13e44adfd w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/vcrun2005/vcredist_x86.EXE -F 'vcredist.msi' w_try_cabextract --directory="${W_TMP}/win32" "${W_TMP}/win32/vcredist.msi" @@ -12471,7 +12498,7 @@ load_mfc80() w_try cp "${W_TMP}/win32"/mfcm80u.dll.8.0.50727.6195.9BAE13A2_E7AF_D6C3_FF1F_C8B3B9A1E18E "${W_SYSTEM32_DLLS}"/mfcm80u.dll if [ "${W_ARCH}" = "win64" ]; then - w_download_to vcrun2005 https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE 0551a61c85b718e1fa015b0c3e3f4c4eea0637055536c00e7969286b4fa663e0 + w_download_to vcrun2005 https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE 4487570bd86e2e1aac29db2a1d0a91eb63361fcaac570808eb327cd4e0e2240d w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/vcrun2005/vcredist_x64.EXE -F 'vcredist.msi' w_try_cabextract --directory="${W_TMP}/win64" "${W_TMP}/win64/vcredist.msi" @@ -12498,7 +12525,9 @@ load_vcrun2008() # June 2011 security update, see # https://technet.microsoft.com/library/security/ms11-025 or # https://support.microsoft.com/kb/2538242 - w_download https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe 6b3e4c51c6c0e5f68c8a72b497445af3dbf976394cbb62aa23569065c28deeb6 + # Originally: 6b3e4c51c6c0e5f68c8a72b497445af3dbf976394cbb62aa23569065c28deeb6 + # 2021/05/23: 8742bcbf24ef328a72d2a27b693cc7071e38d3bb4b9b44dec42aa3d2c8d61d92 + w_download https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe 8742bcbf24ef328a72d2a27b693cc7071e38d3bb4b9b44dec42aa3d2c8d61d92 # For native to be used, msvc* dlls must either be set to native only, OR # set to native, builtin and remove wine's builtin manifest. Setting to native only breaks several apps, @@ -12516,7 +12545,8 @@ load_vcrun2008() win64) # Also install the 64-bit version # 2016/11/15: b811f2c047a3e828517c234bd4aa4883e1ec591d88fad21289ae68a6915a6665 - w_download https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe b811f2c047a3e828517c234bd4aa4883e1ec591d88fad21289ae68a6915a6665 + # 2021/05/23: c5e273a4a16ab4d5471e91c7477719a2f45ddadb76c7f98a38fa5074a6838654 + w_download https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe c5e273a4a16ab4d5471e91c7477719a2f45ddadb76c7f98a38fa5074a6838654 w_try "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q} ;; esac @@ -12532,7 +12562,7 @@ w_metadata mfc90 dlls \ load_mfc90() { - w_download_to vcrun2008 https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe 6b3e4c51c6c0e5f68c8a72b497445af3dbf976394cbb62aa23569065c28deeb6 + w_download_to vcrun2008 https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe 8742bcbf24ef328a72d2a27b693cc7071e38d3bb4b9b44dec42aa3d2c8d61d92 w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/vcrun2008/vcredist_x86.exe -F 'vc_red.cab' w_try_cabextract --directory="${W_TMP}/win32" "${W_TMP}/win32/vc_red.cab" @@ -12543,7 +12573,7 @@ load_mfc90() w_try cp "${W_TMP}/win32"/mfcm90u.dll.30729.6161.Microsoft_VC90_MFC_x86.QFE "${W_SYSTEM32_DLLS}"/mfcm90u.dll if [ "${W_ARCH}" = "win64" ]; then - w_download_to vcrun2008 https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe b811f2c047a3e828517c234bd4aa4883e1ec591d88fad21289ae68a6915a6665 + w_download_to vcrun2008 https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe c5e273a4a16ab4d5471e91c7477719a2f45ddadb76c7f98a38fa5074a6838654 w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/vcrun2008/vcredist_x64.exe -F 'vc_red.cab' w_try_cabextract --directory="${W_TMP}/win64" "${W_TMP}/win64/vc_red.cab" @@ -12568,7 +12598,9 @@ w_metadata vcrun2010 dlls \ load_vcrun2010() { # See https://www.microsoft.com/en-us/download/details.aspx?id=5555 - w_download https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe 8162b2d665ca52884507ede19549e99939ce4ea4a638c537fa653539819138c8 + # Originally: 8162b2d665ca52884507ede19549e99939ce4ea4a638c537fa653539819138c8 + # 2021/04/24: 31d32fa39d52cac9a765a43660431f7a127eee784b54b2f5e2af3e2b763a1af8 + w_download https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe 31d32fa39d52cac9a765a43660431f7a127eee784b54b2f5e2af3e2b763a1af8 w_override_dlls native,builtin msvcp100 msvcr100 vcomp100 atl100 w_try_cd "${W_CACHE}/${W_PACKAGE}" @@ -12578,7 +12610,9 @@ load_vcrun2010() win64) # Also install the 64-bit version # https://www.microsoft.com/en-us/download/details.aspx?id=13523 - w_download https://download.microsoft.com/download/A/8/0/A80747C3-41BD-45DF-B505-E9710D2744E0/vcredist_x64.exe c6cd2d3f0b11dc2a604ffdc4dd97861a83b77e21709ba71b962a47759c93f4c8 + # Originally: c6cd2d3f0b11dc2a604ffdc4dd97861a83b77e21709ba71b962a47759c93f4c8 + # 2021/04/24: 2fddbc3aaaab784c16bc673c3bae5f80929d5b372810dbc28649283566d33255 + w_download https://download.microsoft.com/download/A/8/0/A80747C3-41BD-45DF-B505-E9710D2744E0/vcredist_x64.exe 2fddbc3aaaab784c16bc673c3bae5f80929d5b372810dbc28649283566d33255 w_try "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q} ;; esac @@ -12594,7 +12628,7 @@ w_metadata mfc100 dlls \ load_mfc100() { - w_download_to vcrun2010 https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe 8162b2d665ca52884507ede19549e99939ce4ea4a638c537fa653539819138c8 + w_download_to vcrun2010 https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe 31d32fa39d52cac9a765a43660431f7a127eee784b54b2f5e2af3e2b763a1af8 w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/vcrun2010/vcredist_x86.exe -F '*.cab' w_try_cabextract --directory="${W_TMP}/win32" "${W_TMP}/win32/vc_red.cab" @@ -12605,7 +12639,7 @@ load_mfc100() w_try cp "${W_TMP}/win32"/F_CENTRAL_mfcm100u_x86 "${W_SYSTEM32_DLLS}"/mfcm100u.dll if [ "${W_ARCH}" = "win64" ]; then - w_download_to vcrun2010 https://download.microsoft.com/download/A/8/0/A80747C3-41BD-45DF-B505-E9710D2744E0/vcredist_x64.exe c6cd2d3f0b11dc2a604ffdc4dd97861a83b77e21709ba71b962a47759c93f4c8 + w_download_to vcrun2010 https://download.microsoft.com/download/A/8/0/A80747C3-41BD-45DF-B505-E9710D2744E0/vcredist_x64.exe 2fddbc3aaaab784c16bc673c3bae5f80929d5b372810dbc28649283566d33255 w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/vcrun2010/vcredist_x64.exe -F '*.cab' w_try_cabextract --directory="${W_TMP}/win64" "${W_TMP}/win64/vc_red.cab" @@ -12763,21 +12797,26 @@ load_vcrun2015() w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-convert-l1-1-0 api-ms-win-crt-environment-l1-1-0 api-ms-win-crt-filesystem-l1-1-0 api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0 api-ms-win-crt-multibyte-l1-1-0 api-ms-win-crt-process-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-string-l1-1-0 api-ms-win-crt-utility-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcr140 ucrtbase vcomp140 vcruntime140 - # Otherwise ucrtbase doesn't get replaced + if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then + w_set_winver winxp + fi + + # Setup will refuse to install ucrtbase because builtin's version number is higher, so manually replace it # See https://bugs.winehq.org/show_bug.cgi?id=46317 - w_set_winver winxp - w_try rm -f "${W_SYSTEM32_DLLS}"/ucrtbase.dll + w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/vcrun2015/vc_redist.x86.exe -F 'a10' + w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'ucrtbase.dll' w_try_cd "${W_CACHE}"/"${W_PACKAGE}" w_try "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q} case "${W_ARCH}" in win64) - # Also remove the 64-bit version - w_try rm -f "${W_SYSTEM64_DLLS}"/ucrtbase.dll # Also install the 64-bit version # 2015/10/12: 5eea714e1f22f1875c1cb7b1738b0c0b1f02aec5ecb95f0fdb1c5171c6cd93a3 w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe 5eea714e1f22f1875c1cb7b1738b0c0b1f02aec5ecb95f0fdb1c5171c6cd93a3 + # Also replace 64-bit ucrtbase.dll + w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/vcrun2015/vc_redist.x64.exe -F 'a10' + w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'ucrtbase.dll' w_try "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q} ;; esac @@ -12839,24 +12878,29 @@ load_vcrun2017() w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcr140 ucrtbase vcomp140 vcruntime140 - # Otherwise ucrtbase doesn't get replaced + if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then + w_set_winver winxp + fi + + # Setup will refuse to install ucrtbase because builtin's version number is higher, so manually replace it # See https://bugs.winehq.org/show_bug.cgi?id=46317 - w_set_winver winxp - w_try rm -f "${W_SYSTEM32_DLLS}"/ucrtbase.dll + w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/vcrun2017/vc_redist.x86.exe -F 'a10' + w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'ucrtbase.dll' w_try_cd "${W_CACHE}/${W_PACKAGE}" w_try "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q} case "${W_ARCH}" in win64) - # Also remove the 64-bit version - w_try rm -f "${W_SYSTEM64_DLLS}"/ucrtbase.dll # Also install the 64-bit version # https://support.microsoft.com/en-gb/help/2977003/the-latest-supported-visual-c-downloads # 2017/10/02: 7434bf559290cccc3dd3624f10c9e6422cce9927d2231d294114b2f929f0e465 # 2019/03/17: b192e143d55257a0a2f76be42e44ff8ee14014f3b1b196c6e59829b6b3ec453c # 2019/08/14: 5b0cbb977f2f5253b1ebe5c9d30edbda35dbd68fb70de7af5faac6423db575b5 w_download https://aka.ms/vs/15/release/vc_redist.x64.exe 5b0cbb977f2f5253b1ebe5c9d30edbda35dbd68fb70de7af5faac6423db575b5 + # Also replace 64-bit ucrtbase.dll + w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/vcrun2017/vc_redist.x64.exe -F 'a10' + w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'ucrtbase.dll' w_try "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q} ;; esac @@ -12885,22 +12929,28 @@ load_vcrun2019() # 2020/10/03: caa38fd474164a38ab47ac1755c8ccca5ccfacfa9a874f62609e6439924e87ec # 2020/11/13: 50a3e92ade4c2d8f310a2812d46322459104039b9deadbd7fdd483b5c697c0c8 # 2021/03/09: 4521ed84b9b1679a706e719423d54ef5e413dc50dde1cf362232d7359d7e89c4 - w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 4521ed84b9b1679a706e719423d54ef5e413dc50dde1cf362232d7359d7e89c4 + # 2021/03/28: e830c313aa99656748f9d2ed582c28101eaaf75f5377e3fb104c761bf3f808b2 + # 2021/04/05: e830c313aa99656748f9d2ed582c28101eaaf75f5377e3fb104c761bf3f808b2 + # 2021/04/13: 14563755ac24a874241935ef2c22c5fce973acb001f99e524145113b2dc638c1 w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcr140 ucrtbase vcomp140 vcruntime140 - # Otherwise ucrtbase doesn't get replaced + w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 91c21c93a88dd82e8ae429534dacbc7a4885198361eae18d82920c714e328cf9 + + if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then + w_set_winver winxp + fi + + # Setup will refuse to install ucrtbase because builtin's version number is higher, so manually replace it # See https://bugs.winehq.org/show_bug.cgi?id=46317 - w_set_winver winxp - w_try rm -f "${W_SYSTEM32_DLLS}"/ucrtbase.dll + w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/vcrun2019/vc_redist.x86.exe -F 'a10' + w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'ucrtbase.dll' w_try_cd "${W_CACHE}"/"${W_PACKAGE}" w_try "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q} case "${W_ARCH}" in win64) - # Also remove the 64-bit version - w_try rm -f "${W_SYSTEM64_DLLS}"/ucrtbase.dll # Also install the 64-bit version # 2019/12/26: 40ea2955391c9eae3e35619c4c24b5aaf3d17aeaa6d09424ee9672aa9372aeed # 2020/03/23: b6c82087a2c443db859fdbeaae7f46244d06c3f2a7f71c35e50358066253de52 @@ -12909,11 +12959,17 @@ load_vcrun2019() # 2020/10/03: 4b5890eb1aefdf8dfa3234b5032147eb90f050c5758a80901b201ae969780107 # 2020/11/13: b1a32c71a6b7d5978904fb223763263ea5a7eb23b2c44a0d60e90d234ad99178 # 2021/03/09: f299953673de262fefad9dd19bfbe6a5725a03ae733bebfec856f1306f79c9f7 + # 2021/03/28: b6c82087a2c443db859fdbeaae7f46244d06c3f2a7f71c35e50358066253de52 + # 2021/04/05: 015edd4e5d36e053b23a01adb77a2b12444d3fb6eccefe23e3a8cd6388616a16 + # 2021/04/13: 52b196bbe9016488c735e7b41805b651261ffa5d7aa86eb6a1d0095be83687b2 # vcruntime140_1 is only shipped on x64: w_override_dlls native,builtin vcruntime140_1 - w_download https://aka.ms/vs/16/release/vc_redist.x64.exe f299953673de262fefad9dd19bfbe6a5725a03ae733bebfec856f1306f79c9f7 + w_download https://web.archive.org/web/20210412133744if_/https://download.visualstudio.microsoft.com/download/pr/366c0fb9-fe05-4b58-949a-5bc36e50e370/015edd4e5d36e053b23a01adb77a2b12444d3fb6eccefe23e3a8cd6388616a16/vc_redist.x64.exe 015edd4e5d36e053b23a01adb77a2b12444d3fb6eccefe23e3a8cd6388616a16 + # Also replace 64-bit ucrtbase.dll + w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/vcrun2019/vc_redist.x64.exe -F 'a10' + w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'ucrtbase.dll' w_try "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q} ;; esac @@ -12938,7 +12994,7 @@ load_vjrun20() w_call dotnet20 # See https://www.microsoft.com/en-us/download/details.aspx?id=18084 - w_download https://download.microsoft.com/download/9/2/3/92338cd0-759f-4815-8981-24b437be74ef/vjredist.exe cf8f3dd4ad41453a302870b74de1c6489e7ed255ad3f652ce4af0b424a933b41 + w_download https://web.archive.org/web/20200803205240/https://download.microsoft.com/download/9/2/3/92338cd0-759f-4815-8981-24b437be74ef/vjredist.exe cf8f3dd4ad41453a302870b74de1c6489e7ed255ad3f652ce4af0b424a933b41 w_try_cd "${W_CACHE}"/"${W_PACKAGE}" w_try "${WINE}" vjredist.exe ${W_OPT_UNATTENDED:+/q /C:"install /qnt"} } @@ -13025,83 +13081,6 @@ _EOF_ #---------------------------------------------------------------- -w_metadata vulkanrt dlls \ - title="Vulkan Runtime (latest)" \ - publisher="LunarG" \ - year="2020" \ - media="download" \ - file1="vulkan-rt.exe" \ - installed_exe1="${W_SYSTEM32_DLLS_WIN}/vulkaninfo.exe" - -load_vulkanrt() -{ - # https://vulkan.lunarg.com/sdk/home - - # Thankfully, they provide a sha256, see https://github.com/Winetricks/winetricks/issues/1368 - _W_vulkan_shafile="vulkan-RT-sha.txt" - # Don't cache the shasum, we want to check it each time it's run. If the sha doesn't change, it won't download the binary again. - w_download_to "${W_TMP_EARLY}" "https://sdk.lunarg.com/sdk/sha/latest/windows/vulkan-RT-sha.txt?Human=true;u=" "" "${_W_vulkan_shafile}" - _W_vulkan_sha256="$(cut -d ' ' -f1 "${W_TMP}/${_W_vulkan_shafile}")" - w_download "https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-rt.exe?Human=true;u=" "${_W_vulkan_sha256}" "${file1}" - - w_try_cd "${W_CACHE}/${W_PACKAGE}" - w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/S} -} - -#---------------------------------------------------------------- - -w_metadata vulkansdk apps \ - title="Vulkan SDK (latest) (developers only)" \ - publisher="LunarG" \ - year="2018" \ - media="download" \ - file1="vulkan-sdk.exe" \ - installed_file1="C:/VulkanSDK/latest/vulkan.ico" - -load_vulkansdk() -{ - # https://vulkan.lunarg.com/sdk/home - - _W_vulkan_version="${file1%-*.exe}" - _W_vulkan_version="${_W_vulkan_version#*-}" - - # Thankfully, they provide a sha256, see https://github.com/Winetricks/winetricks/issue - _W_vulkan_shafile="vulkan-sha.txt" - # Don't cache the shasum, we want to check it each time it's run. If the sha doesn't change, it won't download the binary again. - w_download_to "${W_TMP}" "https://sdk.lunarg.com/sdk/sha/latest/windows/vulkan-sha.txt?Human=true;u=" "" "${_W_vulkan_shafile}" - _W_vulkan_sha256="$(cut -d ' ' -f1 "${W_TMP}/${_W_vulkan_shafile}")" - w_download "https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-sdk.exe?Human=true;u=" "${_W_vulkan_sha256}" "${file1}" - - w_try_cd "${W_CACHE}/${W_PACKAGE}" - w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/S} - echo "Creating C:\\windows\\winevulkan.json winevulkan json file" - cat > "${W_WINDIR_UNIX}"/winevulkan.json <<_EOF_ -{ - "file_format_version": "1.0.0", - "ICD": { - "library_path": "c:\\\\windows\\\\system32\\\\winevulkan.dll", - "api_version": "${_W_vulkan_version}" - } -} -_EOF_ - echo "Creating winevulkan registry settings" - cat > "${W_TMP}"/winevulkan.reg <<_EOF_ -REGEDIT4 - -[HKEY_LOCAL_MACHINE\\SOFTWARE\\Khronos\\Vulkan\\Drivers\\] -"C:\\\\Windows\\\\winevulkan.json"=dword:00000000 - -_EOF_ - w_try_regedit "${W_TMP_WIN}"\\winevulkan.reg - - w_try_cd "${W_DRIVE_C}/VulkanSDK" - # We're assuming here that only the sdks are installed here. This is really only for the installed_file check, - # as there are no files with non-versioned filenames installed - w_try ln -sf "$(find . -maxdepth 1 -mindepth 1 -type d | grep -v latest | sort -V | tail -n 1)" latest -} - -#---------------------------------------------------------------- - w_metadata webio dlls \ title="MS Windows Web I/O" \ publisher="Microsoft" \ @@ -13481,7 +13460,7 @@ w_metadata xna31 dlls \ load_xna31() { w_call dotnet20sp2 - w_download https://download.microsoft.com/download/5/9/1/5912526C-B950-4662-99B6-119A83E60E5C/xnafx31_redist.msi 187e7e6b08fe35428d945612a7d258bfed25fad53cc54882983abdc73fe60f91 + w_download https://web.archive.org/web/20120325004645/https://download.microsoft.com/download/5/9/1/5912526C-B950-4662-99B6-119A83E60E5C/xnafx31_redist.msi 187e7e6b08fe35428d945612a7d258bfed25fad53cc54882983abdc73fe60f91 w_try_cd "${W_CACHE}/${W_PACKAGE}" w_try "${WINE}" msiexec ${W_OPT_UNATTENDED:+/quiet} /i "${file1}" } @@ -14269,7 +14248,8 @@ w_metadata lucida fonts \ load_lucida() { - w_download "https://ftpmirror.your.org/pub/misc/ftp.microsoft.com/bussys/winnt/winnt-public/fixes/usa/NT40TSE/hotfixes-postSP3/Euro-fix/eurofixi.exe" 41f272a33521f6e15f2cce9ff1e049f2badd5ff0dc327fc81b60825766d5b6c7 + # The site supports https with Let's Encrypt, but that cert fails with curl (which breaks src/linkcheck.sh) + w_download "http://ftpmirror.your.org/pub/misc/ftp.microsoft.com/bussys/winnt/winnt-public/fixes/usa/NT40TSE/hotfixes-postSP3/Euro-fix/eurofixi.exe" 41f272a33521f6e15f2cce9ff1e049f2badd5ff0dc327fc81b60825766d5b6c7 w_try_cabextract -d "${W_TMP}" -F "lucon.ttf" "${W_CACHE}"/lucida/eurofixi.exe w_try_cp_font_files "${W_TMP}" "${W_FONTSDIR_UNIX}" w_register_font lucon.ttf "Lucida Console" @@ -14310,7 +14290,7 @@ w_metadata sourcehansans fonts \ load_sourcehansans() { - w_download "https://github.com/adobe-fonts/source-han-sans/releases/download/2.001R/SourceHanSans.ttc" 9e94fe493685a7c99ce61e4488169007e3b97badb9f1ef43d3c13da501463780 + w_download "https://github.com/adobe-fonts/source-han-sans/releases/download/2.002R/SourceHanSans.ttc" 8c06d305a45d56fbc81ec67ca0afa552fbae1e69d4d42b49016a9ace677f89d8 w_try cp "${W_CACHE}/${W_PACKAGE}/${file1}" "${W_TMP}/sourcehansans.ttc" w_try_cp_font_files "${W_TMP}" "${W_FONTSDIR_UNIX}" "*.ttc" @@ -14506,16 +14486,16 @@ load_wenquanyizenhei() w_metadata unifont fonts \ title="Unifont alternative to Arial Unicode MS" \ publisher="Roman Czyborra / GNU" \ - year="2019" \ + year="2021" \ media="download" \ - file1="unifont-12.1.02.ttf" \ + file1="unifont-13.0.06.ttf" \ installed_file1="${W_FONTSDIR_WIN}/unifont.ttf" load_unifont() { - # The GNU Unifont provides glyphs for just about everything in common language. It is intended for multilingual usage. - # See http://unifoundry.com/unifont.html for project page - w_download "http://unifoundry.com/pub/unifont/unifont-12.1.02/font-builds/unifont-12.1.02.ttf" da4961540b9d02e01fb8755924db730db233c360b20ee321fda8ab7d0b9ca549 + # The GNU Unifont provides glyphs for just about everything in common language. It is intended for multilingual usage. + # See https://unifoundry.com/unifont/index.html for project page. + w_download "https://unifoundry.com/pub/unifont/unifont-13.0.06/font-builds/unifont-13.0.06.ttf" d73c0425811ffd366b0d1973e9338bac26fe7cf085760a12e10c61241915e742 w_try cp "${W_CACHE}/${W_PACKAGE}/${file1}" "${W_TMP}/unifont.ttf" w_try_cp_font_files "${W_TMP}" "${W_FONTSDIR_UNIX}" @@ -16231,7 +16211,8 @@ load_steam() { # 2016/10/28: 029f918a29b2b311711788e8a477c8de529c11d7dba3caf99cbbde5a983efdad # 2018/06/01: 3bc6942fe09f10ed3447bccdcf4a70ed369366fef6b2c7f43b541f1a3c5d1c51 - w_download http://media.steampowered.com/client/installer/SteamSetup.exe 3bc6942fe09f10ed3447bccdcf4a70ed369366fef6b2c7f43b541f1a3c5d1c51 + # 2021/03/27: 874788b45dfc043289ba05387e83f27b4a046004a88a4c5ee7c073187ff65b9d + w_download http://media.steampowered.com/client/installer/SteamSetup.exe 874788b45dfc043289ba05387e83f27b4a046004a88a4c5ee7c073187ff65b9d w_try_cd "${W_CACHE}/${W_PACKAGE}" if [ -n "${W_OPT_UNATTENDED}" ]; then @@ -16266,6 +16247,9 @@ load_steam() if w_workaround_wine_bug 44985 "Disabling libglesv2 to make Store and Library function correctly."; then w_override_dlls disabled libglesv2 fi + + # Otherwise Steam Store and Library don't show + w_call corefonts } #---------------------------------------------------------------- diff --git a/portwine_install_script/PortNAME-XX b/portwine_install_script/PortNAME-XX index 2746f9d7..fe518c12 100644 --- a/portwine_install_script/PortNAME-XX +++ b/portwine_install_script/PortNAME-XX @@ -19,7 +19,7 @@ export PW_FTP_URL="https://portwine-linux.ru/ftp" export INSTALLING_PORT=1 export PROGS_INST="" export vexit=0 -export minimum_ldd_ver="2.28" +export minimum_ldd_ver="2.21" ######################################################################## export local_script_hash=$(sha256sum "$0" | awk '{print $1}') export remote_script_hash=`curl -s --list-only "${PW_FTP_URL}/portwine/${portname}-${port_ver}.sha256sum" | awk '{print $1}'` @@ -164,5 +164,5 @@ sed -n 1,168p "${links}/${setup_script}" > "${PORT_WINE_PATH}/data/tmp/${setup_s echo "${portname}" > "${PORT_WINE_PATH}/data/tmp/portname" ######################################################################## cd "${PORT_WINE_PATH}/data/scripts" -sh "${PORT_WINE_PATH}/data/scripts/setup.sh" && exit 0 +/bin/bash -c "${PORT_WINE_PATH}/data/scripts/setup.sh" && exit 0 ################################ARCH_BIN################################