Accepting request 390220 from Emulators

- Updated to 1.9.8 development snapshot
  - More work towards the WineD3D command stream.
  - Bug fix update of the Mono engine.
  - More WebServices reader support.
  - Still more Shader Model 5 support.
  - Support for gradients in metafiles.
  - Improved table formatting in WinHelp.
  - Various bug fixes.
- updated winetricks

OBS-URL: https://build.opensuse.org/request/show/390220
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=197

wine-1.9.7.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49705fe02505e26ef8022c662dda702cfcd5c4fd73886e00b43d32dc2f8887ec
-size 23101883

wine-1.9.7.tar.bz2.sign

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJW/o20AAoJEM76yOqvF1GdYgQP+wR68qqXdb3uTsVoQ5zyD+8P
-7Y6HYp+xiNjwK0vFc3jZROMrJpSuSE641q2FF7CTvcyjkSty8T5hpVik7H9V4IjQ
-6KRR86RDBtVktJ5eXu6Ij+b3aK1T5QTktstqtrGtth158GtOn3REopx33c8Anfd9
-w9JAvqLWhhsAkWTQQvhg2CBtLEFAgV7f4d/0SkhrDM7xbbSuvJstRzqYzD5e6Gbf
-csnqzm8IHzpbynkkDVCoIaDlMXwGVv82PSPsqfIUEg78OhuP2kIW0vGmE43Z1wdC
-MMdWq0/W+HMY84JNLxk91Ld44rkV6A42oUFpaQguKCuJnxmAZh8wC0nHs4EcU/+k
-xBlc9btmKcTWqAUUaogaZ96ldTCEfEB3RQbxFkMhRPlndoSxyq2JPgr+8W66j7gl
-JeiBAQpfeghT60bY2rGidNtrK/WbAmc/nDkN2vzX+PrTJ1kfgIxRMeJPiumtFnu6
-i7FmYoVPCFiZekpSp7v9lwq7+uUsvaAIVT0GZ6btROM1+FsYKy8DHt0hOSXd9Ne2
-E9rBHUyZC3h5CyViyjazqo60pGTJlSlH5Lr1lZuyKAh2dejcCfQr0e+sNS5DmbaN
-SHTWKqrxWumiRWgVa8YHR2LM2Y3pAgvfCH6ullnEpvjhYUKgEacxZLk4ferUtaQ5
-vfLsv45Vrvve4u0JxIA1
-=SJZ0
------END PGP SIGNATURE-----

wine-1.9.8.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bf34e8dd68e7187ed11fb06a55a76789073dda6ab2db6b84e194acf4f561a1d
+size 23183703

wine-1.9.8.tar.bz2.sign

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJXEQG+AAoJEM76yOqvF1GdWM8QALQHMnq3H0UJoKVdmr/Iv1hT
+NDhgyAHO1PKi61HSiBUrqaBeYmtS512H3vZfboremXETLEoaNbtb+JlbpROLtHG5
+lf6nFCEXOsjUmIkB/jXFW7dJn6im7+vAzK5ajNawVrs0LbzQ2E1HQbiOfLglF6yx
+C3Zcg01tq0N6N+l1B2AKmtyanrIriJ0vx0zh0amK/bi0mMjyDgfxcroz2J4NXZUp
+X9DZ+rqM2LuxmyoNBNr+nj1/6FZxRudXXAq5eF88s1XMLLbaaarkY8kKHGYYPGwJ
+c/SRqAf8iDJdBEH1SqSBR+6DlytaoFeh9lAh6RTZvC39Sl63c9ERwHN08Nlfezuu
+Yt5mA6XTj8bKZC4/6hTKLNKaZRjiU2CxEhEXKTZlULyOSvk/5Iay/F8r27l93NUg
+HEcpZp6FgNufj4nPgGBs6AdtV/iJHs+1qpo0j8K57s5rg91hvwnK0EwEWI/gedOb
+ALr1vFAG1Qs9Jv78vhmPSoU8ON9/ngVXLQizaANDxKwMSdrSIfIfrWO28q74/BY9
+MBUK/4PblMDOGhdUCDYdhx3oIuu7Virx/d1A/Kw7xgo4TMpeZc2FqtDE8FiFA6Tp
+y0eIkbPaZaMVjqZrXSbJEKT7ENn39hWsq0/VvJG/derCTEILUVXJrbKKP9S01fNp
+62oz4WQEcqX7KChk8g+U
+=bX8a
+-----END PGP SIGNATURE-----

wine.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Apr 15 15:05:02 UTC 2016 - meissner@suse.com
+
+- Updated to 1.9.8 development snapshot
+  - More work towards the WineD3D command stream.
+  - Bug fix update of the Mono engine.
+  - More WebServices reader support.
+  - Still more Shader Model 5 support.
+  - Support for gradients in metafiles.
+  - Improved table formatting in WinHelp.
+  - Various bug fixes.
+- updated winetricks
+
 -------------------------------------------------------------------
 Fri Apr  1 17:24:29 UTC 2016 - meissner@suse.com
 

wine.spec

@@ -53,8 +53,8 @@ BuildRequires:  sane-backends-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
-%define realver 1.9.7
+%define realver 1.9.8
-Version:        1.9.7
+Version:        1.9.8
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+

winetricks

@@ -614,6 +614,68 @@ w_dotnet_verify()
             dn_status=$?
 }
 
+# Checks if the user can run the self-update/rollback commands
+winetricks_check_update_availability()
+{
+    # Prevents the development file overwrite:
+    if test -d "../.git"
+    then
+        w_warn "You're running in a dev environment. Please make a copy of the file before running this command."
+        exit;
+    fi
+
+    # Checks read/write permissions on update directories
+    if ! (test -r $0 && test -w $0 && test -w ${0%/*} && test -x ${0%/*})
+    then
+        w_warn "You don't have the proper permissions to run this command. Try again with sudo or as root."
+        exit;
+    fi
+}
+
+winetricks_selfupdate()
+{
+    winetricks_check_update_availability
+
+    _W_filename="${0##*/}"
+    _W_rollback_file="${0}.bak"
+    _W_update_file="${0}.update"
+
+    _W_tmpdir=${TMPDIR:-/tmp}
+    _W_tmpdir="`mktemp -d "$_W_tmpdir/$_W_filename.XXXXXXXX"`"
+
+    w_download_to $_W_tmpdir https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
+    w_try mv $_W_tmpdir/$_W_filename $_W_update_file.gz
+    w_try gunzip $_W_update_file.gz
+    w_try rmdir $_W_tmpdir
+
+    w_try cp $0 $_W_rollback_file
+    w_try chmod -x $_W_rollback_file
+
+    w_try mv $_W_update_file $0
+    w_try chmod +x $0
+
+    w_warn "Update finished! The current version is '`$0 -V`'. Use 'winetricks --update-rollback' to return to the previous version."
+
+    exit;
+}
+
+winetricks_selfupdate_rollback()
+{
+    winetricks_check_update_availability
+
+    _W_rollback_file="${0}.bak"
+
+    if test -f $_W_rollback_file
+    then
+        w_try mv $_W_rollback_file $0
+        w_try chmod +x $0
+        w_warn "Rollback finished! The current version is '`$0 -V`'."
+    else
+        w_warn "Nothing to rollback."
+    fi
+    exit;
+}
+
 # Download a file
 # Usage: w_download_to packagename url [sha1sum [filename [cookie jar]]]
 # Caches downloads in winetrickscache/$packagename
@@ -709,7 +771,7 @@ w_download_to()
         *) torify= ;;
         esac
 
-        if [ -x "$(which aria2c 2>/dev/null)" ] && [ ! "$WINETRICKS_OPT_TORIFY" ]
+        if [ -x "$(which aria2c 2>/dev/null)" ]
         then
             # (Slightly fancy) aria2c support
             # See https://github.com/Winetricks/winetricks/issues/612
@@ -720,9 +782,14 @@ w_download_to()
             # --save-session='' if the user has specified save-session in their config, their session will be
             #   ovewritten by the new aria2 process
             # http-accept-gzip=true (still needed) ?
-            # Note: torify is broken with aria2c, see https://github.com/tatsuhiro-t/aria2/issues/153
+
-            aria2c --continue --daemon=false --dir "$_W_cache"  --enable-rpc=false --input-file='' \
+            # torify needs --async-dns=false, see https://github.com/tatsuhiro-t/aria2/issues/613
-                --max-connection-per-server=5 --out "$_W_file" --save-session='' --stream-piece-selector=geom "$_W_url"
+            case $WINETRICKS_OPT_TORIFY in
+            1) torify aria2c --async-dns=false --continue --daemon=false --dir "$_W_cache"  --enable-rpc=false --input-file='' \
+                --max-connection-per-server=5 --out "$_W_file" --save-session='' --stream-piece-selector=geom "$_W_url" ;;
+            *) aria2c --continue --daemon=false --dir "$_W_cache"  --enable-rpc=false --input-file='' \
+                --max-connection-per-server=5 --out "$_W_file" --save-session='' --stream-piece-selector=geom "$_W_url" ;;
+            esac
         elif [ -x "`which wget 2>/dev/null`" ]
         then
            # Use -nd to insulate ourselves from people who set -x in WGETRC
@@ -4294,6 +4361,8 @@ Options:
     --force           Don't check whether packages were already installed
     --gui             Show gui diagnostics even when driven by commandline
     --isolate         Install each app or game in its own bottle (WINEPREFIX)
+    --self-update     Update this application to the last version
+    --update-rollback Rollback the last self update
 -k, --keep_isos       Cache isos (allows later installation without disc)
     --no-clean        Don't delete temp directories (useful during debugging)
 -q, --unattended      Don't ask any questions, just install automatically
@@ -4335,6 +4404,8 @@ winetricks_handle_option()
     -V|--version) winetricks_print_version ; exit 0;;
     --verify) WINETRICKS_VERIFY=1 ;;
     -h|--help) winetricks_usage ; exit 0 ;;
+    --self-update) winetricks_selfupdate;;
+    --update-rollback) winetricks_selfupdate_rollback;;
     --isolate) WINETRICKS_OPT_SHAREDPREFIX=0 ;;
     --no-isolate) WINETRICKS_OPT_SHAREDPREFIX=1 ;;
     --no-clean) W_OPT_NOCLEAN=1 ;;