- Update to 2.19 development snapshot
- Support for 32-bit float audio on Android. - Named pipes now fully handled by the Wine server. - Support for a new Microsoft root certificate. - More transform fixes in GdiPlus. - Some heap allocation optimizations. - Various bug fixes. - updated winetricks OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=441
This commit is contained in:
Git OBS Bridge
parent
fd3edfdfa9
commit
849cc1a014
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9f0931129878157d717cb39f16cd33bf49f40aac77331c93d0ad30f2ccac4f50
|
||||
size 19546360
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlnOkY4ACgkQzvrI6q8X
|
||||
UZ11ng/9HvQoaKE5gtj96u/XBwuTA+ScSJabHmQjvLfy76Nh653oK/q9/puIePGm
|
||||
vctDKC7G0pGKQ554ZQBE/jT8HcNBh4ly2dhlP8pDkfo+CSnilpipzjBkGQIZQ5qG
|
||||
VkaIdEjHqPy9GcazSvuocFt2W7CABfyE2DAg974E9Sf7EqAsFKiEwMhpSmOJCb1b
|
||||
QzKdco8KafLQA+udVuzLKq4W1/oILQ5SECbBiD6D17GYDPHNrJLUqugCzLYewnKR
|
||||
XN3pbTO7clkYrYZtym5DfgGnQhoHPtQUZIyJO52VmzMo+l2RdnkSNMPLFLp94atH
|
||||
H7tXTGchGQXW2v1hr2DknS+C8BUTs3ewlpiaz2r+rx9pSwgL4mwAIczs9O2KnnQf
|
||||
rb6RzyWeHo5JepGiMoeDRpbsYPgrfqCFISn3MklZu6uKtH3Ty4/foKKpk7UmEXIi
|
||||
eXIFTBTIY3pi93hJzAm8nlOB+LakolOaUjqbDi2xREv8Prc4A8GCKiDUTRUF4eUi
|
||||
MzuRGydvZreePdpfNIjsTr10zglcYU1S0bKzVOlWMZIZdTbDMkEs/JIfbhci1FJT
|
||||
04JyccpWbOgezei5zSJkZitaCtxR2RSrnhm+yGUTWPIULDhZDnFEPx+GXu4YhA2H
|
||||
SOwvo4NdlHGvhga5nlopeWivZ6panawMrAUebllp/KHzziVCWUY=
|
||||
=ncCR
|
||||
-----END PGP SIGNATURE-----
|
||||
3
wine-2.19.tar.xz
Normal file
3
wine-2.19.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:487131e69875ae9c2d042798f954160146e603e449c3c97981f29b42f4a66095
|
||||
size 19549464
|
||||
16
wine-2.19.tar.xz.sign
Normal file
16
wine-2.19.tar.xz.sign
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlnhT5YACgkQzvrI6q8X
|
||||
UZ2x5A//WoSYdqrgrtdWSdtksy3zVa9mx4hGhIoiffmwwRN3IntfFko55I1XezuP
|
||||
OmDkUnUMGorPbGnl4T+pBQCaCImwVeWORaaQ+Po3ghwhseAUIwMiVUN4MkYyEhRR
|
||||
JxYHYTcKfOttF2iS5g5kN+o+wsv8F+cykps8e6miQPaTveLdWhjJfjPQwS1dG9vK
|
||||
R3RedNiPaVUYOeSAB67iMDHOXTE8xQRs2zwBOqFXtipdBuI++pNHKMoVDoeV/cbf
|
||||
9UXSeBIdI66kWKoFt4TMXLPO/hVI8+8+ZU3arr61b1h4HSENgEbxFZTueKQaDQoP
|
||||
KtYIPE3LRxor1Rz1FqatM94QQc3Er2VYVA/kNWhNhSjgHBreX8SOfhyJqVdGuIeN
|
||||
9beJ4Yltgs8Wf42ZCmHJYIO06mDrsAO+Voqr1jVoho84Ey3nmww88zlvGXqw3/i5
|
||||
U0P2Ysqk4KaBiKpXLCK3ITKiELb27CAv3QEaJNIuaK2eugbvhrvzMmEHe7ahtVGU
|
||||
Z/qAaedwvBamgXVg/hFQ5MaytRgIJmcgl6gybdKo7wCGe96Q5/hmebUfSexAP2aX
|
||||
QW6cmPll6D1eWE8hoJ5laC/Wqb0AHQ72l2pfvw1hiEwSN/YuQL9RC7F182wRAVkF
|
||||
wgvuMYftjcq8zZOHCIBaHbjtY8MFiX1eTBfflqcYGhycxKJUknM=
|
||||
=wD70
|
||||
-----END PGP SIGNATURE-----
|
||||
12
wine.changes
12
wine.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 16 09:09:11 UTC 2017 - meissner@suse.com
|
||||
|
||||
- Update to 2.19 development snapshot
|
||||
- Support for 32-bit float audio on Android.
|
||||
- Named pipes now fully handled by the Wine server.
|
||||
- Support for a new Microsoft root certificate.
|
||||
- More transform fixes in GdiPlus.
|
||||
- Some heap allocation optimizations.
|
||||
- Various bug fixes.
|
||||
- updated winetricks
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 29 20:37:24 UTC 2017 - meissner@suse.com
|
||||
|
||||
|
||||
@ -61,8 +61,8 @@ BuildRequires: update-desktop-files
|
||||
BuildRequires: valgrind-devel
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: pkgconfig(libudev)
|
||||
%define realver 2.18
|
||||
Version: 2.18
|
||||
%define realver 2.19
|
||||
Version: 2.19
|
||||
Release: 0
|
||||
Summary: An MS Windows Emulator
|
||||
License: LGPL-2.1+
|
||||
|
||||
385
winetricks
385
winetricks
@ -29,13 +29,14 @@ WINETRICKS_VERSION=20170823-next
|
||||
# - ar, cabextract, unrar, unzip, and 7z are needed by some verbs.
|
||||
# - aria2c, wget, curl, or fetch is needed for downloading.
|
||||
# - sha256sum, sha256, or shasum (OSX 10.5 does not support these, 10.6+ is required):
|
||||
# - note: some legacy verbs may still sha1sum, sha1, or shasum, but this is deprecated and
|
||||
# will be removed in a future release
|
||||
# note: some legacy verbs may still use sha1sum, sha1, or shasum, but this is
|
||||
# deprecated and will be removed in a future release.
|
||||
# - zenity is needed by the GUI, though it can limp along somewhat with kdialog/xmessage.
|
||||
# - xdg-open (if present) or open (for OS X) is used to open download pages
|
||||
# for the user when downloads cannot be fully automated.
|
||||
# - sudo is used to mount .iso images if the user cached them with -k option.
|
||||
# - perl is used to munge steam config files
|
||||
# - perl is used to munge steam config files.
|
||||
# - torify is used with option "--torify" if sites are blocked in single countries.
|
||||
# On Ubuntu, the following lines can be used to install all the prerequisites:
|
||||
# sudo add-apt-repository ppa:ubuntu-wine/ppa
|
||||
# sudo apt-get update
|
||||
@ -113,12 +114,13 @@ WINETRICKS_VERSION=20170823-next
|
||||
# - Open curly braces ('{'),
|
||||
# then should go on the same line as 'if/elif'
|
||||
# close curlies ('}') and 'fi' should line up with the matching { or if,
|
||||
# cases aligned with 'case' and 'esac'. For instance,
|
||||
# cases indented 4 spaces from 'case' and 'esac'. For instance,
|
||||
#
|
||||
# if test "$FOO" = "bar"; then
|
||||
# echo "FOO is bar"
|
||||
# fi
|
||||
# case "$FOO" of
|
||||
#
|
||||
# case "$FOO" in
|
||||
# bar) echo "FOO is still bar" ;;
|
||||
# esac
|
||||
#
|
||||
@ -294,22 +296,24 @@ w_package_broken_win64()
|
||||
|
||||
if [ "$W_ARCH" = "win64" ] ; then
|
||||
if [ -n "$1" ] ; then
|
||||
w_die "This package is broken on 64-bit Wine. Using a prefix made with WINEARCH=win32 to work around this. See: ${bug_link}"
|
||||
w_die "This package ($W_PACKAGE) is broken on 64-bit Wine. Using a prefix made with WINEARCH=win32 to work around this. See: ${bug_link}"
|
||||
else
|
||||
w_die "This package is broken on 64-bit Wine. Using a prefix made with WINEARCH=win32 to work around this."
|
||||
w_die "This package ($W_PACKAGE) is broken on 64-bit Wine. Using a prefix made with WINEARCH=win32 to work around this."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# Some packages don't support win64, die with an appropriate message
|
||||
# Note: this is for packages that natively don't support win64, not packages that are broken on wine64, for that, use w_package_broken_win64()
|
||||
# Returns 32 (for tests/winetricks-test)
|
||||
w_package_unsupported_win64()
|
||||
{
|
||||
if [ "$W_ARCH" = "win64" ] ; then
|
||||
case $LANG in
|
||||
ru*) w_die "Данный пакет не работает в 64-битном окружении. Используйте префикс, созданный с помощью WINEARCH=win32." ;;
|
||||
*) w_die "This package does not work on a 64-bit installation. You must use a prefix made with WINEARCH=win32." ;;
|
||||
*) w_die "This package ($W_PACKAGE) does not work on a 64-bit installation. You must use a prefix made with WINEARCH=win32." ;;
|
||||
esac
|
||||
exit 32
|
||||
fi
|
||||
}
|
||||
|
||||
@ -319,7 +323,7 @@ w_package_warn_win64()
|
||||
if [ "$W_ARCH" = "win64" ] ; then
|
||||
case $LANG in
|
||||
ru*) w_warn "Данный пакет может работать не полностью в 64-битном окружении. 32-битные префиксы могут работать лучше." ;;
|
||||
*) w_warn "This package may not fully work on a 64-bit installation. 32-bit prefixes may work better." ;;
|
||||
*) w_warn "This package ($W_PACKAGE) may not fully work on a 64-bit installation. 32-bit prefixes may work better." ;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
@ -422,7 +426,9 @@ w_try_msiexec64()
|
||||
w_try "$WINE" start /wait "$W_SYSTEM64_DLLS_WIN32/msiexec.exe" $W_UNATTENDED_SLASH_Q "$@"
|
||||
}
|
||||
|
||||
w_try_regedit()
|
||||
# fixme: cleanup. For wow64 registries, some/all entries need to be duplicated.
|
||||
# Not sure of the best way yet, but thinking running wine/wine64 regedit for each?
|
||||
w_try_regedit32()
|
||||
{
|
||||
# on windows, doesn't work without cmd /c
|
||||
case "$W_PLATFORM" in
|
||||
@ -431,7 +437,32 @@ w_try_regedit()
|
||||
esac
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
w_try winetricks_early_wine $cmdc regedit $W_UNATTENDED_SLASH_S "$@"
|
||||
w_try "$WINE_MULTI" $cmdc regedit $W_UNATTENDED_SLASH_S "$@"
|
||||
}
|
||||
|
||||
w_try_regedit64()
|
||||
{
|
||||
# on windows, doesn't work without cmd /c
|
||||
case "$W_PLATFORM" in
|
||||
windows_cmd|wine_cmd) cmdc="cmd /c";;
|
||||
*) unset cmdc ;;
|
||||
esac
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
w_try "$WINE64" $cmdc regedit $W_UNATTENDED_SLASH_S "$@"
|
||||
}
|
||||
|
||||
w_try_regedit()
|
||||
{
|
||||
# If on wow64, run under both wine and wine64 (otherwise they only go in the 32-bit registry afaict)
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
if [ "$W_ARCH" = "win32" ]; then
|
||||
w_try_regedit32 "$@"
|
||||
elif [ "$W_ARCH" = "win64" ]; then
|
||||
w_try_regedit32 "$@"
|
||||
w_try_regedit64 "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
w_try_regsvr()
|
||||
@ -526,12 +557,14 @@ w_read_key()
|
||||
_W_nokeymsg="No key given"
|
||||
;;
|
||||
esac
|
||||
|
||||
case $WINETRICKS_GUI in
|
||||
*zenity) W_KEY=$(zenity --entry --text "$_W_keymsg") ;;
|
||||
*kdialog) W_KEY=$(kdialog --inputbox "$_W_keymsg") ;;
|
||||
*xmessage) w_die "sorry, can't read key from GUI with xmessage" ;;
|
||||
none) printf %s "$_W_keymsg": ; read -r W_KEY ;;
|
||||
esac
|
||||
|
||||
if test "$W_KEY" = ""; then
|
||||
w_die "$_W_nokeymsg"
|
||||
fi
|
||||
@ -698,6 +731,18 @@ w_verify_shasum()
|
||||
# It uses minimal buffering, so each line is output immediately
|
||||
# and the user can watch progress as it happens.
|
||||
|
||||
# wrapper around wineserver, to let users know that it will wait indefinitely/kill stuff
|
||||
w_wineserver()
|
||||
{
|
||||
case "$@" in
|
||||
*-k) w_warn "Running $WINESERVER -k. This will kill all running wine processes in prefix=$WINEPREFIX";;
|
||||
*-w) w_warn "Running $WINESERVER -w. This will hang until all wine processes in prefix=$WINEPREFIX terminate";;
|
||||
*) w_warn "Invoking wineserver with '$*'";;
|
||||
esac
|
||||
# shellcheck disable=SC2068
|
||||
"$WINESERVER" $@
|
||||
}
|
||||
|
||||
winetricks_parse_wget_progress()
|
||||
{
|
||||
# Parse a percentage, a size, and a time into $1, $2 and $3
|
||||
@ -715,7 +760,7 @@ winetricks_wget_progress()
|
||||
{
|
||||
case $WINETRICKS_GUI in
|
||||
zenity)
|
||||
# Usa a subshell so if the user clicks 'Cancel',
|
||||
# Use a subshell so if the user clicks 'Cancel',
|
||||
# the --auto-kill kills the subshell, not the current shell
|
||||
(
|
||||
${torify} wget "$@" 2>&1 |
|
||||
@ -1675,6 +1720,7 @@ w_umount()
|
||||
w_try vcdmount.exe /u
|
||||
else
|
||||
echo "Running $WINETRICKS_SUDO umount $W_ISO_MOUNT_ROOT"
|
||||
|
||||
case "$WINETRICKS_SUDO" in
|
||||
gksudo)
|
||||
# -l lazy unmount in case executable still running
|
||||
@ -1686,6 +1732,7 @@ w_umount()
|
||||
w_try "$WINETRICKS_SUDO" "rm -rf $W_ISO_MOUNT_ROOT"
|
||||
;;
|
||||
esac
|
||||
|
||||
"$WINE" eject "${W_ISO_MOUNT_LETTER}:"
|
||||
rm -f "$WINEPREFIX/dosdevices/${W_ISO_MOUNT_LETTER}:"
|
||||
rm -f "$WINEPREFIX/dosdevices/${W_ISO_MOUNT_LETTER}::"
|
||||
@ -2202,7 +2249,6 @@ REGEDIT4
|
||||
"Version"="win31"
|
||||
|
||||
_EOF_
|
||||
|
||||
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
|
||||
return
|
||||
;;
|
||||
@ -2345,7 +2391,7 @@ _EOF_
|
||||
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
|
||||
|
||||
# Prevent a race when calling from another verb
|
||||
"$WINESERVER" -w
|
||||
w_wineserver -w
|
||||
}
|
||||
|
||||
w_unset_winver()
|
||||
@ -2457,6 +2503,7 @@ w_workaround_wine_bug()
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
||||
case $LANG in
|
||||
da*) w_warn "Arbejder uden om wine-fejl ${1} $_W_msg" ;;
|
||||
de*) w_warn "Wine-Fehler ${1} wird umgegangen $_W_msg" ;;
|
||||
@ -2467,6 +2514,7 @@ w_workaround_wine_bug()
|
||||
zh_TW*|zh_HK*) w_warn "繞過 wine bug ${1} $_W_msg" ;;
|
||||
*) w_warn "Working around wine bug ${1} $_W_msg" ;;
|
||||
esac
|
||||
|
||||
winetricks_stats_log_command "w_workaround_wine_bug-$1"
|
||||
return 0
|
||||
}
|
||||
@ -2505,12 +2553,9 @@ w_metadata()
|
||||
for arg
|
||||
do
|
||||
case "$arg" in
|
||||
installed_exe1=/*)
|
||||
w_die "bug: w_metadata $_W_md_cmd has a unix path for installed_exe1, should be a windows path";;
|
||||
installed_file1=/*)
|
||||
w_die "bug: w_metadata $_W_md_cmd has a unix path for installed_file1, should be a windows path";;
|
||||
media=download_manual)
|
||||
w_die "bug: verb $_W_md_cmd has media=download_manual, should be manual_download" ;;
|
||||
installed_exe1=/*) w_die "bug: w_metadata $_W_md_cmd has a unix path for installed_exe1, should be a windows path";;
|
||||
installed_file1=/*) w_die "bug: w_metadata $_W_md_cmd has a unix path for installed_file1, should be a windows path";;
|
||||
media=download_manual) w_die "bug: verb $_W_md_cmd has media=download_manual, should be manual_download" ;;
|
||||
esac
|
||||
# Use longest match when stripping value,
|
||||
# and shortest match when stripping name,
|
||||
@ -2616,8 +2661,7 @@ w_do_call()
|
||||
|
||||
# If needed, set the app's wineprefix
|
||||
case "$W_PLATFORM" in
|
||||
windows_cmd|wine_cmd)
|
||||
;;
|
||||
windows_cmd|wine_cmd) ;;
|
||||
*)
|
||||
# shellcheck disable=SC2154
|
||||
case "${category}-${WINETRICKS_OPT_SHAREDPREFIX}" in
|
||||
@ -2940,7 +2984,10 @@ winetricks_latest_version_check()
|
||||
|
||||
# Check that $latest_version is an actual number in case github is down
|
||||
if ! echo "${latest_version}" | grep -q -E "[0-9]{8}" || [ -z "${latest_version}" ] ; then
|
||||
w_warn "Github down? version '${latest_version}' doesn't appear to be a valid version"
|
||||
case $LANG in
|
||||
ru*) w_warn "Отсутствует подключение к Github? версия '${latest_version}' может быть неактуальной" ;;
|
||||
*) w_warn "Github down? version '${latest_version}' doesn't appear to be a valid version" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if [ ! "$WINETRICKS_VERSION" = "${latest_version}" ] && [ ! "$WINETRICKS_VERSION" = "${latest_version}-next" ]; then
|
||||
@ -2950,8 +2997,16 @@ winetricks_latest_version_check()
|
||||
w_info "auto-update enabled: running winetricks_selfupdate"
|
||||
winetricks_selfupdate
|
||||
else
|
||||
case $LANG in
|
||||
ru*)
|
||||
w_warn "Запущен winetricks-${WINETRICKS_VERSION}, последняя версия winetricks-${latest_version}!"
|
||||
w_warn "Вы можете ее обновить с помощью менеджера пакетов, --self-update или вручную."
|
||||
;;
|
||||
*)
|
||||
w_warn "You are running winetricks-${WINETRICKS_VERSION}, latest upstream is winetricks-${latest_version}!"
|
||||
w_warn "You should update using your distribution's package manager, --self-update, or manually."
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@ -3008,6 +3063,7 @@ winetricks_detect_sudo()
|
||||
if test "$WINETRICKS_GUI" = "none"; then
|
||||
return
|
||||
fi
|
||||
|
||||
if test x"$DISPLAY" != x""; then
|
||||
if test -x "$(which gksudo 2>/dev/null)"; then
|
||||
WINETRICKS_SUDO=gksudo
|
||||
@ -3344,6 +3400,7 @@ winetricks_mainmenu()
|
||||
FALSE annihilate '$_W_msg_annihilate' \
|
||||
"
|
||||
) > "$WINETRICKS_WORKDIR"/zenity.sh
|
||||
|
||||
sh "$WINETRICKS_WORKDIR"/zenity.sh | tr '|' ' '
|
||||
;;
|
||||
|
||||
@ -3508,14 +3565,17 @@ winetricks_settings_menu()
|
||||
title='?'
|
||||
# shellcheck disable=SC1090
|
||||
. "$metadatafile"
|
||||
|
||||
# Begin 'title' strings localization code
|
||||
# shellcheck disable=SC2154
|
||||
case $LANG in
|
||||
uk*) case "$title_uk" in
|
||||
uk*)
|
||||
case "$title_uk" in
|
||||
"") ;;
|
||||
*) title="$title_uk";;
|
||||
esac
|
||||
esac
|
||||
|
||||
# End of code
|
||||
printf "%s %s %s %s" " " FALSE \
|
||||
"$code" \
|
||||
@ -3531,6 +3591,7 @@ winetricks_settings_menu()
|
||||
printf %s "kdialog --geometry 600x400+100+100 --title '$_W_msg_title' --separate-output --checklist '$_W_msg_body' "
|
||||
winetricks_list_all | sed 's/\([^ ]*\) *\(.*\)/\1 "\1 - \2" off /' | tr '\012' ' '
|
||||
) > "$WINETRICKS_WORKDIR"/kdialog.sh
|
||||
|
||||
sh "$WINETRICKS_WORKDIR"/kdialog.sh
|
||||
;;
|
||||
esac
|
||||
@ -3727,6 +3788,7 @@ winetricks_showmenu()
|
||||
esac > "$WINETRICKS_WORKDIR"/zenity.sh
|
||||
|
||||
true > "$WINETRICKS_WORKDIR"/installed.txt
|
||||
|
||||
for metadatafile in "$WINETRICKS_METADATA"/$WINETRICKS_CURMENU/*.vars
|
||||
do
|
||||
code=$(winetricks_metadata_basename "$metadatafile")
|
||||
@ -3770,6 +3832,7 @@ winetricks_showmenu()
|
||||
printf %s "kdialog --geometry 600x400+100+100 --title '$_W_msg_title' --separate-output --checklist '$_W_msg_body' "
|
||||
winetricks_list_all | sed 's/\([^ ]*\) *\(.*\)/\1 "\1 - \2" off /' | tr '\012' ' '
|
||||
) > "$WINETRICKS_WORKDIR"/kdialog.sh
|
||||
|
||||
sh "$WINETRICKS_WORKDIR"/kdialog.sh
|
||||
;;
|
||||
esac
|
||||
@ -3810,10 +3873,12 @@ winetricks_is_cached()
|
||||
_W_path="$(echo "$_W_path" | sed 's,/[^/]*/\.\.,,')"
|
||||
;;
|
||||
esac
|
||||
|
||||
if test -f "$_W_path"; then
|
||||
unset _W_path
|
||||
return 0
|
||||
fi
|
||||
|
||||
unset _W_path
|
||||
return 1
|
||||
}
|
||||
@ -4217,6 +4282,7 @@ winetricks_cache_iso()
|
||||
WINETRICKS_DD_PID=$!
|
||||
;;
|
||||
esac
|
||||
|
||||
echo "$WINETRICKS_DD_PID" > "$WINETRICKS_WORKDIR"/dd-pid
|
||||
|
||||
# Note: if user presses ^C, winetricks_cleanup will call winetricks_iso_cleanup
|
||||
@ -4500,6 +4566,7 @@ winetricks_set_wineprefix()
|
||||
else
|
||||
WINEPREFIX="$W_PREFIXES_ROOT/$1"
|
||||
fi
|
||||
|
||||
export WINEPREFIX
|
||||
#echo "WINEPREFIX is now $WINEPREFIX" >&2
|
||||
mkdir -p "$(dirname "$WINEPREFIX")"
|
||||
@ -4533,9 +4600,7 @@ winetricks_set_wineprefix()
|
||||
fi
|
||||
|
||||
case "$W_PLATFORM" in
|
||||
"windows_cmd|wine_cmd")
|
||||
W_CACHE_WIN="$(w_pathconv -w "$W_CACHE")"
|
||||
;;
|
||||
"windows_cmd|wine_cmd") W_CACHE_WIN="$(w_pathconv -w "$W_CACHE")" ;;
|
||||
*)
|
||||
# For case where Z: doesn't exist or / is writable (!),
|
||||
# make a drive letter for W_CACHE. Clean it up on exit.
|
||||
@ -4563,6 +4628,9 @@ winetricks_set_wineprefix()
|
||||
W_COMMONFILES_WIN="$W_COMMONFILES_X86_WIN"
|
||||
fi
|
||||
|
||||
W_COMMONFILES_X86="$(w_pathconv -u "$W_COMMONFILES_X86_WIN")"
|
||||
#W_COMMONFILES="$(w_pathconv -u "$W_COMMONFILES_WIN")"
|
||||
|
||||
W_PROGRAMS_UNIX="$(w_pathconv -u "$W_PROGRAMS_WIN")"
|
||||
W_WINDIR_UNIX="$W_DRIVE_C/windows"
|
||||
|
||||
@ -4603,6 +4671,17 @@ winetricks_set_wineprefix()
|
||||
W_SYSTEM64_DLLS_WIN32="C:\\windows\\sysnative" # path to access 64-bit dlls from 32-bit apps
|
||||
# shellcheck disable=SC2034
|
||||
W_SYSTEM64_DLLS_WIN64="C:\\windows\\system32" # path to access 64-bit dlls from 64-bit apps
|
||||
# Common variable for 32-bit dlls on win32/win64:
|
||||
W_32BIT_DLLS="$W_WINDIR_UNIX/syswow64"
|
||||
|
||||
# Probably need fancier handling/checking, but for a basic start:
|
||||
# WINE64 = wine64, available on 64-bit prefixes
|
||||
# WINE_ARCH = the native wine for the prefix (wine for 32-bit, wine64 for 64-bit)
|
||||
# WINE_MULTI = generic wine, new name
|
||||
WINE64="${WINE}64"
|
||||
WINE_ARCH="${WINE64}"
|
||||
WINE_MULTI="${WINE}"
|
||||
|
||||
# 64-bit prefixes still have plenty of issues:
|
||||
case $LANG in
|
||||
ru*) w_warn "Вы используете 64-битный WINEPREFIX. Важно: многие ветки устанавливают только 32-битные версии пакетов. Если у вас возникли проблемы, пожалуйста, проверьте еще раз на чистом 32-битном WINEPREFIX до отправки отчета об ошибке." ;;
|
||||
@ -4612,6 +4691,12 @@ winetricks_set_wineprefix()
|
||||
W_ARCH=win32
|
||||
W_SYSTEM32_DLLS="$W_WINDIR_UNIX/system32"
|
||||
W_SYSTEM32_DLLS_WIN="C:\\windows\\system32"
|
||||
# Common variable for 32-bit dlls on win32/win64:
|
||||
W_32BIT_DLLS="$W_WINDIR_UNIX/system32"
|
||||
|
||||
WINE64="false"
|
||||
WINE_ARCH="${WINE}"
|
||||
WINE_MULTI="${WINE}"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -4624,6 +4709,7 @@ winetricks_annihilate_wineprefix()
|
||||
pl*) w_askpermission "Czy na pewno chcesz usunąć prefiks $WINEPREFIX i wszystkie jego elementy?" ;;
|
||||
*) w_askpermission "Delete $WINEPREFIX, its apps, icons, and menu items?" ;;
|
||||
esac
|
||||
|
||||
rm -rf "$WINEPREFIX"
|
||||
|
||||
# Also remove menu items.
|
||||
@ -4726,10 +4812,29 @@ winetricks_init()
|
||||
WINETRICKS_CONFIG="${XDG_CONFIG_HOME}/winetricks"
|
||||
#test -d "$WINETRICKS_CONFIG" || mkdir -p "$WINETRICKS_CONFIG"
|
||||
|
||||
# Pin a task to a single cpu. Helps prevent race conditions.
|
||||
#
|
||||
# Linux/FreeBSD: supported
|
||||
# OSX: doesn't have a utility for this
|
||||
# Solaris: no access, PR welcome
|
||||
|
||||
if [ -x "$(which taskset 2>/dev/null)" ]; then
|
||||
W_TASKSET="taskset -c 0"
|
||||
elif [ -x "$(which cpuset 2>/dev/null)" ]; then
|
||||
W_TASKSET="cpuset -l 0"
|
||||
else
|
||||
# not using w_warn so we don't annoy everyone running via GUI, but still printed to terminal:
|
||||
echo "warning: taskset/cpuset not available on your platform!"
|
||||
W_TASKSET=""
|
||||
fi
|
||||
|
||||
# System-specific variables
|
||||
case "$W_PLATFORM" in
|
||||
windows_cmd)
|
||||
WINE=""
|
||||
WINE64=""
|
||||
WINE_ARCH=""
|
||||
WINE_MULTI=""
|
||||
WINESERVER=""
|
||||
W_DRIVE_C="C:/"
|
||||
;;
|
||||
@ -4768,11 +4873,10 @@ winetricks_init()
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
case "$x" in
|
||||
file-not-found)
|
||||
w_die "wineserver not found!" ;;
|
||||
*)
|
||||
WINESERVER="$x" ;;
|
||||
file-not-found) w_die "wineserver not found!" ;;
|
||||
*) WINESERVER="$x" ;;
|
||||
esac
|
||||
|
||||
if test "$WINEPREFIX"; then
|
||||
@ -4787,6 +4891,7 @@ winetricks_init()
|
||||
unset _abswine
|
||||
;;
|
||||
esac
|
||||
|
||||
winetricks_set_wineprefix "$1"
|
||||
|
||||
# Whether to automate installs (0=no, 1=yes)
|
||||
@ -5363,7 +5468,7 @@ w_metadata binkw32 dlls \
|
||||
|
||||
load_binkw32()
|
||||
{
|
||||
# Mirror: http://www.dlldump.com/download-dll-files_new.php/dllfiles/B/binkw32.dll/1.0q/download.html
|
||||
# Mirror: https://www.dlldump.com/download-dll-files_new.php/dllfiles/B/binkw32.dll/1.0q/download.html
|
||||
# sha256sum of the decompressed file: 1fd7ef7873c8a3be7e2f127b306d0d24d7d88e20cf9188894eff87b5af0d495f
|
||||
#
|
||||
# Zip sha256sum:
|
||||
@ -6488,10 +6593,10 @@ load_dotnet20sp1()
|
||||
w_warn "Setting windows version so installer works"
|
||||
# Stop services
|
||||
# Recipe from https://bugs.winehq.org/show_bug.cgi?id=16956
|
||||
$WINESERVER -k
|
||||
w_wineserver -k
|
||||
# Fight a race condition, see bug 16956 comment 43
|
||||
w_set_winver win2k
|
||||
$WINESERVER -w
|
||||
w_wineserver -w
|
||||
WINEDLLOVERRIDES=ngen.exe,regsvcs.exe,mscorsvw.exe=b
|
||||
export WINEDLLOVERRIDES
|
||||
|
||||
@ -6549,7 +6654,7 @@ load_dotnet20sp2()
|
||||
w_call remove_mono
|
||||
|
||||
w_call dotnet20
|
||||
$WINESERVER -w
|
||||
w_wineserver -w
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_ahk_do "
|
||||
@ -6685,9 +6790,9 @@ load_dotnet30sp1()
|
||||
|
||||
w_call remove_mono
|
||||
w_call dotnet30
|
||||
$WINESERVER -w
|
||||
w_wineserver -w
|
||||
w_call dotnet20sp1
|
||||
$WINESERVER -w
|
||||
w_wineserver -w
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
|
||||
@ -6738,7 +6843,7 @@ load_dotnet35()
|
||||
w_call remove_mono
|
||||
|
||||
w_call dotnet30sp1
|
||||
$WINESERVER -w
|
||||
w_wineserver -w
|
||||
|
||||
if w_workaround_wine_bug 33450 "Installing msxml3" ,1.5.28; then
|
||||
w_call msxml3
|
||||
@ -6787,9 +6892,9 @@ load_dotnet35sp1()
|
||||
w_call remove_mono
|
||||
|
||||
w_call dotnet35
|
||||
$WINESERVER -w
|
||||
w_wineserver -w
|
||||
w_call dotnet20sp2
|
||||
$WINESERVER -w
|
||||
w_wineserver -w
|
||||
|
||||
# Work around hang in https://bugs.winehq.org/show_bug.cgi?id=25060#c19
|
||||
WINEDLLOVERRIDES=ngen.exe,mscorsvw.exe=b
|
||||
@ -6846,6 +6951,10 @@ load_dotnet40()
|
||||
*) w_warn "dotnet40 does not yet fully work or install on wine. Caveat emptor." ;;
|
||||
esac
|
||||
|
||||
if [ "$W_ARCH" = "win64" ] && w_workaround_wine_bug 42701; then
|
||||
w_warn "On 64-bit, you'll run into https://bugs.winehq.org/show_bug.cgi?id=42701 (missing api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll.RoGetParameterizedTypeInstanceIID"
|
||||
fi
|
||||
|
||||
# https://www.microsoft.com/en-us/download/details.aspx?id=17718
|
||||
w_download https://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe 65e064258f2e418816b304f646ff9e87af101e4c9552ab064bb74d281c38659f
|
||||
|
||||
@ -7086,7 +7195,7 @@ load_dotnet462()
|
||||
w_package_warn_win64
|
||||
|
||||
if w_workaround_wine_bug 42170 "Running un-official repacked .NET 4.6.2 setup until the official version is fixed."; then
|
||||
# Un-official slim version. See http://repacks.net/forum/viewtopic.php?t=7
|
||||
# Un-official slim version. See https://repacks.net/forum/viewtopic.php?t=7
|
||||
file_package="dotNetFx462_Full_x86_x64_Slim.exe"
|
||||
w_download https://www.dropbox.com/s/1bdocgbate8hc8z/dotNetFx462_Full_x86_x64_Slim.exe?dl=1 8f03c8a9b2f4666c3707abe2d70145f200cb2f0f3b792626e64d167d1ad0565f $file_package
|
||||
unattended_args="/ai /gm2"
|
||||
@ -7429,7 +7538,7 @@ load_gmdls()
|
||||
{
|
||||
# Originally at https://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe
|
||||
# Only archive.org seems to have it now
|
||||
w_download_to directx8 http://web.archive.org/web/20070105100243if_/http://download.microsoft.com:80/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe 5ddc1a8e204381254dc5d65f406584787155983adf245a75000dcd0d2efb04c6
|
||||
w_download_to directx8 https://web.archive.org/web/20070105100243if_/download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe 5ddc1a8e204381254dc5d65f406584787155983adf245a75000dcd0d2efb04c6
|
||||
|
||||
w_try_unzip "$W_TMP" "$W_CACHE"/directx8/DX81Redist.exe "*/*/DirectX.cab"
|
||||
w_try_cabextract -d "$W_TMP" -F gm16.dls "$W_TMP"/*/*/DirectX.cab
|
||||
@ -7681,6 +7790,9 @@ w_metadata ie8_kb2936068 dlls \
|
||||
|
||||
load_ie8_kb2936068()
|
||||
{
|
||||
# If we really need win64 support, should check if there's an x64 version of the hotfix
|
||||
w_package_unsupported_win64
|
||||
|
||||
w_call ie8
|
||||
|
||||
w_download https://download.microsoft.com/download/3/8/C/38CE0ABB-01FD-4C0A-A569-BC5E82C34A17/IE8-WindowsXP-KB2936068-x86-ENU.exe 8bda23c78cdcd9d01c364a01c6d639dfb2d11550a5521b8a81c808c1a2b1824e
|
||||
@ -7740,8 +7852,8 @@ load_kindle()
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /S}
|
||||
|
||||
if w_workaround_wine_bug 35041; then
|
||||
w_warn "You may need to run with taskset -c 0 to avoid a libX11 crash."
|
||||
if w_workaround_wine_bug 35041 && [ ! -z "$W_TASKSET" ] ; then
|
||||
w_warn "You may need to run with $W_TASKSET to avoid a libX11 crash."
|
||||
fi
|
||||
|
||||
if w_workaround_wine_bug 29045; then
|
||||
@ -8287,7 +8399,7 @@ w_metadata ogg dlls \
|
||||
|
||||
load_ogg()
|
||||
{
|
||||
w_download http://downloads.xiph.org/releases/oggdsf/opencodecs_0.85.17777.exe fcec3cea637e806501aff447d902de3b5bfef226b629e43ab67e46dbb23f13e7
|
||||
w_download https://downloads.xiph.org/releases/oggdsf/opencodecs_0.85.17777.exe fcec3cea637e806501aff447d902de3b5bfef226b629e43ab67e46dbb23f13e7
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
|
||||
}
|
||||
@ -8624,20 +8736,20 @@ w_metadata remove_mono settings \
|
||||
|
||||
load_remove_mono()
|
||||
{
|
||||
mono_uuid="$($WINE uninstaller --list | grep Mono | cut -f1 -d\|)"
|
||||
mono_uuid="$("${WINE_ARCH}" uninstaller --list | grep Mono | cut -f1 -d\|)"
|
||||
if test "$mono_uuid"; then
|
||||
"$WINE" uninstaller --remove "$mono_uuid"
|
||||
"${WINE_ARCH}" uninstaller --remove "$mono_uuid"
|
||||
else
|
||||
w_warn "Mono does not appear to be installed."
|
||||
fi
|
||||
|
||||
# FIXME: verify on pristine Windows XP:
|
||||
if w_workaround_wine_bug 34803; then
|
||||
"$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled' /f
|
||||
"${WINE_ARCH}" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled' /f
|
||||
fi
|
||||
|
||||
"$WINE" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5" /f || true
|
||||
"$WINE" reg delete "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" /f || true
|
||||
"${WINE_ARCH}" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5" /f || true
|
||||
"${WINE_ARCH}" reg delete "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" /f || true
|
||||
|
||||
w_try rm -f "$W_WINDIR_UNIX/system32/mscoree.dll"
|
||||
}
|
||||
@ -8748,7 +8860,7 @@ load_secur32()
|
||||
|
||||
if [ "$W_ARCH" = "win64" ]; then
|
||||
helper_win7sp1_x64 amd64_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_04709031736ac277/secur32.dll
|
||||
w_try "$W_TMP/amd64_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_04709031736ac277/secur32.dll" "$W_SYSTEM64_DLLS/secur32.dll"
|
||||
w_try cp "$W_TMP/amd64_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_04709031736ac277/secur32.dll" "$W_SYSTEM64_DLLS/secur32.dll"
|
||||
fi
|
||||
|
||||
w_override_dlls native,builtin secur32
|
||||
@ -8812,9 +8924,22 @@ load_speechsdk()
|
||||
# Otherwise it only installs the SDK and not the redistributable:
|
||||
w_set_winver win2k
|
||||
|
||||
# Only added in wine-2.18
|
||||
for stub in "$W_SYSTEM32_DLLS/Speech/Common/sapi.dll" "$W_SYSTEM64_DLLS/Speech/Common/sapi.dll"; do
|
||||
if [ -f "$stub" ]; then
|
||||
w_try rm "$stub"
|
||||
fi
|
||||
done
|
||||
|
||||
w_try_cd "$W_TMP"
|
||||
w_try "$WINE" msiexec /i "Microsoft Speech SDK 5.1.msi" $W_UNATTENDED_SLASH_Q
|
||||
|
||||
# If sapi.dll isn't in original location, applications won't start, see
|
||||
# e.g., https://bugs.winehq.org/show_bug.cgi?id=43841
|
||||
w_try ln -s "$W_COMMONFILES_X86/Microsoft Shared/Speech/sapi.dll" "$W_32BIT_DLLS/Speech/Common"
|
||||
|
||||
w_override_dlls native sapi
|
||||
|
||||
w_unset_winver
|
||||
}
|
||||
|
||||
@ -9448,10 +9573,7 @@ w_metadata vjrun20 dlls \
|
||||
|
||||
load_vjrun20()
|
||||
{
|
||||
if [ $W_ARCH = win64 ]; then
|
||||
w_warn "vjrun20 depends on dotnet20, which doesn't work on 64-bit Wine yet. Skipping."
|
||||
return
|
||||
fi
|
||||
w_package_unsupported_win64
|
||||
|
||||
w_call dotnet20
|
||||
|
||||
@ -9461,6 +9583,30 @@ load_vjrun20()
|
||||
w_try "$WINE" vjredist.exe ${W_OPT_UNATTENDED:+ /q /C:"install $W_UNATTENDED_SLASH_QNT"}
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata webio dlls \
|
||||
title="MS Windows Web I/O" \
|
||||
publisher="Microsoft" \
|
||||
year="2011" \
|
||||
media="download" \
|
||||
file1="../win7sp1/windows6.1-KB976932-X86.exe" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/webio.dll"
|
||||
|
||||
load_webio()
|
||||
{
|
||||
helper_win7sp1 x86_microsoft-windows-webio_31bf3856ad364e35_6.1.7601.17514_none_5ef1a4093cf55387/webio.dll
|
||||
w_try cp "$W_TMP/x86_microsoft-windows-webio_31bf3856ad364e35_6.1.7601.17514_none_5ef1a4093cf55387/webio.dll" "$W_SYSTEM32_DLLS/webio.dll"
|
||||
|
||||
if [ "$W_ARCH" = "win64" ]; then
|
||||
helper_win7sp1_x64 amd64_microsoft-windows-webio_31bf3856ad364e35_6.1.7601.17514_none_bb103f8cf552c4bd/webio.dll
|
||||
w_try cp "$W_TMP/amd64_microsoft-windows-webio_31bf3856ad364e35_6.1.7601.17514_none_bb103f8cf552c4bd/webio.dll" "$W_SYSTEM64_DLLS/webio.dll"
|
||||
fi
|
||||
|
||||
w_override_dlls native,builtin webio
|
||||
}
|
||||
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata windowscodecs dlls \
|
||||
@ -9496,12 +9642,6 @@ load_windowscodecs()
|
||||
# AF says in AppDB entry for .NET 3.0 that windowscodecs has to be native only
|
||||
w_override_dlls native windowscodecs windowscodecsext
|
||||
|
||||
if test -x /usr/bin/taskset && w_workaround_wine_bug 32859 "Working around possibly broken libX11"; then
|
||||
TASKSET="taskset -c 0"
|
||||
else
|
||||
TASKSET=""
|
||||
fi
|
||||
|
||||
w_set_winver winxp
|
||||
|
||||
# Always run the WIC installer in passive mode.
|
||||
@ -9509,7 +9649,11 @@ load_windowscodecs()
|
||||
# https://bugs.winehq.org/show_bug.cgi?id=23232
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
|
||||
w_try $TASKSET "$WINE" "$EXE" /passive
|
||||
if w_workaround_wine_bug 32859 "Working around possibly broken libX11"; then
|
||||
w_try $W_TASKSET "$WINE" "$EXE" /passive
|
||||
else
|
||||
w_try "$WINE" "$EXE" /passive
|
||||
fi
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
@ -9517,21 +9661,19 @@ load_windowscodecs()
|
||||
w_metadata winhttp dlls \
|
||||
title="MS Windows HTTP Services" \
|
||||
publisher="Microsoft" \
|
||||
year="2011" \
|
||||
year="2005" \
|
||||
media="download" \
|
||||
file1="../win7sp1/windows6.1-KB976932-X86.exe" \
|
||||
file1="../win2ksp4/W2KSP4_EN.EXE" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/winhttp.dll"
|
||||
|
||||
load_winhttp()
|
||||
{
|
||||
helper_win7sp1 x86_microsoft.windows.winhttp_31bf3856ad364e35_5.1.7601.17514_none_5ea69615819a23e4/winhttp.dll
|
||||
w_try cp "$W_TMP/x86_microsoft.windows.winhttp_31bf3856ad364e35_5.1.7601.17514_none_5ea69615819a23e4/winhttp.dll" "$W_SYSTEM32_DLLS/winhttp.dll"
|
||||
|
||||
if [ "$W_ARCH" = "win64" ]; then
|
||||
helper_win7sp1_x64 amd64_microsoft.windows.winhttp_31bf3856ad364e35_5.1.7601.17514_none_bac5319939f7951a/winhttp.dll
|
||||
w_try cp "$W_TMP/amd64_microsoft.windows.winhttp_31bf3856ad364e35_5.1.7601.17514_none_bac5319939f7951a/winhttp.dll" "$W_SYSTEM64_DLLS/winhttp.dll"
|
||||
fi
|
||||
# 2017/10/12: Can't use win7's version, as that need webio.dll, which wants ntdll.EtwEventActivityIdControl.
|
||||
# Should get that into wine{,-stable} so we can use win7 version in the long run
|
||||
# See https://github.com/Winetricks/winetricks/issues/831
|
||||
|
||||
helper_win2ksp4 i386/new/winhttp.dl_
|
||||
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/new/winhttp.dl_
|
||||
w_override_dlls native,builtin winhttp
|
||||
}
|
||||
|
||||
@ -10151,6 +10293,28 @@ load_fakejapanese_ipamona()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata fakejapanese_vlgothic fonts \
|
||||
title="Creates aliases for Japanese Meiryo fonts using VLGothic fonts" \
|
||||
publisher="Project Vine / Daisuke Suzuki" \
|
||||
year="2014"
|
||||
|
||||
load_fakejapanese_vlgothic()
|
||||
{
|
||||
w_call vlgothic
|
||||
|
||||
# Aliases to set:
|
||||
# Meiryo UI --> VL Gothic
|
||||
# Meiryo (メイリオ) --> VL Gothic
|
||||
|
||||
jpname_meiryo="$(echo "メイリオ" | iconv -f utf8 -t cp932)"
|
||||
|
||||
w_register_font_replacement "Meiryo UI" "VL Gothic"
|
||||
w_register_font_replacement "Meiryo" "VL Gothic"
|
||||
w_register_font_replacement "$jpname_meiryo" "VL Gothic"
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata fakekorean fonts \
|
||||
title="Creates aliases for Korean fonts using Baekmuk fonts" \
|
||||
publisher="Wooderart Inc. / kldp.net" \
|
||||
@ -10232,26 +10396,17 @@ w_metadata liberation fonts \
|
||||
publisher="Red Hat" \
|
||||
year="2008" \
|
||||
media="download" \
|
||||
file1="liberation-fonts-1.04.tar.gz" \
|
||||
file1="liberation-fonts-ttf-1.07.4.tar.gz" \
|
||||
installed_file1="$W_FONTSDIR_WIN/LiberationMono-BoldItalic.ttf"
|
||||
|
||||
load_liberation()
|
||||
{
|
||||
# https://www.redhat.com/en/about/blog/liberation-fonts
|
||||
case $(uname -s) in
|
||||
SunOS|Solaris)
|
||||
echo "If you get 'ERROR: Certificate verification error for fedorahosted.org: unable to get local issuer certificate':"
|
||||
echo "Then you need to add Verisign root certificates to your local keystore."
|
||||
echo "OpenSolaris users, see: https://www.linuxtopia.org/online_books/opensolaris_2008/SYSADV1/html/swmgrpatchtasks-14.html"
|
||||
echo "Or edit winetricks's download function, and add '--no-check-certificate' to the command."
|
||||
;;
|
||||
esac
|
||||
|
||||
w_download http://pkgs.fedoraproject.org/repo/pkgs/liberation-fonts/liberation-fonts-1.04.tar.gz/4846797ef0fc70b0cbaede2514677c58/liberation-fonts-1.04.tar.gz 0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1
|
||||
# https://pagure.io/liberation-fonts
|
||||
w_download https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-1.07.4.tar.gz 61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c
|
||||
w_try_cd "$W_TMP"
|
||||
# FIXME: w_try doesn't work here, presumably because of the pipe?
|
||||
gunzip -dc "$W_CACHE/$W_PACKAGE/$file1" | tar -xf -
|
||||
w_try mv liberation-fonts-1.04/*.ttf "$W_FONTSDIR_UNIX"
|
||||
w_try mv liberation-fonts-ttf-1.07.4/*.ttf "$W_FONTSDIR_UNIX"
|
||||
|
||||
w_register_font LiberationMono-BoldItalic.ttf "LiberationMono-BoldItalic"
|
||||
w_register_font LiberationMono-Bold.ttf "LiberationMono-Bold"
|
||||
@ -10389,6 +10544,32 @@ load_uff()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata vlgothic fonts \
|
||||
title="VLGothic Japanese fonts" \
|
||||
publisher="Project Vine / Daisuke Suzuki" \
|
||||
year="2014" \
|
||||
media="download" \
|
||||
file1="VLGothic-20141206.tar.xz" \
|
||||
installed_file1="$W_FONTSDIR_WIN/VL-Gothic-Regular.ttf" \
|
||||
homepage="https://ja.osdn.net/projects/vlgothic"
|
||||
|
||||
load_vlgothic()
|
||||
{
|
||||
# $homepage is already assigned in w_do_call(), and works as expected:
|
||||
# shellcheck disable=SC2154
|
||||
w_download "$homepage/downloads/62375/$file1" 982040db2f9cb73d7c6ab7d9d163f2ed46d1180f330c9ba2fae303649bf8102d
|
||||
|
||||
w_try_cd "$W_TMP"
|
||||
|
||||
unxz -dc "$W_CACHE/$W_PACKAGE/$file1" | tar -xf -
|
||||
w_try mv ./VLGothic/*.ttf "$W_FONTSDIR_UNIX"
|
||||
|
||||
w_register_font VL-Gothic-Regular.ttf "VL Gothic"
|
||||
w_register_font VL-PGothic-Regular.ttf "VL PGothic"
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata wenquanyi fonts \
|
||||
title="WenQuanYi CJK font" \
|
||||
publisher="wenq.org" \
|
||||
@ -10995,6 +11176,8 @@ w_metadata ie7 dlls \
|
||||
|
||||
load_ie7()
|
||||
{
|
||||
w_package_unsupported_win64
|
||||
|
||||
# Unregister Wine IE
|
||||
if grep -q -i "wine placeholder" "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe"; then
|
||||
w_override_dlls builtin iexplore.exe
|
||||
@ -11456,8 +11639,8 @@ __EOF__
|
||||
0|43) ;;
|
||||
78)
|
||||
w_die "Installing $W_PACKAGE failed, product key $W_KEY \
|
||||
might be wrong. Try again without -q, or put correct key in \
|
||||
$W_CACHE/$W_PACKAGE/key.txt and rerun."
|
||||
might be wrong. Try again without -q, or put correct key in \
|
||||
$W_CACHE/$W_PACKAGE/key.txt and rerun."
|
||||
;;
|
||||
*)
|
||||
w_die "Installing $W_PACKAGE failed."
|
||||
@ -11731,7 +11914,7 @@ load_safari()
|
||||
fi
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" SafariSetup.exe $W_UNATTENDED_SLASH_QN
|
||||
w_try "$WINE_MULTI" SafariSetup.exe $W_UNATTENDED_SLASH_QN
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
@ -12057,7 +12240,7 @@ load_vc2010express()
|
||||
# Originally at: https://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso
|
||||
# Mirror list at: http://www.filewatcher.com/_/?q=VS2010Express1.iso
|
||||
# Formerly at: ftp://www.daba.lv/pub/Programmeeshana/VisualStudio/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
|
||||
w_download https://web.archive.org/web/20140227220734/http://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
|
||||
w_download https://web.archive.org/web/20140227220734/download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
|
||||
|
||||
# Unpack ISO
|
||||
w_try_7z "$W_TMP" "$W_CACHE"/vc2010express/VS2010Express1.iso
|
||||
@ -12705,7 +12888,7 @@ load_aoe3_demo()
|
||||
SetTitleMatchMode, 2
|
||||
WinKill,Empires
|
||||
"
|
||||
# or should we just do $WINESERVER -k, like fable_tlc does?
|
||||
# or should we just do w_wineserver -k, like fable_tlc does?
|
||||
# shellcheck disable=SC2046
|
||||
kill $(pgrep -f IDriver)
|
||||
fi
|
||||
@ -12760,7 +12943,7 @@ load_acreedbro()
|
||||
# shellcheck disable=SC2009
|
||||
if ps augxw | grep -i exe | grep -E 'winemenubuilder.exe|setup.exe|PnkBstrA.exe | grep -v grep'; then
|
||||
w_warn "Killing processes so patcher does not complain about game still running"
|
||||
$WINESERVER -k
|
||||
w_wineserver -k
|
||||
sleep 10
|
||||
fi
|
||||
|
||||
@ -13255,7 +13438,7 @@ w_metadata cim_demo games \
|
||||
load_cim_demo()
|
||||
{
|
||||
# 29 Mar 2011 cf02066f496637c24f95cf0c4ddfae376951330802500fb11bd74cc6c8872995, Inno Setup installer
|
||||
#w_download http://www.pcgamestore.com/games/cities-in-motion-nbsp/trial/cim-demo-1-0-8.exe cf02066f496637c24f95cf0c4ddfae376951330802500fb11bd74cc6c8872995
|
||||
#w_download https://www.pcgamestore.com/games/cities-in-motion-nbsp/trial/cim-demo-1-0-8.exe cf02066f496637c24f95cf0c4ddfae376951330802500fb11bd74cc6c8872995
|
||||
w_download_manual https://www.fileplanet.com/218762/210000/fileinfo/Cities-in-Motion-Demo cim-demo-1-0-8.exe cf02066f496637c24f95cf0c4ddfae376951330802500fb11bd74cc6c8872995
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" cim-demo-1-0-8.exe ${W_OPT_UNATTENDED:+ /sp- /silent /norestart}
|
||||
@ -15263,7 +15446,7 @@ load_lhp_demo()
|
||||
case "$LANG" in
|
||||
*UTF-8*|*utf8*) ;;
|
||||
*)
|
||||
w_warn "This installer fails in non-utf-8 locales. Doing 'export LANG=en_US.UTF-8'."
|
||||
w_warn "This installer fails in non-utf-8 locales. Doing 'export LANG=en_US.UTF-8' is a workaround."
|
||||
LANG=en_US.UTF-8
|
||||
export LANG
|
||||
;;
|
||||
@ -18671,6 +18854,12 @@ winetricks_stats_init()
|
||||
thanks="Dziękujemy! Nie otrzymasz już tego pytania. Pamiętaj, ze możesz wyłączyć tą opcję komendą 'winetricks --optout'"
|
||||
declined="OK, Winetricks *nie* będzie wysyłać statystyk. Nie otrzymasz już tego pytania."
|
||||
;;
|
||||
ru*)
|
||||
title="Помощь в разработке Winetricks"
|
||||
question="Вы хотите помочь разработке winetricks, отправляя статистику? Вы можете отключить отправку статистики в любое время с помощью команды 'winetricks --optout'"
|
||||
thanks="Спасибо! Этот вопрос больше не появится. Помните: вы можете отключить отправку статистики в любое время с помощью команды 'winetricks --optout'"
|
||||
declined="OK, winetricks НЕ будет отправлять статистику. Этот вопрос больше не появится."
|
||||
;;
|
||||
uk*)
|
||||
title="Допомога в розробці Winetricks"
|
||||
question="Ви хочете допомогти в розробці Winetricks дозволивши звітувати статистику?\nВи можете в будь-який час вимкнути цю опцію за допомогою команди 'winetricks --optout'"
|
||||
@ -18703,8 +18892,7 @@ winetricks_os_description()
|
||||
{
|
||||
(
|
||||
case "$W_PLATFORM" in
|
||||
windows_cmd)
|
||||
echo windows ;;
|
||||
windows_cmd) echo "windows" ;;
|
||||
*) echo "$WINETRICKS_WINE_VERSION" ;;
|
||||
esac
|
||||
) | tr '\012' ' '
|
||||
@ -18719,6 +18907,7 @@ winetricks_stats_report()
|
||||
1) ;;
|
||||
*) return;;
|
||||
esac
|
||||
|
||||
test -f "$WINETRICKS_WORKDIR"/breadcrumbs || return
|
||||
|
||||
WINETRICKS_STATS_BREADCRUMBS=$(tr '\012' ' ' < "$WINETRICKS_WORKDIR"/breadcrumbs)
|
||||
@ -18764,6 +18953,7 @@ winetricks_stats_log_command()
|
||||
windows_cmd) _W_LOGDIR="$W_WINDIR_UNIX"/Temp ;;
|
||||
*) _W_LOGDIR="$WINEPREFIX" ;;
|
||||
esac
|
||||
|
||||
mkdir -p "$_W_LOGDIR"
|
||||
echo "$*" >> "$_W_LOGDIR"/winetricks.log
|
||||
unset _W_LOGDIR
|
||||
@ -18805,7 +18995,6 @@ execute_command()
|
||||
esac
|
||||
|
||||
case "$1" in
|
||||
|
||||
# FIXME: avoid duplicated code
|
||||
apps|benchmarks|dlls|fonts|games|prefix|settings)
|
||||
WINETRICKS_CURMENU="$1"
|
||||
@ -18984,6 +19173,7 @@ then
|
||||
do
|
||||
execute_command "$verb"
|
||||
done
|
||||
|
||||
case "${WINETRICKS_CURMENU}-${WINETRICKS_OPT_SHAREDPREFIX}" in
|
||||
prefix-*|apps-0|benchmarks-0|games-0)
|
||||
# After installing isolated app, return to prefix picker
|
||||
@ -19004,8 +19194,7 @@ then
|
||||
# Command-line case
|
||||
winetricks_detect_sudo
|
||||
# User gave command-line arguments, so just run those verbs and exit
|
||||
for verb
|
||||
do
|
||||
for verb; do
|
||||
case $verb in
|
||||
*.verb)
|
||||
# Load the verb file
|
||||
@ -19014,6 +19203,7 @@ then
|
||||
*/*) . "$verb" ;;
|
||||
*) . ./"$verb" ;;
|
||||
esac
|
||||
|
||||
# And forget that the verb comes from a file
|
||||
verb="$(echo "$verb" | sed 's,.*/,,;s,.verb,,')"
|
||||
;;
|
||||
@ -19021,7 +19211,6 @@ then
|
||||
execute_command "$verb"
|
||||
done
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
winetricks_stats_report
|
||||
|
||||
Loading…
Reference in New Issue
Block a user