From c3da4828e714498f2315b6765b598c71a78ae310f787b41f7c61c92a4da974c5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 8 Jul 2017 09:48:18 +0000 Subject: [PATCH] - Update to 2.12 development snapshot - Audio driver for Android. - Some performance improvements with async I/O. - More RegEdit file parser improvements. - Beginnings for MSI user interface support. - Various bug fixes. - updated winetricks OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=428 --- wine-2.11.tar.xz | 3 -- wine-2.11.tar.xz.sign | 16 --------- wine-2.12.tar.xz | 3 ++ wine-2.12.tar.xz.sign | 16 +++++++++ wine.changes | 11 +++++++ wine.spec | 4 +-- winetricks | 76 +++++++++---------------------------------- 7 files changed, 48 insertions(+), 81 deletions(-) delete mode 100644 wine-2.11.tar.xz delete mode 100644 wine-2.11.tar.xz.sign create mode 100644 wine-2.12.tar.xz create mode 100644 wine-2.12.tar.xz.sign diff --git a/wine-2.11.tar.xz b/wine-2.11.tar.xz deleted file mode 100644 index 260435f..0000000 --- a/wine-2.11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efa96dade206aa21accf0da195335a805d38209d6a14320607c6308ebde4cc3c -size 19251116 diff --git a/wine-2.11.tar.xz.sign b/wine-2.11.tar.xz.sign deleted file mode 100644 index 39b1271..0000000 --- a/wine-2.11.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAllNWL8ACgkQzvrI6q8X -UZ3uKw//Q1V0e30uC8P4wZqGKOBteF2E+JawygfAncInfx4P8VgK4rIA6bgacWYP -bn73aziWAds3Nhzqx8VlnIBwWZ3c/e0Wv2vwUbSbwoZxxNfmGv4GyFYq/LxA6hUh -dbxcRoYa42Nr+IXDiz3Z9kVfchxaJIG1t31Q/yJ2lXw3AVN1PZWHHxGpsC1fdQV5 -ikELKKIU2R3S4mM5kAhsjeM9it7IxrAZIr1GBIvdsEIV39Auo6PQ3l/DP0ADEgd8 -8MEU3JIEH6tpFDd6/G2w4wjjGfXDo+KlhjzURrWY0MgOh99+L9C6IpD8gCpoPyIy -mQBuEVMqwZZLh1w9KoWbZ8Bbje4mMTE0zcoEBZ/WIrDMkCrRuiJSzOnQN2gNXn/J -xaI+aeHeQ2Ql1HfcSMZ5tvPAnjhruK4CL/1HTq5DESKZOm0X4GORNZxe2ApKairG -xSJQO+vRSGAQjOzD1UJDdtxToOov+NBFKD+UGAtqYNdmxymy6N6NT9t89LkEP664 -84eHpB4ri/rVAGVIojXlzEWWoR4+224oUL/7b+eeW4Q52oYCiqvNbj9hKlSOZJFS -68Y74te+HLNUZ90qiRuI3TPAJt26GDGr8w60PHIMCWc13XCKzpZysk9/89En7GC/ -OJv/pa3VBc7fJqJw52CWgyy3M+hR9c1INzkJKmZ3bs4M/cr4gZs= -=Wove ------END PGP SIGNATURE----- diff --git a/wine-2.12.tar.xz b/wine-2.12.tar.xz new file mode 100644 index 0000000..1880615 --- /dev/null +++ b/wine-2.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:496c11af841487e6ec4e1953ac19b05a7f48e397da502653ffbd9fe9004213a7 +size 19301968 diff --git a/wine-2.12.tar.xz.sign b/wine-2.12.tar.xz.sign new file mode 100644 index 0000000..01ebc12 --- /dev/null +++ b/wine-2.12.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAllf3D8ACgkQzvrI6q8X +UZ0mBRAAiowr7KQngAdfuIv4Ns+yw/xap8EsuC7+eyPREqPkwZT145YeSQTAmhKh +ExkuB8mVQko7hRivlbYEZ4tWENNO0Lu+s8/drS2X/IrrM8Ss7SJraDvUTHOPvfUW +0pjkCSZm02c8AAHIphWyGmCv2hjeandkQedELrkHRTUDXPDpNic1Ri+rBOs226Xd ++deMyIJd/AHH+n58wHj+TlSVvh0yLdHWZro2sW/dUD2XNuZXt0ibzfkow28XaiGX +T21c0FJTzJeo9+fPIpRt2hc6GWc68gQmwzhNqmPY5Fjdvl/euwVuGDR7DM621mO9 +Qsmx1k6tdMrskSZTwB4XJL56rsYxor0cYa4mn6utndsmJPFPzGX08Kh2THSEpsDP +al/WegsggY+/6US90hN94zU79KjS7mKSCeDgglXuHBywXHJSNIpIf3GP5/p1AFhd +mMst9H2L3umQIlazADQrxWl3BSduRByA6/VebwC0UxJyTcxlUmkrTH5t+92jnGzk +DUgOpLepxvi2enCIoryqM7mFHaUryaWp7pXnCR4mlw0LxrsU+Q+TIbm3qEJ27JiA +ZdvKzkXt2+ukFZ9qCvH3aHGasprZj0sC5HBHV7Jx+gH1r55eCthqKPtGf+vFiDgf +UsPhcIpeTRG+LhRR+DIrAs8FfHMG13TvQffJVYJblnpPl6TBOHc= +=KD2A +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index 196ab12..9fa3f5f 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jul 8 09:46:14 UTC 2017 - meissner@suse.com + +- Update to 2.12 development snapshot + - Audio driver for Android. + - Some performance improvements with async I/O. + - More RegEdit file parser improvements. + - Beginnings for MSI user interface support. + - Various bug fixes. +- updated winetricks + ------------------------------------------------------------------- Mon Jun 26 07:21:39 UTC 2017 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 8386b7a..3d45fe1 100644 --- a/wine.spec +++ b/wine.spec @@ -61,8 +61,8 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(libudev) -%define realver 2.11 -Version: 2.11 +%define realver 2.12 +Version: 2.12 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ diff --git a/winetricks b/winetricks index a38b7d7..0cac353 100644 --- a/winetricks +++ b/winetricks @@ -548,6 +548,14 @@ w_read_key() unset _W_keyfile _W_keymsg _W_nokeymsg } +w_verify_cabextract_available() +{ + # If verb_a requires verb_b, then verba will fail when the dependency for verb_b is installed + # This should be called by verb_a, to give a proper warning + + w_try_cabextract -q -v +} + # Convert a Windows path to a Unix path quickly. # $1 is an absolute Windows path starting with c:\ or C:/ # with no funny business, so we can use the simplest possible @@ -6809,8 +6817,7 @@ load_dotnet35() *) w_warn "dotnet35 does not yet fully work or install on wine. Caveat emptor." ;; esac - # This will fail later if cabextract isn't installed, so check/fail now: - w_try_cabextract -v >/dev/null + w_verify_cabextract_available # https://www.microsoft.com/en-us/download/details.aspx?id=21 w_download https://download.microsoft.com/download/6/0/f/60fc5854-3cb8-4892-b6db-bd4f42510f28/dotnetfx35.exe 3e3a4104bad9a0c270ed5cbe8abb986de9afaf0281a98998bdbdc8eaab85c3b6 @@ -6860,8 +6867,7 @@ load_dotnet35sp1() *) w_warn "dotnet35sp1 does not yet fully work or install on wine. Caveat emptor." ;; esac - # The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now: - w_try_cabextract -v >/dev/null + w_verify_cabextract_available # https://www.microsoft.com/en-us/download/details.aspx?id=25150 w_download https://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe 0582515bde321e072f8673e829e175ed2e7a53e803127c50253af76528e66bc1 @@ -6969,8 +6975,7 @@ load_dotnet45() { w_package_warn_win64 - # The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now: - w_try_cabextract -v >/dev/null + w_verify_cabextract_available # https://www.microsoft.com/en-us/download/details.aspx?id=17718 w_download https://download.microsoft.com/download/b/a/4/ba4a7e71-2906-4b2d-a0e1-80cf16844f5f/dotnetfx45_full_x86_x64.exe a04d40e217b97326d46117d961ec4eda455e087b90637cb33dd6cc4a2c228d83 @@ -7022,8 +7027,7 @@ load_dotnet452() { w_package_warn_win64 - # The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now: - w_try_cabextract -v >/dev/null + w_verify_cabextract_available # https://www.microsoft.com/en-us/download/details.aspx?id=17718 w_download https://download.microsoft.com/download/E/2/1/E21644B5-2DF2-47C2-91BD-63C560427900/NDP452-KB2901907-x86-x64-AllOS-ENU.exe 6c2c589132e830a185c5f40f82042bee3022e721a216680bd9b3995ba86f3781 @@ -8882,7 +8886,8 @@ w_metadata shockwave dlls \ load_shockwave() { # 2017/03/12: 39715a84b1d85347066fbf89a3af9f5e612b59402093b055cd423bd30a7f637d # 2017/03/15: 58f2152bf726d52f08fb41f904c62ff00fdf748c8ce413e8c8547da3a21922ba - w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 58f2152bf726d52f08fb41f904c62ff00fdf748c8ce413e8c8547da3a21922ba + # 2017/08/03: bebebaef1644a994179a2e491ce3f55599d768f7c6019729f21e7029b1845b9c + w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi bebebaef1644a994179a2e491ce3f55599d768f7c6019729f21e7029b1845b9c w_try_cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q @@ -9722,54 +9727,6 @@ _EOF_ #---------------------------------------------------------------- -w_metadata wsh56js dlls \ - title="MS Windows Script Host 5.6, JScript only, no CScript" \ - publisher="Microsoft" \ - year="2006" \ - media="download" \ - file1="Windows2000-KB917344-56-x86-enu.exe" \ - installed_file1="c:/windows/inf/jscren.inf" - -load_wsh56js() -{ - # This installs JScript 5.6 (but not VBScript) - # See also https://www.microsoft.com/en-us/download/details.aspx?id=12364 - w_download https://download.microsoft.com/download/b/c/3/bc3a0c36-fada-497d-a3de-8b0139766f3b/Windows2000-KB917344-56-x86-enu.exe d6d6c2ac2d2a095b0f0650a9a2e81e8943579699662b5cdbf872649038788c51 - - w_try_cd "$W_CACHE/$W_PACKAGE" - w_override_dlls native,builtin jscript - # setupapi looks at the versions in new and original jscript.dll, and Wine's original is newer than wsh56js's, so we have to nuke the original - w_try rm "$W_SYSTEM32_DLLS/jscript.dll" - w_try "$WINE" Windows2000-KB917344-56-x86-enu.exe $W_UNATTENDED_SLASH_Q -} - -#---------------------------------------------------------------- - -w_metadata wsh56vb dlls \ - title="MS Windows Script Host 5.6, VBScript only, no CScript" \ - publisher="Microsoft" \ - year="2007" \ - media="download" \ - file1="vbs56men.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/vbscript.dll" - -load_wsh56vb() -{ - # This installs VBScript 5.6 (but not JScript) - # See also https://www.microsoft.com/en-us/download/details.aspx?id=8495 - # Originally at: https://download.microsoft.com/download/IE60/Patch/Q318089/W9XNT4Me/EN-US/vbs56men.exe - # Mirror list: ftp://ftp.uni-rostock.de/pub/tools/microsoft/ServicePacks/IE/us/vbs56men.exe - w_download ftp://ftp.uni-rostock.de/pub/tools/microsoft/ServicePacks/IE/us/vbs56men.exe 792a36d629e01cb474a434761e8cd33211c19ff84f5aa52f0d41111e054ecaac - - w_try_cd "$W_CACHE/$W_PACKAGE" - w_override_dlls native,builtin vbscript - # setupapi looks at the versions in new and original vbscript.dll, and Wine's original is newer than wsh56vb's, so we have to nuke the original - w_try rm "$W_SYSTEM32_DLLS/vbscript.dll" - w_try "$WINE" vbs56men.exe $W_UNATTENDED_SLASH_Q -} - -#---------------------------------------------------------------- - w_metadata wsh57 dlls \ title="MS Windows Script Host 5.7" \ publisher="Microsoft" \ @@ -12225,8 +12182,7 @@ w_metadata vc2008express apps \ load_vc2008express() { - # The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now: - w_try_cabextract -v >/dev/null + w_verify_cabextract_available w_call dotnet35 @@ -19137,7 +19093,7 @@ execute_command() vbrun60) w_warn "Calling vbrun60 is deprecated, please use vb6run instead" ; w_call vb6run ;; vcrun2005sp1) w_warn "Calling vcrun2005sp1 is deprecated, please use vcrun2005 instead" ; w_call vcrun2005 ;; vcrun2008sp1) w_warn "Calling vcrun2008sp1 is deprecated, please use vcrun2008 instead" ; w_call vcrun2008 ;; - wsh56) w_warn "Calling wsh56 is deprecated, please use wsh57 instead" ; w_call wsh57 ;; + wsh56|wsh56jb|wsh56vb) w_warn "Calling wsh56 is deprecated, please use wsh57 instead" ; w_call wsh57 ;; # See https://github.com/Winetricks/winetricks/issues/747 xact_jun2010) w_warn "Calling xact_jun2010 is deprecated, please use xact instead" ; w_call xact ;; xlive) w_warn "Calling xlive is deprecated, please use gfw instead" ; w_call gfw ;;