Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2016-10-06 12:45:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2016-09-17 14:40:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2016-10-06 12:45:04.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Oct 3 16:57:24 UTC 2016 - [email protected] + +- Updated to 1.9.20 development snapshot + - Reimplementation of the clipboard API. + - Message handling in WebServices. + - Many more API Set libraries. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- Old: ---- wine-1.9.19.tar.bz2 wine-1.9.19.tar.bz2.sign New: ---- wine-1.9.20.tar.bz2 wine-1.9.20.tar.bz2.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.L08Dlv/_old 2016-10-06 12:45:09.000000000 +0200 +++ /var/tmp/diff_new_pack.L08Dlv/_new 2016-10-06 12:45:09.000000000 +0200 @@ -53,8 +53,8 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -%define realver 1.9.19 -Version: 1.9.19 +%define realver 1.9.20 +Version: 1.9.20 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ ++++++ wine-1.9.19.tar.bz2 -> wine-1.9.20.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wine/wine-1.9.19.tar.bz2 /work/SRC/openSUSE:Factory/.wine.new/wine-1.9.20.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.L08Dlv/_old 2016-10-06 12:45:09.000000000 +0200 +++ /var/tmp/diff_new_pack.L08Dlv/_new 2016-10-06 12:45:09.000000000 +0200 @@ -124,6 +124,7 @@ # # Private things internal to this script, not for use by verbs: # - Local variables have lowercase names starting with uppercase _W_ +# (and should not use the local declaration, as it is not POSIX) # - Global variables have uppercase names starting with WINETRICKS_ # - Functions have lowercase names starting with winetricks_ # FIXME: A few verbs still use winetricks-private functions or variables. @@ -519,15 +520,15 @@ # get sha1sum string and set $_W_gotsum to it w_get_sha1sum() { - local _W_file="$1" + _W_sha1_file="$1" # See https://github.com/Winetricks/winetricks/issues/645 # User is running winetricks from /dev/stdin - if [ -f "$_W_file" ] || [ -h "$_W_file" ] + if [ -f "$_W_sha1_file" ] || [ -h "$_W_sha1_file" ] then - _W_gotsum=$($WINETRICKS_SHA1SUM < "$_W_file" | sed 's/(stdin)= //;s/ .*//') + _W_gotsum=$($WINETRICKS_SHA1SUM < "$_W_sha1_file" | sed 's/(stdin)= //;s/ .*//') else - w_warn "$_W_file is not a regular file, not checking sha1sum" + w_warn "$_W_sha1_file is not a regular file, not checking sha1sum" return fi } @@ -609,6 +610,7 @@ dotnet40) version="4 Client" ;; dotnet45) version="4.5" ;; dotnet452) version="4.5.2" ;; + dotnet46) version="4.6" ;; *) echo error ; exit 1 ;; esac w_call dotnet_verifier @@ -2388,7 +2390,7 @@ fi # If the user specified --verify, also run GUI tests: - if test "$WINETRICKS_VERIFY" = 1 && type verify_$cmd 2> /dev/null + if test "$WINETRICKS_VERIFY" = 1 && command -v verify_$cmd > /dev/null 2>&1 then w_try verify_$cmd fi @@ -5916,12 +5918,14 @@ w_call remove_mono w_call dotnet20 + $WINESERVER -w # 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 fi + $WINESERVER -w cd "$W_CACHE/$W_PACKAGE" w_ahk_do " @@ -6349,6 +6353,58 @@ w_dotnet_verify dotnet452 } +#---------------------------------------------------------------- + +w_metadata dotnet46 dlls \ + title="MS .NET 4.6" \ + publisher="Microsoft" \ + year="2015" \ + media="download" \ + file1="NDP46-KB3045557-x86-x64-AllOS-ENU.exe" \ + conflicts="dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2 dotnet35sp1 dotnet40 vjrun20" \ + installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/SetupCache/v4.6.00081/1041/SetupResources.dll" + +load_dotnet46() +{ + if [ $W_ARCH = win64 ] + then + w_warn "This package may not work on a 64-bit installation" + fi + + # https://support.microsoft.com/en-us/kb/3045560 + w_download https://download.microsoft.com/download/C/3/A/C3A5200B-D33C-47E9-9D70-2F7C65DAAD94/NDP46-KB3045557-x86-x64-AllOS-ENU.exe 3049a85843eaf65e89e2336d5fe6e85e416797be + + w_call remove_mono + + # Remove Mono registry entry: + "$WINE" reg delete "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" /f + + w_try rm -f "$W_WINDIR_UNIX/system32/mscoree.dll" + + w_call dotnet45 + w_set_winver win7 + + cd "$W_CACHE/$W_PACKAGE" + + if w_workaround_wine_bug 38959 ; then + echo "This installer will fail unless run in quiet mode." + echo "See: https://bugs.winehq.org/show_bug.cgi?id=38959"; + + WINEDLLOVERRIDES=fusion=b "$WINE" ${file1} /q /c:"install.exe /q" + # Once bug is fixed, use: + #WINEDLLOVERRIDES=fusion=b "$WINE" ${file1} ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"} + status=$? + fi + + case $status in + 0) ;; + 105) echo "exit status $status - normal, user selected 'restart now'" ;; + 194) echo "exit status $status - normal, user selected 'restart later'" ;; + *) w_die "exit status $status - $W_PACKAGE installation failed" ;; + esac + + w_override_dlls native mscoree +} #---------------------------------------------------------------- @@ -6363,15 +6419,19 @@ load_dotnet_verifier() { # http://blogs.msdn.com/b/astebner/archive/2008/10/13/8999004.aspx - # 2013/03/28: sha1sum 0eba832a0733cd47b7639463dd5a22a41e95ee6e + # 2013/03/28: sha1sum 0eba832a0733cd47b7639463dd5a22a41e95ee6e # netfx_5F00_setupverifier_5F00_new.zip # 2014/01/23: sha1sum 8818f3460826145e2a66bb91727afa7cd531037b # 2014/11/22: sha1sum 47de0b849c4c3d354df23588c709108e7816d788 # 2015/07/31: sha1sum 32f24526a5716737281dc260451b60a641b23c7e # 2015/12/27: sha1sum b9712da2943e057668f21f68c473657a205c5cb8 - w_download http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-99-90-04/netfx_5F00_setupverifier_5F00_new.zip b9712da2943e057668f21f68c473657a205c5cb8 + # 2016/09/22: name change, to netfx_setupverifier_new_2015_12_18.zip + + w_download https://msdnshared.blob.core.windows.net/media/MSDNBlogsFS/prod.evol.blogs.msdn.com/CommunityServer.Components.PostAttachments/00/08/99/90/04/netfx_setupverifier_new_2015_12_18.zip b9712da2943e057668f21f68c473657a205c5cb8 ${file1} cd "$W_CACHE/$W_PACKAGE" w_try_unzip "$W_SYSTEM32_DLLS" netfx_5F00_setupverifier_5F00_new.zip netfx_setupverifier.exe + + w_warn "You can run the .Net Verifier with \"${WINE} netfx_setupverifier.exe\"" } #---------------------------------------------------------------- @@ -7179,7 +7239,12 @@ # Found using http://www.filewatcher.com/m/mpfull.exe.3593680-0.html # The sha1sum is different. Perhaps Iceweasel was right. This one is also clean according to clamscan/virustotal.com - w_download ftp://www.define.fi/Pub/Fixes/Microsoft/Windows%2095/mpfull.exe 99691df6ac455233230faac7514bdea781ba0ce3 + # (2017/9/28) define.fi is down, these sites have mpfull.exe with the original sha1: + # http://hell.pl/agnus/windows95/ + # http://zerosky.oldos.org/win9x.html + # http://sdfox7.com/win95/ + + w_download http://hell.pl/agnus/windows95/mpfull.exe 44aef252a660612a01ee13271d84d2da3885e58d w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_CACHE/$W_PACKAGE/${file1}" w_try_regsvr msdxm.ocx @@ -8935,7 +9000,7 @@ load_xna40() { - if w_workaround_bug 30718 + if w_workaround_wine_bug 30718 then w_warn "$W_PACKAGE may not install properly in Wine yet" fi @@ -15538,38 +15603,6 @@ #---------------------------------------------------------------- -w_metadata mb_warband_demo games \ - title="Mount & Blade Warband Demo" \ - publisher="Taleworlds" \ - year="2010" \ - media="download" \ - file1="mb_warband_setup_1143.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Mount&Blade Warband/mb_warband.exe" \ - homepage="http://www.taleworlds.com"; - -load_mb_warband_demo() -{ - w_download "http://download.taleworlds.com/mb_warband_setup_1143.exe"; 94fb829068678e27bcd67d9e0fde7f08c51a23af - - cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - SetTitleMatchMode 2 - run mb_warband_setup_1143.exe - winwait Warband - if ( w_opt_unattended > 0 ) { - controlclick button2 - winwait Warband - controlclick button2 - winwait Warband, Finish - controlclick button4 - controlclick button2 - } - winwaitclose Warband - " -} - -#---------------------------------------------------------------- - w_metadata mise games \ title="Monkey Island: Special Edition" \ publisher="LucasArts" \ @@ -17506,9 +17539,9 @@ then # Get temporary download location w_download "http://www.worldofgoo.com/dl2.php?lk=demo&filename=WorldOfGooDemo.1.0.exe"; - URL=`cat "$W_CACHE/wog/dl2.php?lk=demo&filename=WorldOfGooDemo.1.0.exe" | - grep WorldOfGooDemo.1.0.exe | sed 's,.*http,http,;s,".*,,'` - rm "$W_CACHE/wog/dl2.php?lk=demo&filename=WorldOfGooDemo.1.0.exe" + URL=$(cat "$W_CACHE/wog/dl2.php?lk=demo&filename=WorldOfGooDemo.1.0.exe" | \ + grep WorldOfGooDemo.1.0.exe | sed 's,.*http,http,;s,".*,,') + w_try rm "$W_CACHE/wog/dl2.php?lk=demo&filename=WorldOfGooDemo.1.0.exe" w_download "$URL" e61d8253b9fe0663cb3c69018bb3d2ec6152d488 fi @@ -18207,10 +18240,10 @@ # See https://bugs.winehq.org/show_bug.cgi?id=38656 case $arg in enable) - local registry_value="\"Y\"" + _W_registry_value="\"Y\"" ;; disable) - local registry_value="-" + _W_registry_value="-" ;; *) w_die "Unexpected argument, $arg";; esac @@ -18219,7 +18252,7 @@ REGEDIT4 [HKEY_CURRENT_USER\Software\Wine] -"HideWineExports"=$registry_value +"HideWineExports"=$_W_registry_value _EOF_ w_try_regedit "$W_TMP"/set-wineexports.reg
