rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

- Update to 2.14 development snapshot

Browse Source 
- Mono engine updated with some bug fixes.
  - C++ calling convention workarounds in the IDL compiler.
  - Z-order support in the Android graphics driver.
  - Scalable mouse cursors on macOS.
  - Various bug fixes.
- updated winetricks

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=432
This commit is contained in:
Marcus Meissner
2017-08-04 11:06:12 +00:00
committed by Git OBS Bridge
parent be2f458985
commit ac8a935a38
7 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
winetricks
View File

@@ -2416,20 +2416,13 @@ w_compare_wine_version()
case "$comparison" in
# expected value if the comparison is true
-bn) _expected_pos_current_wine="2"
_wine_versions_string="${known_wine_val1}\n${_wine_version_stripped}\n${known_wine_val2}"
;;
-ge) _expected_pos_current_wine="2"
_wine_versions_string="${known_wine_val1}\n${_wine_version_stripped}"
;;
-le) _expected_pos_current_wine="1"
_wine_versions_string="${known_wine_val1}\n${_wine_version_stripped}"
;;
-bn) _expected_pos_current_wine="2";;
-ge) _expected_pos_current_wine="2";;
-le) _expected_pos_current_wine="1";;
*) w_die "Unsupported comparison. Only -ge and -le are supported" ;;
esac
# shellcheck disable=SC2039
_pos_current_wine="$(echo -e "${_wine_versions_string}" | sort -V | grep -n "^${_wine_version_stripped}\$" | cut -d : -f1)"
_pos_current_wine="$(printf "%s\n%s\n%s" "${known_wine_val1}" "${_wine_version_stripped}" "${known_wine_val2}" | sort -V | grep -n "^${_wine_version_stripped}\$" | cut -d : -f1)"
if [ "$_pos_current_wine" = "$_expected_pos_current_wine" ] ; then
#echo "true: known_wine_version=$2, comparison=$1, stripped wine=$_wine_version_stripped, expected_pos=$_expected_pos_known, pos_known=$_pos_known_wine"
#echo "Wine version comparison is true"
@@ -3035,7 +3028,7 @@ winetricks_early_wine()
# Gecko (winezeug bug 223).
# The tr removes carriage returns so expanded variables don't have crud on the end
# The grep works around using new wineprefixes with old wine
WINEDEBUG=-all "$WINE" "$@" 2> "$W_TMP_EARLY"/early_wine.err.txt | ( sed 's/.*1h.=//' | tr -d '\r' | grep -v "Module not found" || true)
WINEDEBUG=-all "$WINE" "$@" 2> "$W_TMP_EARLY"/early_wine.err.txt | ( sed 's/.*1h.=//' | tr -d '\r' | grep -v -e "Module not found" -e "Could not load wine-gecko" || true)
}
winetricks_detect_gui()
@@ -4920,6 +4913,11 @@ winetricks_init()
# wine-2.8
_wine_version_stripped="$(echo "$WINETRICKS_WINE_VERSION" | cut -d ' ' -f1 | sed -e 's/wine-//' -e 's/-rc.*//')"
# If WINE is < 2.0, warn user:
if w_wine_version_in 2.0, ; then
w_warn "Your version of wine $_wine_version_stripped is no longer supported upstream. You should upgrade to 2.x"
fi
if [ ! "$WINETRICKS_SUPER_QUIET" ] ; then
echo "Using winetricks $(winetricks_print_version) with ${WINETRICKS_ORIG_WINE_VERSION} and WINEARCH=${W_ARCH}"
fi