Accepting request 630514 from Emulators
- Update to 3.14 development release - Support for DXTn texture decompression. - Deferral support for MSI install actions. - Support for Japanese keyboard in DirectInput. - More improvements in the standard Task Dialog. - A few more icons in Shell32. - Various bug fixes. - updated staging to 3.14 - updated winetricks - recommend libpulse0-32bit in wine-32bit (bsc#1104952) OBS-URL: https://build.opensuse.org/request/show/630514 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=260
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
1235fe1a7b
2
_service
2
_service
@ -3,7 +3,7 @@
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
<param name="url">https://github.com/wine-staging/wine-staging.git</param>
|
||||
<param name="revision">refs/tags/v3.13.1</param>
|
||||
<param name="revision">refs/tags/v3.14</param>
|
||||
<param name="match-tag">v*.*</param>
|
||||
<param name="scm">git</param>
|
||||
</service>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0785d74852232c1f6e07ac081875e92219a4428ddcc8931632fcf1924941bbd4
|
||||
size 20551460
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAltSGE4ACgkQzvrI6q8X
|
||||
UZ0iSg//QWn7NNEe8ltkC/2kAKK6R0MruwyPCkbpcAOkqWqmKbPg/uKkS1QEojyu
|
||||
C+BreBB7FyWTNFJtPI4c7PlBy1S/PeAGMwz1oxcboyC5pd2nAT4ruybeieQF3mzT
|
||||
NM2XOM80sj/VvQzNw+ZxFZI28T22sTMgEn718/Bck26VWZByYD9RS1m48/280fnF
|
||||
1882Wg27+HjYNsyYG4osvcG4mwCvXdR17T+B/4KuXoJ7nyW/Ziwt9RMPt5C611ua
|
||||
qjznDmuGG9Qx7HRVon3oc6sOsbINN6eGIuatcpFo29m+61e3CRsU0PcG6P424/94
|
||||
0vTcrpcYb/MYA7YH12bIK7x7zqz3ZdswD4RMs+ht++DQKkPjw5AboRQKuCjgz+ND
|
||||
fZg33w/OSTlZIkPLMqiK8j5Kipf80G1SJOH8W0QIs45s5eQ+xPjMwo/g7b9pJmM5
|
||||
UyZ1OdrW3khXVyvj0P8qOCed1F1gZt21DsJ0g6CniEcCFkn8eWzBjHCrh+I9d1vy
|
||||
pkhUze3+V242b9ZXticMu5qbsTU/69Lts3CNOoY922ietlqi94CNBJ1qBbE5iAG6
|
||||
w/QtvYZtE+/1NGpjlGLrQFg7znijLAnvjFbEWjEQXheZvNpDhuYP2qrRCmttEPld
|
||||
YhbF0ulkdfmlTK+L1k5T3Vv8M5TCn9tsyLGgvvgyz+VR1Cj4vDE=
|
||||
=sl7m
|
||||
-----END PGP SIGNATURE-----
|
||||
3
wine-3.14.tar.xz
Normal file
3
wine-3.14.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:47896634c255c202d04b85f884b4f1bceb02e1d7bb2ff257b6bc8d69d4b0b005
|
||||
size 20583696
|
||||
16
wine-3.14.tar.xz.sign
Normal file
16
wine-3.14.tar.xz.sign
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlt3Bp4ACgkQzvrI6q8X
|
||||
UZ1WrA//a61H/PaKC9q2QRfB+3mcPunbNWiBNl7z6tObn5ijS8QVGyjYYSHZkjTs
|
||||
RJW1hxB1+sD2PZlCN1SoUS7vrnflRJNa9jjRDVzM1CZzM2dosEHz7kfUUcB+4urR
|
||||
MZze8omt9jHKErjLvCJEhiGjZUuse2VYG4skvPtR44/ORT4CHSw6b3y+c73A6HOS
|
||||
zdhg9GTR7e2MP3HF/kFt2dW8FPNvikeDCqHsebqMP6l6eKmotz6eRMQATgKX08Gn
|
||||
IlylGJHSEFrrXuwloXfYNvM41fTp2QLHmOw4RYz0bedJRnzdpnuhJ4+PxdCs/D0e
|
||||
VIlUOJEpWBiW0VAR8Y7XtYCLFIgw/R6CtWfbPWUznrCxRrXsb7MTTVebi8ESWMpK
|
||||
cK2+qAiBGONXaLBgq6ugf+4QZ9NCQjgz0KzHu/gN1hgWUfNXr81C3/ZnO414dlAm
|
||||
0H3wICtBkTbmuDWmKv0yztgYVF4JSHCLliP/SdtV7gSKJQR3OxWjLL+7Rt0kXGZa
|
||||
ZRQpOnV4rkGBvjV4TdLmZPAAqgXW+/MEPChwNqHcLF2KW0Qxs0yn1I2AsiyYouQ0
|
||||
4X2iH3oncJBABJIiD4lfyirwWAy8UTKLks+3vaDawbZKnjOaap1pnDupNhKovtiy
|
||||
qBcnV3uzVEqB+lbs0GMsPkwGGkQ/103n69rCKtB+5ce0jw4apzw=
|
||||
=uuji
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d77ae343534625b05c85c419f06925be863a7c461f79a139a6452fba26761657
|
||||
size 7597436
|
||||
3
wine-staging-3.14.tar.xz
Normal file
3
wine-staging-3.14.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9ce10521e11628f141e6da4d91b84fb7fa3ac1f8fc8d73a66c0f50508f4efbb3
|
||||
size 7520156
|
||||
18
wine.changes
18
wine.changes
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 17 19:59:29 UTC 2018 - meissner@suse.com
|
||||
|
||||
- Update to 3.14 development release
|
||||
- Support for DXTn texture decompression.
|
||||
- Deferral support for MSI install actions.
|
||||
- Support for Japanese keyboard in DirectInput.
|
||||
- More improvements in the standard Task Dialog.
|
||||
- A few more icons in Shell32.
|
||||
- Various bug fixes.
|
||||
- updated staging to 3.14
|
||||
- updated winetricks
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 16 06:07:52 UTC 2018 - meissner@suse.com
|
||||
|
||||
- recommend libpulse0-32bit in wine-32bit (bsc#1104952)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 6 14:36:38 UTC 2018 - meissner@suse.com
|
||||
|
||||
|
||||
@ -107,8 +107,8 @@ BuildRequires: pkgconfig(xrandr)
|
||||
BuildRequires: pkgconfig(xrender)
|
||||
BuildRequires: pkgconfig(xxf86vm)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
%define realver 3.13
|
||||
Version: 3.13
|
||||
%define realver 3.14
|
||||
Version: 3.14
|
||||
Release: 0
|
||||
Summary: An MS Windows Emulator
|
||||
License: LGPL-2.1-or-later
|
||||
@ -146,7 +146,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64
|
||||
%if %{staging}
|
||||
# upstream patch target version
|
||||
%define staging_version 3.13.1
|
||||
%define staging_version 3.14
|
||||
Source100: wine-staging-%{staging_version}.tar.xz
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: libOSMesa-devel
|
||||
@ -267,6 +267,7 @@ echo " +^/usr/bin/wine-preloader\$" >> %SOURCE7
|
||||
echo " +^/usr/lib/wine/fakedlls" >> %SOURCE7
|
||||
grep SONAME_ config.log
|
||||
grep SONAME_ config.log|grep -v 'so"'|sed -e 's/^.*\(".*"\).*$/ requires \1/;'|sort -u >>%SOURCE7
|
||||
echo " recommends \"libpulse0-32bit\"" >> %SOURCE7
|
||||
echo " recommends \"alsa-plugins-pulse-32bit\"" >> %SOURCE7
|
||||
echo " recommends \"alsa-plugins-32bit\"" >> %SOURCE7
|
||||
echo " recommends \"Mesa-libGL1-32bit\"" >> %SOURCE7
|
||||
|
||||
495
winetricks
495
winetricks
@ -6,7 +6,7 @@
|
||||
|
||||
# Name of this version of winetricks (YYYYMMDD)
|
||||
# (This doesn't change often, use the sha256sum of the file when reporting problems)
|
||||
WINETRICKS_VERSION=20180603-next
|
||||
WINETRICKS_VERSION=20180815-next
|
||||
|
||||
# This is a UTF-8 file
|
||||
# You should see an o with two dots over it here [ö]
|
||||
@ -462,22 +462,32 @@ w_try_cp_font_files()
|
||||
_W_pattern="*.ttf"
|
||||
fi
|
||||
|
||||
_W_src_files=$(find "$_W_src_dir" -maxdepth 1 -type f -iname "$_W_pattern")
|
||||
# POSIX sh doesn't have a good way to handle this, but putting into a separate script
|
||||
# and running with sh avoids it.
|
||||
#
|
||||
# See https://github.com/Winetricks/winetricks/issues/995 for details
|
||||
|
||||
for _W_src_file in $_W_src_files; do
|
||||
# Extract the file name and lower case it
|
||||
_W_file_name=$(basename "$_W_src_file" | tr "[:upper:]" "[:lower:]")
|
||||
cat > "$WINETRICKS_WORKDIR/cp_font_files.sh" <<_EOF_
|
||||
#!/bin/sh
|
||||
_W_src_file="\$@"
|
||||
|
||||
# Remove any existing font files that might have the same name, but with different case characters
|
||||
find "$_W_dest_dir" -maxdepth 1 -type f -iname "$_W_file_name" -exec rm '{}' ';'
|
||||
# Extract the file name and lower case it
|
||||
_W_file_name="\$(basename "\$_W_src_file" | tr "[:upper:]" "[:lower:]")"
|
||||
|
||||
w_try cp -f "$_W_src_file" "$_W_dest_dir/$_W_file_name"
|
||||
done
|
||||
# Remove any existing font files that might have the same name, but with different case characters
|
||||
find "$_W_dest_dir" -maxdepth 1 -type f -iname "\$_W_file_name" -exec rm '{}' ';'
|
||||
|
||||
# FIXME: w_try() isn't available, need some better error handling:
|
||||
cp -f "\$_W_src_file" "$_W_dest_dir/\$_W_file_name"
|
||||
_EOF_
|
||||
chmod +x "$WINETRICKS_WORKDIR/cp_font_files.sh"
|
||||
|
||||
find "$_W_src_dir" -maxdepth 1 -type f -iname "$_W_pattern" -exec "$WINETRICKS_WORKDIR/cp_font_files.sh" {} \;
|
||||
|
||||
# Wait for Wine to add the new font to the registry under HKCU\Software\Wine\Fonts\Cache
|
||||
w_wineserver -w
|
||||
|
||||
unset _W_src_files _W_dest_dir _W_src_file _W_file_name
|
||||
unset _W_dest_dir
|
||||
}
|
||||
|
||||
w_try_msiexec64()
|
||||
@ -874,6 +884,7 @@ w_dotnet_verify()
|
||||
dotnet46) version="4.6" ;;
|
||||
dotnet461) version="4.6.1" ;;
|
||||
dotnet462) version="4.6.2" ;;
|
||||
dotnet472) version="4.7.2" ;;
|
||||
*) echo error ; exit 1 ;;
|
||||
esac
|
||||
w_call dotnet_verifier
|
||||
@ -2353,6 +2364,7 @@ w_set_winver()
|
||||
{
|
||||
w_skip_windows w_set_winver && return
|
||||
# FIXME: This should really be done with winecfg, but it has no CLI options.
|
||||
# Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45616
|
||||
|
||||
# First, delete any lingering version info, otherwise it may conflict:
|
||||
(
|
||||
@ -2445,10 +2457,22 @@ _EOF_
|
||||
csdversion_hex=dword:00000400
|
||||
;;
|
||||
winxp)
|
||||
csdversion="Service Pack 3"
|
||||
currentbuildnumber="2600"
|
||||
currentversion="5.1"
|
||||
csdversion_hex=dword:00000300
|
||||
# Special case, afaik it's the only Windows version that has different version numbers for 32/64-bit
|
||||
# So ensure we set the arch appropriate version:
|
||||
if [ "$W_ARCH" = "win32" ]; then
|
||||
csdversion="Service Pack 3"
|
||||
currentbuildnumber="2600"
|
||||
currentversion="5.1"
|
||||
csdversion_hex=dword:00000300
|
||||
elif [ "$W_ARCH" = "win64" ]; then
|
||||
csdversion="Service Pack 2"
|
||||
currentbuildnumber="3790"
|
||||
currentversion="5.2"
|
||||
csdversion_hex=dword:00000200
|
||||
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
|
||||
else
|
||||
w_die "Invalid W_ARCH $W_ARCH"
|
||||
fi
|
||||
;;
|
||||
win2k3)
|
||||
csdversion="Service Pack 2"
|
||||
@ -2941,8 +2965,9 @@ w_append_path()
|
||||
{
|
||||
# Prepend $1 to the Windows path in the registry.
|
||||
# Use printf %s to avoid interpreting backslashes.
|
||||
_W_NEW_PATH="$(printf %s "$1" | sed 's,\\\\,\\\\\\\\,g')"
|
||||
_W_WIN_PATH="$(w_expand_env PATH | sed 's,\\\\,\\\\\\\\,g')"
|
||||
# 2/4 backslashes, not 4/8, see https://github.com/Winetricks/winetricks/issues/932
|
||||
_W_NEW_PATH="$(printf %s "$1" | sed 's,\\,\\\\,g')"
|
||||
_W_WIN_PATH="$(w_expand_env PATH | sed 's,\\,\\\\,g')"
|
||||
|
||||
# FIXME: OS X? https://github.com/Winetricks/winetricks/issues/697
|
||||
sed 's/$/\r/' > "$W_TMP"/path.reg <<_EOF_
|
||||
@ -5639,7 +5664,8 @@ load_cabinet()
|
||||
# https://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en
|
||||
# Originally at: https://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe
|
||||
# Mirror list: http://www.filewatcher.com/m/MDAC_TYP.EXE.5389224-0.html (5.14 MB MDAC_TYP.EXE)
|
||||
w_download http://ftp.gunadarma.ac.id/pub/driver/itegno/USB%20Software/MDAC/MDAC_TYP.EXE 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
|
||||
# 2018/08/09: ftp.gunadarma.ac.id is dead, moved to archive.org
|
||||
w_download https://web.archive.org/web/20060718123742/http://ftp.gunadarma.ac.id/pub/driver/itegno/USB%20Software/MDAC/MDAC_TYP.EXE 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
|
||||
|
||||
w_try_cabextract --directory="${W_TMP}" "${W_CACHE}/${W_PACKAGE}/${file1}"
|
||||
w_try cp "${W_TMP}/cabinet.dll" "${W_SYSTEM32_DLLS}/cabinet.dll"
|
||||
@ -6606,13 +6632,21 @@ load_dxsdk_jun2010()
|
||||
#----------------------------------------------------------------
|
||||
|
||||
# $1 - dxvk archive name (required)
|
||||
# $2 - minimum Wine version (optional)
|
||||
# $3 - minimum Vulkan API version (optional, requires $2 be set)
|
||||
# $2 - dxvk d3d10_enabled / d3d10_disabled (required)
|
||||
# $3 - minimum Wine version (optional)
|
||||
# $4 - minimum Vulkan API version (optional, requires $3 be set)
|
||||
helper_dxvk()
|
||||
{
|
||||
_W_dxvk_archive="${1}"
|
||||
_W_min_wine_version="${2}"
|
||||
_W_min_vulkan_version="${3}"
|
||||
_W_dxvk_d3d10="${2}"
|
||||
_W_min_wine_version="${3}"
|
||||
_W_min_vulkan_version="${4}"
|
||||
|
||||
case $_W_dxvk_d3d10 in
|
||||
d3d10_enabled) _W_dll_overrides="d3d10 d3d10_1 d3d10core d3d11 dxgi";;
|
||||
d3d10_disabled) _W_dll_overrides="d3d11 dxgi";;
|
||||
*) w_die "parameter unsupported: $_W_dxvk_d3d10 ; supported parameters: d3d10_enabled d3d10_disabled"
|
||||
esac
|
||||
|
||||
_W_dxvk_dir="${_W_dxvk_archive%.tar.gz}"
|
||||
_W_dxvk_version="${_W_dxvk_dir#*-}"
|
||||
@ -6627,15 +6661,18 @@ helper_dxvk()
|
||||
|
||||
w_try_cd "$W_TMP"
|
||||
w_try tar -zxf "$W_CACHE/$W_PACKAGE/$_W_dxvk_archive"
|
||||
w_try mv "$W_TMP/$_W_dxvk_dir/x32/d3d11.dll" "$W_SYSTEM32_DLLS/"
|
||||
w_try mv "$W_TMP/$_W_dxvk_dir/x32/dxgi.dll" "$W_SYSTEM32_DLLS/"
|
||||
for _W_dll in $_W_dll_overrides; do
|
||||
w_try mv "$W_TMP/$_W_dxvk_dir/x32/$_W_dll.dll" "$W_SYSTEM32_DLLS/"
|
||||
done
|
||||
if test "$W_ARCH" = "win64"; then
|
||||
w_try mv "$W_TMP/$_W_dxvk_dir/x64/d3d11.dll" "$W_SYSTEM64_DLLS/"
|
||||
w_try mv "$W_TMP/$_W_dxvk_dir/x64/dxgi.dll" "$W_SYSTEM64_DLLS/"
|
||||
for _W_dll in $_W_dll_overrides; do
|
||||
w_try mv "$W_TMP/$_W_dxvk_dir/x64/$_W_dll.dll" "$W_SYSTEM64_DLLS/"
|
||||
done
|
||||
fi
|
||||
w_override_dlls native d3d11 dxgi
|
||||
# shellcheck disable=SC2086
|
||||
w_override_dlls native $_W_dll_overrides
|
||||
|
||||
unset _W_dxvk_archive _W_dxvk_dir _W_dxvk_version _W_min_vulkan_version _W_min_wine_version
|
||||
unset _W_dll _W_dll_overrides _W_dxvk_archive _W_dxvk_d3d10 _W_dxvk_dir _W_dxvk_version _W_min_vulkan_version _W_min_wine_version
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
@ -6653,7 +6690,7 @@ load_dxvk54()
|
||||
{
|
||||
# https://github.com/doitsujin/dxvk
|
||||
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.54/dxvk-0.54.tar.gz" 1c2f186baaa01d2de7b832f6f05021bdd29eccb65fc197c8b15adfd4e08f9640
|
||||
helper_dxvk "$file1"
|
||||
helper_dxvk "$file1" "d3d10_disabled" "3.6"
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
@ -6671,7 +6708,7 @@ load_dxvk60()
|
||||
{
|
||||
# https://github.com/doitsujin/dxvk
|
||||
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.60/dxvk-0.60.tar.gz" 27d6f700241d3ec3b6c002c3d739bb0e3f210ec916ecb5a62d9204e9e50f2c4a
|
||||
helper_dxvk "$file1" "3.10" "1.0.76"
|
||||
helper_dxvk "$file1" "d3d10_disabled" "3.10" "1.0.76"
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
@ -6689,28 +6726,116 @@ load_dxvk61()
|
||||
{
|
||||
# https://github.com/doitsujin/dxvk
|
||||
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.61/dxvk-0.61.tar.gz" d04388f026dc0d8b276b08f7db74fb3556cbbc8f762401eb5ef52629ee39ded1
|
||||
helper_dxvk "$file1" "3.10" "1.0.76"
|
||||
helper_dxvk "$file1" "d3d10_disabled" "3.10" "1.0.76"
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata dxvk62 dlls \
|
||||
title="Vulkan-based D3D11 implementation for Linux / Wine (0.62)" \
|
||||
publisher="Philip Rebohle" \
|
||||
year="2018" \
|
||||
media="download" \
|
||||
file1="dxvk-0.62.tar.gz" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
|
||||
installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
|
||||
|
||||
load_dxvk62()
|
||||
{
|
||||
# https://github.com/doitsujin/dxvk
|
||||
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.62/dxvk-0.62.tar.gz" b9dbb57908e24b094b68f665ad729b6ee277eecc8ba04a6e6e4f8a4d2dfd94e3
|
||||
helper_dxvk "$file1" "d3d10_disabled" "3.10" "1.0.76"
|
||||
}
|
||||
|
||||
w_metadata dxvk63 dlls \
|
||||
title="Vulkan-based D3D11 implementation for Linux / Wine (0.63)" \
|
||||
publisher="Philip Rebohle" \
|
||||
year="2018" \
|
||||
media="download" \
|
||||
file1="dxvk-0.63.tar.gz" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
|
||||
installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
|
||||
|
||||
load_dxvk63()
|
||||
{
|
||||
# https://github.com/doitsujin/dxvk
|
||||
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.63/dxvk-0.63.tar.gz" 696df816bd9640770dee14f932bc641a16261fccf76be7c28d812a64ca6040fa
|
||||
helper_dxvk "$file1" "d3d10_disabled" "3.10" "1.0.76"
|
||||
}
|
||||
|
||||
w_metadata dxvk64 dlls \
|
||||
title="Vulkan-based D3D11 implementation for Linux / Wine (0.64)" \
|
||||
publisher="Philip Rebohle" \
|
||||
year="2018" \
|
||||
media="download" \
|
||||
file1="dxvk-0.64.tar.gz" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
|
||||
installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
|
||||
|
||||
load_dxvk64()
|
||||
{
|
||||
# https://github.com/doitsujin/dxvk
|
||||
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.64/dxvk-0.64.tar.gz" 2e03e40ff0a9d36f96a06137f3fa9110ebaea230d0bf6c22cf6399e16e97fb9c
|
||||
helper_dxvk "$file1" "d3d10_disabled" "3.10" "1.0.76"
|
||||
}
|
||||
|
||||
w_metadata dxvk65 dlls \
|
||||
title="Vulkan-based D3D11 implementation for Linux / Wine (0.65)" \
|
||||
publisher="Philip Rebohle" \
|
||||
year="2018" \
|
||||
media="download" \
|
||||
file1="dxvk-0.65.tar.gz" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
|
||||
installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
|
||||
|
||||
load_dxvk65()
|
||||
{
|
||||
# https://github.com/doitsujin/dxvk
|
||||
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.65/dxvk-0.65.tar.gz" 7b4eb42e693f925d0aff90bae261b20c50428602382ee94a3e3860b2ad1ebad0
|
||||
helper_dxvk "$file1" "d3d10_disabled" "3.10" "1.0.76"
|
||||
}
|
||||
|
||||
w_metadata dxvk70 dlls \
|
||||
title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.70)" \
|
||||
publisher="Philip Rebohle" \
|
||||
year="2018" \
|
||||
media="download" \
|
||||
file1="dxvk-0.70.tar.gz" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
|
||||
installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
|
||||
installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
|
||||
installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
|
||||
installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
|
||||
|
||||
load_dxvk70()
|
||||
{
|
||||
# https://github.com/doitsujin/dxvk
|
||||
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.70/dxvk-0.70.tar.gz" 310546d530be494a35cae49b707fef4b073269d811aac25bdf72899ed1df4e9f
|
||||
helper_dxvk "$file1" "d3d10_enabled" "3.10" "1.0.76"
|
||||
}
|
||||
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata dxvk dlls \
|
||||
title="Vulkan-based D3D11 implementation for Linux / Wine (latest)" \
|
||||
title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (latest)" \
|
||||
publisher="Philip Rebohle" \
|
||||
year="2018" \
|
||||
media="download" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
|
||||
installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
|
||||
installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
|
||||
installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
|
||||
installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
|
||||
installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
|
||||
|
||||
load_dxvk()
|
||||
{
|
||||
# https://github.com/doitsujin/dxvk
|
||||
# There's no stable exe URL, but they do provide a RELEASE file that lets us build one:
|
||||
w_download_to "$W_TMP" "https://raw.githubusercontent.com/doitsujin/dxvk/master/RELEASE"
|
||||
dxvk_version="$(cat "${W_TMP}/RELEASE")"
|
||||
w_download_to "${W_TMP_EARLY}" "https://raw.githubusercontent.com/doitsujin/dxvk/master/RELEASE"
|
||||
dxvk_version="$(cat "${W_TMP_EARLY}/RELEASE")"
|
||||
w_linkcheck=1_ignore w_download "https://github.com/doitsujin/dxvk/releases/download/v${dxvk_version}/dxvk-${dxvk_version}.tar.gz"
|
||||
helper_dxvk "dxvk-${dxvk_version}.tar.gz" "3.10" "1.0.76"
|
||||
helper_dxvk "dxvk-${dxvk_version}.tar.gz" "d3d10_enabled" "3.10" "1.0.76"
|
||||
unset dxvk_version
|
||||
}
|
||||
|
||||
@ -7698,6 +7823,10 @@ load_dotnet46()
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
|
||||
if w_workaround_wine_bug 42470 "$W_PACKAGE may experience heap timeouts" ,3.14; then
|
||||
w_warn "If you see heap timeouts like: 'err:ntdll:RtlpWaitForCriticalSection section 0x110060 \"heap.c: main process heap section\" wait timed out in thread 0064, blocked by 0000, retrying (60 sec)', try the patch from https://bugs.winehq.org/show_bug.cgi?id=42470"
|
||||
fi
|
||||
|
||||
if w_workaround_wine_bug 38959 ; then
|
||||
echo "This installer will fail unless run in quiet mode."
|
||||
echo "See: https://bugs.winehq.org/show_bug.cgi?id=38959"
|
||||
@ -7732,7 +7861,7 @@ w_metadata dotnet461 dlls \
|
||||
media="download" \
|
||||
file1="NDP461-KB3102436-x86-x64-AllOS-ENU.exe" \
|
||||
conflicts="dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2 dotnet35sp1 dotnet40 dotnet46 vjrun20" \
|
||||
installed_file1="c:/users/$LOGNAME/Temp/dd_NDP461-KB3102436-x86-x64-AllOS-ENU_decompression_log.txt"
|
||||
installed_file1="c:/windows/dotnet461.installed.workaround"
|
||||
|
||||
load_dotnet461()
|
||||
{
|
||||
@ -7748,7 +7877,7 @@ load_dotnet461()
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
|
||||
WINEDLLOVERRIDES=fusion=b "$WINE" "$file1" ${W_OPT_UNATTENDED:+/q /norestart}
|
||||
WINEDLLOVERRIDES=fusion=b "$WINE" "$file1" /sfxlang:1027 ${W_OPT_UNATTENDED:+/q /norestart}
|
||||
status=$?
|
||||
|
||||
echo "exit status: $status"
|
||||
@ -7761,6 +7890,9 @@ load_dotnet461()
|
||||
esac
|
||||
|
||||
w_override_dlls native mscoree
|
||||
|
||||
# Do not rely on temporary files. As a workaround, touch a file instead so that we know it's been installed for list-installed
|
||||
w_try touch "${W_WINDIR_UNIX}/dotnet461.installed.workaround"
|
||||
}
|
||||
|
||||
verify_dotnet461()
|
||||
@ -7791,7 +7923,7 @@ load_dotnet462()
|
||||
# Official version. See https://www.microsoft.com/en-us/download/details.aspx?id=53344
|
||||
w_download https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe 28886593e3b32f018241a4c0b745e564526dbb3295cb2635944e3a393f4278d4
|
||||
file_package="NDP462-KB3151800-x86-x64-AllOS-ENU.exe"
|
||||
unattended_args="/q /norestart"
|
||||
unattended_args="/sfxlang:1027 /q /norestart"
|
||||
fi
|
||||
|
||||
w_call remove_mono
|
||||
@ -7808,6 +7940,8 @@ load_dotnet462()
|
||||
|
||||
case $status in
|
||||
0) ;;
|
||||
105) echo "exit status $status - normal, user selected 'restart now'" ;;
|
||||
194) echo "exit status $status - normal, user selected 'restart later'" ;;
|
||||
5) w_die "exit status $status - user selected 'Cancel'" ;;
|
||||
*) w_die "exit status $status - $W_PACKAGE installation failed" ;;
|
||||
esac
|
||||
@ -7824,6 +7958,64 @@ verify_dotnet462()
|
||||
w_dotnet_verify dotnet462
|
||||
}
|
||||
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata dotnet472 dlls \
|
||||
title="MS .NET 4.7.2" \
|
||||
publisher="Microsoft" \
|
||||
year="2018" \
|
||||
media="download" \
|
||||
conflicts="dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2 dotnet35sp1 dotnet40 dotnet46 dotnet461 dotnet462 vjrun20" \
|
||||
installed_file1="c:/windows/dotnet472.installed.workaround"
|
||||
|
||||
load_dotnet472()
|
||||
{
|
||||
w_package_warn_win64
|
||||
|
||||
if w_workaround_wine_bug 42170 "Running un-official repacked .NET 4.7.2 setup until the official version is fixed."; then
|
||||
# Un-official slim version. See https://repacks.net/forum/viewtopic.php?t=7
|
||||
file_package="dotNetFx472_Full_x86_x64_Slim.exe"
|
||||
w_download "https://drive.google.com/uc?export=download&id=1aLBCH0Yt2-6ROpWRBxZ01kqGMyhc_8hM&confirm" a36da041b8f46079f8e16647312d642953cde520f4a600ad5b3f4f90a23495a7 $file_package
|
||||
unattended_args="/ai /gm2"
|
||||
else
|
||||
# Official version. See https://www.microsoft.com/en-us/download/details.aspx?id=53344
|
||||
w_download https://download.microsoft.com/download/6/E/4/6E48E8AB-DC00-419E-9704-06DD46E5F81D/NDP472-KB4054530-x86-x64-AllOS-ENU.exe c908f0a5bea4be282e35acba307d0061b71b8b66ca9894943d3cbb53cad019bc
|
||||
file_package="NDP472-KB4054530-x86-x64-AllOS-ENU.exe"
|
||||
unattended_args="/sfxlang:1027 /q /norestart"
|
||||
fi
|
||||
|
||||
w_call remove_mono
|
||||
|
||||
w_call dotnet462
|
||||
w_set_winver win7
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
|
||||
WINEDLLOVERRIDES=fusion=b "$WINE" "$file_package" ${W_OPT_UNATTENDED:+$unattended_args}
|
||||
status=$?
|
||||
|
||||
echo "exit status: $status"
|
||||
|
||||
case $status in
|
||||
0) ;;
|
||||
105) echo "exit status $status - normal, user selected 'restart now'" ;;
|
||||
194) echo "exit status $status - normal, user selected 'restart later'" ;;
|
||||
5) w_die "exit status $status - user selected 'Cancel'" ;;
|
||||
*) w_die "exit status $status - $W_PACKAGE installation failed" ;;
|
||||
esac
|
||||
|
||||
w_override_dlls native mscoree
|
||||
|
||||
# Do not rely on temporary files. As a workaround, touch a file instead so that we know it's been installed for list-installed
|
||||
w_try touch "${W_WINDIR_UNIX}/dotnet472.installed.workaround"
|
||||
}
|
||||
|
||||
verify_dotnet472()
|
||||
{
|
||||
w_dotnet_verify dotnet472
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata dotnet_verifier dlls \
|
||||
@ -7963,20 +8155,26 @@ load_esent()
|
||||
# FIXME: update winetricks_is_installed to look at installed_file2..n
|
||||
# https://github.com/Winetricks/winetricks/issues/988
|
||||
w_metadata flash dlls \
|
||||
title="Flash Player 14" \
|
||||
title="Flash Player 29" \
|
||||
publisher="Adobe" \
|
||||
year="2014" \
|
||||
year="2018" \
|
||||
media="download" \
|
||||
file1="install_flash_player.exe" \
|
||||
file2="install_flash_player_ax.exe" \
|
||||
file3="flashplayer_14_sa.exe" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil32_14_0_0_179_Plugin.exe" \
|
||||
installed_file2="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil32_14_0_0_176_ActiveX.exe" \
|
||||
installed_file3="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/flashplayer_14_sa.exe" \
|
||||
file1="fp_29.0.0.171_archive.zip" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil32_29_0_0_171_Plugin.exe" \
|
||||
installed_file2="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil32_29_0_0_171_ActiveX.exe" \
|
||||
installed_file3="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/flashplayer29_0r0_171_win_sa.exe" \
|
||||
homepage="https://www.adobe.com/products/flashplayer/"
|
||||
|
||||
load_flash()
|
||||
{
|
||||
_W_ver_major=29
|
||||
_W_ver_minor=0
|
||||
_W_ver_rel=0
|
||||
_W_ver_build=171
|
||||
_W_dirname="${_W_ver_major}_${_W_ver_minor}_r${_W_ver_rel}_${_W_ver_build}"
|
||||
_W_archive="fp_${_W_ver_major}.${_W_ver_minor}.${_W_ver_rel}.${_W_ver_build}_archive.zip"
|
||||
_W_fileprefix="flashplayer${_W_ver_major}_${_W_ver_minor}r${_W_ver_rel}_${_W_ver_build}"
|
||||
|
||||
# 2013/07/09: Adobe Flash 10 is no longer supported.
|
||||
# 2013/06/24: Adobe Flash 10.3 won't even install for me, it tells you to go get a newer version!
|
||||
# See
|
||||
@ -7985,27 +8183,30 @@ load_flash()
|
||||
# Now, we install older versions by using zipfiles at
|
||||
# https://helpx.adobe.com/flash-player/kb/archived-flash-player-versions.html
|
||||
|
||||
# 2018/06/24: d4b6f9a5e42cc9f2c7cbd1fd72059d4c1bead91b076afa2ca042d28f0fd7bedb
|
||||
w_download "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/$_W_archive" d4b6f9a5e42cc9f2c7cbd1fd72059d4c1bead91b076afa2ca042d28f0fd7bedb
|
||||
|
||||
# If OS version is Vista or newer:
|
||||
# 1. NPAPI plugin doesn't work
|
||||
# 2. In win64 prefix, "File not found." dialog appears when installing:
|
||||
# 'wine: cannot find L"C:\\windows\\system32\\Macromed\\Temp\\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}\\InstallFlashPlayer.exe"'
|
||||
w_set_winver winxp
|
||||
|
||||
# ActiveX plugin
|
||||
# 2014/10/02: 3958827058648cfe05fc6ee510685e8d93f995d3428c3eedbd6814704765672a
|
||||
w_download https://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.176_archive.zip 3958827058648cfe05fc6ee510685e8d93f995d3428c3eedbd6814704765672a
|
||||
|
||||
w_try_unzip "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.176_archive.zip fp_14.0.0.176_archive/14_0_r0_176/flashplayer14_0r0_176_winax.exe
|
||||
w_try_cd "$W_TMP"/fp_14.0.0.176_archive/14_0_r0_176
|
||||
w_try "$WINE" flashplayer14_0r0_176_winax.exe ${W_OPT_UNATTENDED:+ /install}
|
||||
w_try_unzip "$W_TMP" "$W_CACHE/flash/$_W_archive" "$_W_dirname/${_W_fileprefix}_winax.exe"
|
||||
w_try_cd "$W_TMP/$_W_dirname"
|
||||
w_try "$WINE" "${_W_fileprefix}_winax.exe" ${W_OPT_UNATTENDED:+ /install}
|
||||
|
||||
# Mozilla / Firefox (NPAPI) plugin
|
||||
# 2014/10/02: 17496fd3c863c180aead953d7d4499dd36f997a9570abc2b92f55e4ea1d55d73
|
||||
w_download https://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.179_archive.zip 17496fd3c863c180aead953d7d4499dd36f997a9570abc2b92f55e4ea1d55d73
|
||||
|
||||
w_try_unzip "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.179_archive.zip fp_14.0.0.179_archive/14_0_r0_179/flashplayer14_0r0_179_win.exe
|
||||
w_try_cd "$W_TMP"/fp_14.0.0.179_archive/14_0_r0_179
|
||||
w_try "$WINE" flashplayer14_0r0_179_win.exe ${W_OPT_UNATTENDED:+ /install}
|
||||
w_try_unzip "$W_TMP" "$W_CACHE/flash/$_W_archive" "$_W_dirname/${_W_fileprefix}_win.exe"
|
||||
w_try "$WINE" "${_W_fileprefix}_win.exe" ${W_OPT_UNATTENDED:+ /install}
|
||||
|
||||
# Projector (standalone player)
|
||||
# 2015/07/06:
|
||||
w_download https://download.macromedia.com/pub/flashplayer/updaters/14/flashplayer_14_sa.exe 8640c42e73dc44125045e17abd32412c48f3808a8393c94fc8281cf4b0d87bdc
|
||||
# shellcheck disable=SC2154
|
||||
w_try cp "${W_CACHE}/${W_PACKAGE}/${file3}" "$W_SYSTEM32_DLLS/Macromed/Flash"
|
||||
# 2015/07/06: 8640c42e73dc44125045e17abd32412c48f3808a8393c94fc8281cf4b0d87bdc
|
||||
w_try_unzip "$W_TMP" "$W_CACHE/flash/$_W_archive" "$_W_dirname/${_W_fileprefix}_win_sa.exe"
|
||||
w_try mv "${_W_fileprefix}_win_sa.exe" "$W_SYSTEM32_DLLS/Macromed/Flash"
|
||||
|
||||
# After updating the above, you should carry the following steps out by
|
||||
# hand to verify that plugin works.
|
||||
@ -8026,6 +8227,8 @@ load_flash()
|
||||
# wine firefox.exe https://www.adobe.com/software/flash/about
|
||||
# Verify that the version of Flash shows up and that you're not prompted
|
||||
# to install Flash again
|
||||
|
||||
unset _W_ver_major _W_ver_minor _W_ver_rel _W_ver_build _W_dirname _W_archive _W_fileprefix
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
@ -8147,7 +8350,7 @@ w_metadata glut dlls \
|
||||
|
||||
load_glut()
|
||||
{
|
||||
w_download http://press.liacs.nl/researchdownloads/glut.win32/glut-3.7.6-bin.zip 788e97653bfd527afbdc69e1b7c6bcf9cb45f33d13ddf9d676dc070da92f80d4
|
||||
w_download https://press.liacs.nl/researchdownloads/glut.win32/glut-3.7.6-bin.zip 788e97653bfd527afbdc69e1b7c6bcf9cb45f33d13ddf9d676dc070da92f80d4
|
||||
# FreeBSD unzip rm -rf's inside the target directory before extracting:
|
||||
w_try_unzip "$W_TMP" "$W_CACHE"/glut/glut-3.7.6-bin.zip
|
||||
w_try mv "$W_TMP/glut-3.7.6-bin" "$W_DRIVE_C"
|
||||
@ -8384,6 +8587,48 @@ load_icodecs()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata itircl dlls \
|
||||
title="MS itircl.dll" \
|
||||
publisher="Microsoft" \
|
||||
year="1999" \
|
||||
media="download" \
|
||||
file1="../hhw/htmlhelp.exe" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/itircl.dll"
|
||||
|
||||
load_itircl()
|
||||
{
|
||||
# https://msdn.microsoft.com/en-us/library/windows/desktop/ms669985(v=vs.85).aspx
|
||||
w_download_to hhw https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe b2b3140d42a818870c1ab13c1c7b8d4536f22bd994fa90aade89729a6009a3ae
|
||||
|
||||
w_try_cabextract -d "$W_TMP" -F hhupd.exe "$W_CACHE"/hhw/htmlhelp.exe
|
||||
w_try_cabextract -d "$W_SYSTEM32_DLLS" -F itircl.dll "$W_TMP"/hhupd.exe
|
||||
w_try_regsvr itircl.dll
|
||||
w_override_dlls native itircl
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata itss dlls \
|
||||
title="MS itss.dll" \
|
||||
publisher="Microsoft" \
|
||||
year="1999" \
|
||||
media="download" \
|
||||
file1="../hhw/htmlhelp.exe" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/itss.dll"
|
||||
|
||||
load_itss()
|
||||
{
|
||||
# https://msdn.microsoft.com/en-us/library/windows/desktop/ms669985(v=vs.85).aspx
|
||||
w_download_to hhw https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe b2b3140d42a818870c1ab13c1c7b8d4536f22bd994fa90aade89729a6009a3ae
|
||||
|
||||
w_try_cabextract -d "$W_TMP" -F hhupd.exe "$W_CACHE"/hhw/htmlhelp.exe
|
||||
w_try_cabextract -d "$W_SYSTEM32_DLLS" -F itss.dll "$W_TMP"/hhupd.exe
|
||||
w_try_regsvr itss.dll
|
||||
w_override_dlls native itss
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata cinepak dlls \
|
||||
title="Cinepak Codec" \
|
||||
publisher="Radius" \
|
||||
@ -8517,7 +8762,8 @@ load_mdac27()
|
||||
# https://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en
|
||||
# Originally at: https://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe
|
||||
# Mirror list: http://www.filewatcher.com/m/MDAC_TYP.EXE.5389224-0.html (5.14 MB MDAC_TYP.EXE)
|
||||
w_download http://ftp.gunadarma.ac.id/pub/driver/itegno/USB%20Software/MDAC/MDAC_TYP.EXE 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
|
||||
# 2018/08/09: ftp.gunadarma.ac.id is dead, moved to archive.org
|
||||
w_download https://web.archive.org/web/20060718123742/http://ftp.gunadarma.ac.id/pub/driver/itegno/USB%20Software/MDAC/MDAC_TYP.EXE 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
|
||||
|
||||
load_native_mdac
|
||||
w_set_winver nt40
|
||||
@ -8744,7 +8990,7 @@ load_msdxmocx()
|
||||
# 2017/09/28: define.fi is down, these sites have mpfull.exe with the original sha256:
|
||||
# http://hell.pl/agnus/windows95/
|
||||
# http://zerosky.oldos.org/win9x.html
|
||||
# http://sdfox7.com/win95/
|
||||
# https://sdfox7.com/win95/
|
||||
|
||||
w_download http://hell.pl/agnus/windows95/mpfull.exe a39b2b9735cedd513fcb78f8634695d35073e9d7e865e536a0da6db38c7225e4
|
||||
|
||||
@ -8836,7 +9082,7 @@ load_msls31()
|
||||
# Needed by native RichEdit and Internet Explorer
|
||||
# Originally at https://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe
|
||||
# Mirror list at http://www.filewatcher.com/m/InstMsiW.exe.1822848-0.html
|
||||
w_download http://ftp.hp.com/pub/softlib/software/msi/InstMsiW.exe 4c3516c0b5c2b76b88209b22e3bf1cb82d8e2de7116125e97e128952372eed6b InstMsiW.exe
|
||||
w_download https://ftp.hp.com/pub/softlib/software/msi/InstMsiW.exe 4c3516c0b5c2b76b88209b22e3bf1cb82d8e2de7116125e97e128952372eed6b InstMsiW.exe
|
||||
|
||||
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msls31/InstMsiW.exe
|
||||
w_try cp -f "$W_TMP"/msls31.dll "$W_SYSTEM32_DLLS"
|
||||
@ -10273,7 +10519,8 @@ load_windowscodecs()
|
||||
# AF says in AppDB entry for .NET 3.0 that windowscodecs has to be native only
|
||||
w_override_dlls native windowscodecs windowscodecsext
|
||||
|
||||
w_set_winver winxp
|
||||
# Previously this was winxp, but that didn't work for 64-bit, see https://github.com/Winetricks/winetricks/issues/970
|
||||
w_set_winver win2k3
|
||||
|
||||
# Always run the WIC installer in passive mode.
|
||||
# See https://bugs.winehq.org/show_bug.cgi?id=16876 and
|
||||
@ -11218,8 +11465,8 @@ w_metadata tahoma fonts \
|
||||
|
||||
load_tahoma()
|
||||
{
|
||||
# Formerly at http://download.microsoft.com:80/download/ie55sp2/Install/5.5_SP2/WIN98Me/EN-US/IELPKTH.CAB
|
||||
w_download http://downloads.sourceforge.net/corefonts/OldFiles/IELPKTH.CAB c1be3fb8f0042570be76ec6daa03a99142c88367c1bc810240b85827c715961a
|
||||
# Formerly at http://download.microsoft.com/download/ie55sp2/Install/5.5_SP2/WIN98Me/EN-US/IELPKTH.CAB
|
||||
w_download https://downloads.sourceforge.net/corefonts/OldFiles/IELPKTH.CAB c1be3fb8f0042570be76ec6daa03a99142c88367c1bc810240b85827c715961a
|
||||
|
||||
w_try_cabextract -d "$W_TMP" "$W_CACHE/$W_PACKAGE/$file1"
|
||||
w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "*.TTF"
|
||||
@ -11398,11 +11645,11 @@ w_metadata 3m_library apps \
|
||||
media="download" \
|
||||
file1="cloudLibrary-2.1.1702011951-Setup.exe" \
|
||||
installed_exe1="$W_PROGRAMS_X86_WIN/cloudLibrary/cloudLibrary.exe" \
|
||||
homepage="http://www.yourcloudlibrary.com/index.php/en-us/"
|
||||
homepage="https://www.yourcloudlibrary.com/"
|
||||
|
||||
load_3m_library()
|
||||
{
|
||||
w_download http://download.yourcloudlibrary.com/apps/pc/cloudLibrary-2.1.1702011951-Setup.exe bb3d854cc525c065e7298423bf0019309f4b65497c1d8bc6af09460cd6fcb57f
|
||||
w_download https://usestrwebaccess.blob.core.windows.net/apps/pc/cloudLibrary-2.1.1702011951-Setup.exe bb3d854cc525c065e7298423bf0019309f4b65497c1d8bc6af09460cd6fcb57f
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" "${file1}" $W_UNATTENDED_SLASH_S
|
||||
}
|
||||
@ -11419,7 +11666,7 @@ w_metadata 7zip apps \
|
||||
|
||||
load_7zip()
|
||||
{
|
||||
w_download http://www.7-zip.org/a/7z1602.exe 629ce3c424bd884e74aed6b7d87d8f0d75274fb87143b8d6360c5eec41d5f865
|
||||
w_download https://downloads.sourceforge.net/sevenzip/7z1602.exe 629ce3c424bd884e74aed6b7d87d8f0d75274fb87143b8d6360c5eec41d5f865
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" "${file1}" $W_UNATTENDED_SLASH_S
|
||||
}
|
||||
@ -11749,24 +11996,63 @@ load_fontxplorer()
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata foobar2000 apps \
|
||||
title="foobar2000 v1.3.14" \
|
||||
title="foobar2000 v1.4" \
|
||||
publisher="Peter Pawlowski" \
|
||||
year="2016" \
|
||||
year="2018" \
|
||||
media="manual_download" \
|
||||
file1="foobar2000_v1.3.14.exe" \
|
||||
file1="foobar2000_v1.4.exe" \
|
||||
installed_exe1="$W_PROGRAMS_X86_WIN/foobar2000/foobar2000.exe"
|
||||
|
||||
load_foobar2000()
|
||||
{
|
||||
# 2016/12/21: 1.3.14 - 72d024d258c2f3b6cea62dc47fb613848202e7f33f2331f6b2e0a8e61daffcb6
|
||||
# 2018/07/25: 1.4 - 7c048faecfec79f9ec2b332b2c68b25e0d0219b47a7c679fe56f2ec05686a96a
|
||||
|
||||
w_download_manual https://www.foobar2000.org/download foobar2000_v1.3.14.exe 72d024d258c2f3b6cea62dc47fb613848202e7f33f2331f6b2e0a8e61daffcb6
|
||||
w_download_manual https://www.foobar2000.org/download foobar2000_v1.4.exe 7c048faecfec79f9ec2b332b2c68b25e0d0219b47a7c679fe56f2ec05686a96a
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata hhw apps \
|
||||
title="HTML Help Workshop" \
|
||||
publisher="Microsoft" \
|
||||
year="2000" \
|
||||
media="download" \
|
||||
file1="htmlhelp.exe" \
|
||||
installed_exe1="$W_PROGRAMS_X86_WIN/HTML Help Workshop/hhw.exe"
|
||||
|
||||
load_hhw()
|
||||
{
|
||||
w_call mfc40
|
||||
|
||||
# https://msdn.microsoft.com/en-us/library/windows/desktop/ms669985(v=vs.85).aspx
|
||||
w_download https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe b2b3140d42a818870c1ab13c1c7b8d4536f22bd994fa90aade89729a6009a3ae
|
||||
|
||||
# htmlhelp.exe automatically runs hhupd.exe. It shows a dialog that says
|
||||
# "This computer already has a newer version of HTML Help."
|
||||
# because of Wine's built-in hhctrl.ocx and it copys files only when
|
||||
# Windows version is "Windows 98", "Windows 95", "Windows NT 4.0",
|
||||
# or "Windows NT 3.51". 64-bit prefixes can't use any of them.
|
||||
#
|
||||
# So we need the following steps:
|
||||
# 1. Run htmlhelp.exe to unpack its contents
|
||||
# 2. Edit htmlhelp.inf not to run hhupd.exe
|
||||
# 3. Run setup.exe
|
||||
w_try "$WINE" "$W_CACHE/$W_PACKAGE"/htmlhelp.exe /C "/T:$W_TMP_WIN" $W_UNATTENDED_SLASH_Q
|
||||
w_try_cd "$W_TMP"
|
||||
w_try sed -i "s/RunPostSetupCommands=HHUpdate//" htmlhelp.inf
|
||||
w_try "$WINE" setup.exe
|
||||
|
||||
if w_workaround_wine_bug 7517; then
|
||||
w_call itircl
|
||||
w_call itss
|
||||
fi
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata iceweasel apps \
|
||||
title="GNU Icecat 31.7.0" \
|
||||
publisher="GNU Foundation" \
|
||||
@ -11791,7 +12077,7 @@ w_metadata irfanview apps \
|
||||
media="download" \
|
||||
file1="iview444_setup.exe" \
|
||||
installed_file1="$W_PROGRAMS_X86_WIN/IrfanView/i_view32.exe" \
|
||||
homepage="http://www.irfanview.com/"
|
||||
homepage="https://www.irfanview.com/"
|
||||
|
||||
load_irfanview()
|
||||
{
|
||||
@ -12202,7 +12488,8 @@ load_kindle()
|
||||
w_warn "Using an older version of Kindle (1.16.44025) to work around https://bugs.winehq.org/show_bug.cgi?id=43508"
|
||||
fi
|
||||
|
||||
w_download https://s3.amazonaws.com/kindleforpc/44025/KindleForPC-installer-1.16.44025.exe
|
||||
# Originally at: https://s3.amazonaws.com/kindleforpc/44025/KindleForPC-installer-1.16.44025.exe
|
||||
w_download https://web.archive.org/web/20160817182927/https://s3.amazonaws.com/kindleforpc/44025/KindleForPC-installer-1.16.44025.exe 2655fa8be7b8f4659276c46ef9f3fede847135bf6e5c1de136c9de7af6cac1e2
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /S}
|
||||
|
||||
@ -12250,8 +12537,36 @@ load_mingw()
|
||||
{
|
||||
w_download "$WINETRICKS_SOURCEFORGE/mingw/files/mingw-get-setup.exe" aab27bd5547d35dc159288f3b5b8760f21b0cfec86e8f0032b49dd0410f232bc
|
||||
|
||||
w_try_cd "$W_CACHE/mingw"
|
||||
w_try "$WINE" "$file1"
|
||||
if test "$W_OPT_UNATTENDED"; then
|
||||
w_info "FYI: Quiet mode will install these mingw packages: 'gcc msys-base'"
|
||||
fi
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_ahk_do "
|
||||
run, $file1
|
||||
WinWait, MinGW Installation Manager Setup Tool
|
||||
if ( w_opt_unattended > 0 ) {
|
||||
WinActivate
|
||||
Sleep, 1000
|
||||
ControlClick, Button1 ; Install
|
||||
; Window title is blank
|
||||
WinWait, , Step 1: Specify Installation Preferences
|
||||
Sleep, 1000
|
||||
ControlClick, Button10 ; Continue
|
||||
Sleep, 1000
|
||||
WinWait, , Step 2: Download and Set Up MinGW Installation Manager
|
||||
; This takes a while
|
||||
WinWait, , Catalogue update completed
|
||||
Sleep, 1000
|
||||
ControlClick, Button4 ; Continue
|
||||
; This window appears in background, but isn't active because of another popup
|
||||
; We may need to wait for that to disappear first
|
||||
WinWait, MinGW Installation Manager
|
||||
Sleep, 1000
|
||||
WinClose, MinGW Installation Manager
|
||||
}
|
||||
WinWaitClose, MinGW Installation Manager
|
||||
"
|
||||
|
||||
w_append_path 'C:\MinGW\bin'
|
||||
w_try "$WINE" mingw-get update
|
||||
@ -12312,7 +12627,7 @@ load_mspaint()
|
||||
|
||||
# Originally at: https://download.microsoft.com/download/0/A/4/0A40DF5C-2BAE-4C63-802A-84C33B34AC98/WindowsXP-KB978706-x86-ENU.exe
|
||||
# Mirror list: http://www.filewatcher.com/_/?q=WindowsXP-KB978706-x86-ENU.exe
|
||||
w_download http://cbvk.cz/programy_pro_knihovny/update-pack/Windows%20XP%20x86%20ENU/Security%20Updates/WindowsXP-KB978706-x86-ENU.exe 93ed34ab6c0d01a323ce10992d1c1ca27d1996fef82f0864d83e7f5ac6f9b24b
|
||||
w_download https://cbvk.cz/programy_pro_knihovny/update-pack/Windows%20XP%20x86%20ENU/Security%20Updates/WindowsXP-KB978706-x86-ENU.exe 93ed34ab6c0d01a323ce10992d1c1ca27d1996fef82f0864d83e7f5ac6f9b24b
|
||||
w_try $WINE "$W_CACHE"/mspaint/WindowsXP-KB978706-x86-ENU.exe /q /x:"$W_TMP"/WindowsXP-KB978706-x86-ENU
|
||||
w_try cp -f "$W_TMP"/WindowsXP-KB978706-x86-ENU/SP3GDR/mspaint.exe "$W_WINDIR_UNIX"/mspaint.exe
|
||||
}
|
||||
@ -12932,7 +13247,7 @@ w_metadata qq apps \
|
||||
load_qq()
|
||||
{
|
||||
w_download https://dldir1.qq.com/qqfile/qq/QQ8.9.1/20437/QQ8.9.1.exe 8e0d3ff5264da2d77e2fc011c21048edeebcf082f55f68a301f763c3a15c0d3f
|
||||
w_download http://hillwoodhome.net/wine/QQ.tar.gz eb5cd6371eb75ec9e2fc0271199df05cbb9f38a60c2e81d5d8ac7daeb40aba62
|
||||
w_download https://hillwoodhome.net/wine/QQ.tar.gz eb5cd6371eb75ec9e2fc0271199df05cbb9f38a60c2e81d5d8ac7daeb40aba62
|
||||
|
||||
if w_workaround_wine_bug 5162 "Installing native riched20 to work around can't input username."; then
|
||||
w_call riched20
|
||||
@ -13701,7 +14016,7 @@ w_metadata 3dmark03 benchmarks \
|
||||
|
||||
load_3dmark03()
|
||||
{
|
||||
# http://www.futuremark.com/benchmarks/3dmark03/download/
|
||||
# https://www.futuremark.com/benchmarks/3dmark03/download/
|
||||
if ! test -f "$W_CACHE/$W_PACKAGE/3DMark03_v360_1901.exe"; then
|
||||
w_download_manual https://www.futuremark.com/download/3dmark03/ 3DMark03_v360_1901.exe 86d7f73747944c553e47e6ab5a74138e8bbca07fab8216ae70a61ac7f9a1c468
|
||||
fi
|
||||
@ -14028,7 +14343,7 @@ w_metadata amnesia_tdd_demo games \
|
||||
|
||||
load_amnesia_tdd_demo()
|
||||
{
|
||||
w_download_manual http://download.cnet.com/Amnesia-The-Dark-Descent-Demo/3000-2097_4-75312743.html amnesia_tdd_demo_1.0.1.exe ee4c07b40bfa59b506d2cee258c5c7a16028e11fc3a2bd243258c6bec8532dbc
|
||||
w_download_manual https://download.cnet.com/Amnesia-The-Dark-Descent-Demo/3000-2097_4-75312743.html amnesia_tdd_demo_1.0.1.exe ee4c07b40bfa59b506d2cee258c5c7a16028e11fc3a2bd243258c6bec8532dbc
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
|
||||
@ -14200,7 +14515,7 @@ w_metadata atmosphir games \
|
||||
|
||||
load_atmosphir()
|
||||
{
|
||||
w_download_manual http://download.cnet.com/Atmosphir/3000-7492_4-75335647.html atmosphir-installer-v1.0.2.exe a6b2c82a98d750014874f8ab445b38ebb127450e5a7a9350832cf3a8d3a
|
||||
w_download_manual https://download.cnet.com/Atmosphir/3000-7492_4-75335647.html atmosphir-installer-v1.0.2.exe a6b2c82a98d750014874f8ab445b38ebb127450e5a7a9350832cf3a8d3a
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_ahk_do "
|
||||
@ -14670,7 +14985,7 @@ w_metadata cod_demo games \
|
||||
|
||||
load_cod_demo()
|
||||
{
|
||||
w_download_manual http://www.gamefront.com/files/968870/call_of_duty_demo_exe Call_Of_Duty_Demo.exe a7773f1ddb0c9928f738a2be34614d52bc07ecc42c0fe704ab5a596da5421b08
|
||||
w_download_manual https://www.gamefront.com/files/968870/call_of_duty_demo_exe Call_Of_Duty_Demo.exe a7773f1ddb0c9928f738a2be34614d52bc07ecc42c0fe704ab5a596da5421b08
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_ahk_do "
|
||||
@ -14811,7 +15126,7 @@ w_metadata cod4mw_demo games \
|
||||
load_cod4mw_demo()
|
||||
{
|
||||
# 2017/03/28: Also at https://www.fileplanet.com/213663/210000/fileinfo/LEGO-Harry-Potter:-Years-1-4-Demo
|
||||
w_download_manual http://download.cnet.com/Call-of-Duty-4-Modern-Warfare/3000-7441_4-11277584.html CoD4MWDemoSetup_v2.exe 715710678394e9b0edda5dd3a560c9711557297aa2849c83e5c109db9830fbbb
|
||||
w_download_manual https://download.cnet.com/Call-of-Duty-4-Modern-Warfare/3000-7441_4-11277584.html CoD4MWDemoSetup_v2.exe 715710678394e9b0edda5dd3a560c9711557297aa2849c83e5c109db9830fbbb
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_ahk_do "
|
||||
@ -14926,7 +15241,7 @@ w_metadata civ4_demo games \
|
||||
|
||||
load_civ4_demo()
|
||||
{
|
||||
w_download_manual http://download.cnet.com/Civilization-IV-demo/3000-7489_4-10465206.html Civilization4_Demo.zip aaafc7fcbf0fc16c9b28c2422400721a40818b867e9291268877c5d3841122a2
|
||||
w_download_manual https://download.cnet.com/Civilization-IV-demo/3000-7489_4-10465206.html Civilization4_Demo.zip aaafc7fcbf0fc16c9b28c2422400721a40818b867e9291268877c5d3841122a2
|
||||
|
||||
w_try_unzip "$W_TMP" "$W_CACHE/$W_PACKAGE"/Civilization4_Demo.zip
|
||||
w_try_cd "$W_TMP/$W_PACKAGE"
|
||||
@ -17057,7 +17372,7 @@ w_metadata myth2_demo games \
|
||||
media="download" \
|
||||
file1="Myth2_Demo_180.exe" \
|
||||
installed_exe1="$W_PROGRAMS_X86_WIN/Myth II Demo/Myth II Demo.exe" \
|
||||
homepage="http://projectmagma.net/"
|
||||
homepage="https://projectmagma.net/"
|
||||
|
||||
load_myth2_demo()
|
||||
{
|
||||
@ -17065,7 +17380,7 @@ load_myth2_demo()
|
||||
# source code to Project Magma for further development.
|
||||
|
||||
# 2017/03/27: 1a5e11be25c43491e2b4da5291b646ffe5330a6289bef236f404906e3b4f5e96
|
||||
w_download http://tain.totalcodex.net/items/download/myth-ii-demo-windows 1a5e11be25c43491e2b4da5291b646ffe5330a6289bef236f404906e3b4f5e96 "${file1}"
|
||||
w_download https://tain.totalcodex.net/items/download/myth-ii-demo-windows 1a5e11be25c43491e2b4da5291b646ffe5330a6289bef236f404906e3b4f5e96 "${file1}"
|
||||
|
||||
w_try_cd "${W_TMP}"
|
||||
w_try unzip "${W_CACHE}/${W_PACKAGE}/${file1}"
|
||||
@ -17350,7 +17665,7 @@ w_metadata riseofnations_demo games \
|
||||
|
||||
load_riseofnations_demo()
|
||||
{
|
||||
w_download_manual http://download.cnet.com/Rise-of-Nations-Trial-Version/3000-7562_4-10730812.html RiseOfNationsTrial.exe f0bd8be3999164e669aad33583e372ca0f530b1a2ac0194a4c13b265e9cdf744
|
||||
w_download_manual https://download.cnet.com/Rise-of-Nations-Trial-Version/3000-7562_4-10730812.html RiseOfNationsTrial.exe f0bd8be3999164e669aad33583e372ca0f530b1a2ac0194a4c13b265e9cdf744
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
.\" -*- nroff -*-
|
||||
.TH WINETRICKS 1 "June 2018" "Winetricks 20180603" "Wine Package Manager"
|
||||
.TH WINETRICKS 1 "August 2018" "Winetricks 20180815" "Wine Package Manager"
|
||||
.SH NAME
|
||||
winetricks \- manage virtual Windows environments using Wine
|
||||
.SH SYNOPSIS
|
||||
|
||||
Loading…
Reference in New Issue
Block a user