Accepting request 514716 from Emulators

- Update to 2.14 development snapshot
  - 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/request/show/514716
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=229

wine-2.13.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6fbca3ddd19b061ce65a267639efae93cf38cfabbe4a9c148a17a44703587ef8
-size 19439328

wine-2.13.tar.xz.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAllyUSQACgkQzvrI6q8X
-UZ1tzBAAo8Rs5L6LA07mYLRWpBF2GlL7rU8MFy7LNBQWaGJPAW/r97ZPX6DtRzhC
-c9PrSOMvY0HBngJUtK5GWwAEB+HsLUaxWfmKNQJfMi8axn/zLei3rk+0kVnF18Wd
-LgyF+e2wwaePjcT6nJ3m1KhBOj9rQDv584XvgkczbboDH361cwYcFabdP1nBFNkE
-+CD6DK+6jqEBAbU6Xgyah/q6hhDrgYYTpOTPOBc3AA9lelGguBDIP/bAn1HypbB5
-IIPVcnpOG57lqwqA727fZXIQv+HJSdgpZ92Yc1dyX1XcEJ5Wrsd8bYUTthskvxiK
-rjx2tHm/PwLG0rUaA1ZAZQUez3vTx/JiIet4VhZOXyTwgD4jRGbXZ19Sj5jR0z0C
-fpiuG1VceSPr32uzlmu/KoyJiZYv5zMYcEhLxRtNDNUT5ipaL0gomNHYhPVp9iWs
-up3L9R5q8KDCPpNMNtyXtZ9+jHhZt4R4vD/vgPFsRoMrtX+tX21+n25LPo9dJeBQ
-bHGTTAisteHBJrQEijX8m+Lh7pe5zTJ2hm4F5kkrjnXFHIKuhMBXfCfZrDUCuGDv
-n1A0uaHLeeqdYbIHoBa1LRmpZTHoFeuaEctFaJF5p/dsmge7qTlNxLjl/F+HDrE+
-ZrFjvtyEDPi+lmrv0uKWXGFXFGM9QmRXeA5be4E64AMF8STwdSo=
-=d1Wy
------END PGP SIGNATURE-----

wine-2.14.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6
+size 19447812

wine-2.14.tar.xz.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlmDYAMACgkQzvrI6q8X
+UZ0T8A/9EV5Cx0P3Hv7RBfYghDqG2jlI8EcUEKTl4kkZoLVfhQoChAFSX+yUNXDC
+O41vDX3XnYJ2M9OkKn5bePJs2GvGnQU0ENjzCz25jhuVMU1LG7m+Jf9FkYoekQhO
+l3w7irMagZQIGrdX/JSpFMa0KIDrOkhnSHwJJ3jxHsInJJoXAFqEzB4J1cMJ2Bpq
+jJLioJoKaE+FfbiJd8nmSxRwPCfb2AYJS7jPKimt7AF39MN1Fmijthf+dyvEZ8e8
+3PJ/XQTJkipOIJ2GX7pHr6TJENXzyXZQLjgrtLXyBVLz7D3FKBdG0FaLi9w7lMTT
+Mlcj8UDieWtI67aQQi4d+6pw9lOSTtkTIpQJK5sBfRV9qhIdpVi8U/4nGujux5NR
+c20dgfHJue5UdGJaQ2OAIfPJ+D73EfTQscwQ4fvK1yyWL+peWLjYgINvCoHBeb+9
+VWmBya2e4PeKZOXQee1GTkaWYnGXbqRz9IleuSgomFta81jH05L8mUTg4/8gt3ao
+E87eDcxSauAHh99P/9/viCCnUP3ZIMxS7WiD1PQRPtXxD30MeNHXmUxLn4WOcwWL
+RdCyM2EgIh7ecdmlgFSIWRaC/Fo8zydk0DkxihVkaGQHvXRrHv2wfNLesm000xYg
+ztoVzKTf7qhpR3IK3nB67FWa3pz+L5MTt7l5ZtZTvtIpFjL45OE=
+=hZMv
+-----END PGP SIGNATURE-----

wine.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Aug  4 11:03:53 UTC 2017 - meissner@suse.com
+
+- Update to 2.14 development snapshot
+  - 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
+
 -------------------------------------------------------------------
 Sat Jul 22 09:29:38 UTC 2017 - meissner@suse.com
 

wine.spec

@@ -61,8 +61,8 @@ BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
 BuildRequires:  pkgconfig(libudev)
-%define realver 2.13
+%define realver 2.14
-Version:        2.13
+Version:        2.14
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+

winetricks

@@ -2416,20 +2416,13 @@ w_compare_wine_version()
 
     case "$comparison" in
         # expected value if the comparison is true
-        -bn) _expected_pos_current_wine="2"
+        -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";;
-             ;;
+        -le) _expected_pos_current_wine="1";;
-        -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}"
-             ;;
         *) w_die "Unsupported comparison. Only -ge and -le are supported" ;;
     esac
 
-    # shellcheck disable=SC2039
+    _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)"
-    _pos_current_wine="$(echo -e "${_wine_versions_string}" | 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