Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at Mon Jun 14 00:36:40 CEST 2010. -------- --- wine/wine.changes 2010-05-28 21:07:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/wine/wine.changes 2010-06-12 00:16:06.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 11 23:04:47 CEST 2010 - meissner@suse.de + +- updated to 1.2 rc3 + - Many translation updates. + - A lot of bug fixes. +- updated winetricks + - utorrent downloader + - some bugfixes +- updated wisotool + - lots of improvements + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wine-1.1.45_1.2rc2.tar.bz2 New: ---- wine-1.1.46_1.2rc3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.m2oqBx/_old 2010-06-14 00:36:21.000000000 +0200 +++ /var/tmp/diff_new_pack.m2oqBx/_new 2010-06-14 00:36:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 1.1.45_1.2rc2) +# spec file for package wine (Version 1.1.46_1.2rc3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.1.45_1.2rc2 +Version: 1.1.46_1.2rc3 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com ++++++ wine-1.1.45_1.2rc2.tar.bz2 -> wine-1.1.46_1.2rc3.tar.bz2 ++++++ wine/wine-1.1.45_1.2rc2.tar.bz2 /mounts/work_src_done/STABLE/wine/wine-1.1.46_1.2rc3.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.m2oqBx/_old 2010-06-14 00:36:21.000000000 +0200 +++ /var/tmp/diff_new_pack.m2oqBx/_new 2010-06-14 00:36:21.000000000 +0200 @@ -20,7 +20,7 @@ #---- Constants ------------------------------------------------- # Name of this version of winetricks (YYYYMMDD) -VERSION=20100424 +VERSION=20100526 early_wine() { @@ -265,6 +265,7 @@ echo " tahoma MS Tahoma font (not part of corefonts)" echo " urlmon MS urlmon.dll" echo " usp10 MS usp10.dll (Uniscribe)" + echo " utorrent uTorrent" echo " vb2run MS Visual Basic 2 runtime" echo " vb3run MS Visual Basic 3 runtime" echo " vb4run MS Visual Basic 4 runtime" @@ -293,12 +294,15 @@ echo " xact MS XACT Engine (x3daudio?_?.dll, xactengine?_?.dll)" echo " xvid xvid video codec" echo "Pseudopackages:" + echo " alldlls=builtin Force use of builtin dlls (even if loaded with absolute path) (except for msvcp80 and d3dx9_*)" + echo " alldlls=default Remove all DLL overrides" echo " allfonts All listed fonts (corefonts, tahoma, liberation)" echo " allcodecs All listed codecs (xvid, ffdshow)" echo " ddr=gdi Set DirectDrawRenderer to GDI (default)" echo " ddr=opengl Set DirectDrawRenderer to OpenGL" echo " dsoundbug9612 Use DirectSound MaxShadowSize=0 workaround for bug #9612" echo " fakeie6 Set registry to claim IE6sp1 is installed" + echo " forcemono Force using mono instead of .Net (for debugging)" echo " glsl-disable Disable GLSL use by Wine Direct3D" echo " glsl-enable Enable GLSL use by Wine Direct3D (default)" echo " heapcheck Enable heap checking" @@ -598,6 +602,12 @@ try_regedit "$WINETRICKS_TMP_WIN"\\set-orm.reg } +set_mmdevapi() { + echo "Setting mmdevapi to $1" + + override_dlls $1 mmdevapi +} + set_rtlm() { echo "Setting RenderTargetLockMode to $1" cat > "$WINETRICKS_TMP"/set-rtlm.reg <<_EOF_ @@ -757,6 +767,9 @@ # Unfortunately, when you run with a different version of wine, wine will recreate this key. # See http://bugs.winehq.org/show_bug.cgi?id=22450 $WINE regedit /d 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\Namespace\{9D20AAE8-0625-44B0-9CA7-71889C2254D9}' + + # Disable recreation of the above key - or any updating of the regisry - when running with new version of wine. + echo disable > "$WINEPREFIX/.update-timestamp" } unset_winver() { @@ -773,6 +786,10 @@ override_dlls() { mode=$1 + if [ $mode = "disabled" ] + then + mode="" + fi shift echo Using $mode override for following DLLs: $@ cat > "$WINETRICKS_TMP"/override-dll.reg <<_EOF_ @@ -787,14 +804,62 @@ rm -rf "$WINDIR"/winsxs/manifests/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest ;; esac - echo "\"$1\"=\"$mode\"" >> "$WINETRICKS_TMP"/override-dll.reg + + # Note: if you want to override even DLLs loaded with an absolute path, + # you need to add an asterisk: + echo "\"*$1\"=\"$mode\"" >> "$WINETRICKS_TMP"/override-dll.reg + #echo "\"$1\"=\"$mode\"" >> "$WINETRICKS_TMP"/override-dll.reg + shift done try_regedit "$WINETRICKS_TMP_WIN"\\override-dll.reg + cat "$WINETRICKS_TMP"/override-dll.reg rm "$WINETRICKS_TMP"/override-dll.reg } +override_no_dlls() { + $WINE regedit /d 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' +} + +override_all_dlls() { + # Disable all but the commonly used DLLs Wine doesn't have a credible alternative for + # i.e. Don't disallow msvcp80 or d3dx9_* for now + # d3dx9_24.dll d3dx9_25.dll d3dx9_26.dll d3dx9_27.dll d3dx9_28.dll d3dx9_29.dll d3dx9_30.dll d3dx9_31.dll d3dx9_32.dll d3dx9_33.dll d3dx9_34.dll d3dx9_35.dll d3dx9_36.dll d3dx9_37.dll d3dx9_38.dll d3dx9_39.dll d3dx9_40.dll d3dx9_41.dll d3dx9_42.dll d3dxof.dll + override_dlls builtin \ + acledit aclui activeds actxprxy advapi32 advpack amstream atl authz avicap32 \ + avifil32 avifilebavrt bcrypt browseui cabinet capi2032 cards cfgmgr32 clusapi \ + comcat comctl32 comdlg32 commdlg compobj compstui credui crtdll crypt32 cryptdlg \ + cryptdll cryptnet cryptui ctapi32 ctl3d ctl3d32 ctl3dv2 d3d10 \ + d3d10core d3d8 d3d9 d3dim d3drm \ + d3dxof dbghelp dciman32 ddeml ddraw ddrawex \ + devenum dinput dinput8 dispdib dispex dmband dmcompos dmime dmloader dmscript \ + dmstyle dmsynth dmusic dmusic32 dnsapi dplay dplayx dpnaddr dpnet dpnhpast \ + dpnlobby dpwsockx drmclien dsound dssenh dswave dwmapi dxdiagn dxgi faultrep \ + fltlib fusion fwpuclnt gdi32 gdiplus glu32 gpkcsp hal hid hlink \ + hnetcfg httpapi iccvid icmp imagehlp imm imm32 inetcomm inetmib1 infosoft \ + initpki inkobj inseng iphlpapi itircl itss jscript kernel32 loadperf localspl \ + localui lz32 lzexpand mapi32 mapistub mciavi32 mcicda mciqtz32 mciseq mciwave \ + midimap mlang mmdevapi mmsystem mpr mprapi msacm msacm32 mscat32 mscms \ + mscoree msctf msdaps msdmo msftedit mshtml msi msimg32 msimtf msisip \ + msnet32 msrle32 mssign32 mssip32 mstask msvcirt msvcr70 msvcr71 msvcr80 \ + msvcr90 msvcrt msvcrt20 msvcrt40 msvcrtd msvfw32 msvidc32 msvideo mswsock msxml3 \ + msxml4 nddeapi netapi32 newdev ntdll ntdsapi ntprint objsel odbc32 odbccp32 \ + ole2 ole2conv ole2disp ole2nls ole2prox ole2thk ole32 oleacc oleaut32 olecli \ + olecli32 oledb32 oledlg olepro32 olesvr olesvr32 olethk32 openal32 opengl32 pdh \ + pidgen powrprof printui propsys psapi pstorec qcap qedit qmgr qmgrprxy \ + quartz query rasapi16 rasapi32 rasdlg resutils riched20 riched32 rpcrt4 rsabase \ + rsaenh rtutils sccbase schannel secur32 security sensapi serialui setupapi setupx \ + sfc sfc_os shdoclc shdocvw shell shell32 shfolder shlwapi slbcsp slc \ + snmpapi softpub spoolss sti storage stress svrapi sxs t2embed tapi32 \ + toolhelp traffic twain twain_32 typelib unicows updspapi url urlmon user32 \ + userenv usp10 uxtheme vdmdbg ver version w32skrnl w32sys wbemprox wiaservc \ + win32s16 win87em winaspi windebug windowscodecs wined3d winedos winemapi wing wing32 \ + winhttp wininet winmm winnls winnls32 winscard winsock wintab wintab32 wintrust \ + wldap32 wmi wmiutils wnaspi32 wow32 ws2_32 wsock32 wtsapi32 wuapi wuaueng \ + xinput1_1 xinput1_2 xinput1_3 xinput9_1_0 xmllite +} + override_app_dlls() { app=$1 shift @@ -1667,6 +1732,13 @@ } #---------------------------------------------------------------- +load_forcemono() { +# For wine/mono debugging +override_dlls native mscoree.dll +override_dlls disabled mscorsvw.exe +} + +#---------------------------------------------------------------- load_fs_disable() { cat > "$WINETRICKS_TMP"/fs_disable.reg <<_EOF_ REGEDIT4 @@ -2326,8 +2398,8 @@ load_mono26() { # Load Mono, have it handle all .net requests - download . http://ftp.novell.com/pub/mono/archive/2.6.3/windows-installer/4/mono-2.6.3-... ed1e20181e3a0c0ca666d08604797495309ff587 - try $WINE "$WINETRICKS_CACHE"/mono-2.6.3-gtksharp-2.12.10-win32-4.exe $WINETRICKS_SILENT + download . http://ftp.novell.com/pub/mono/archive/2.6.4/windows-installer/3/mono-2.6.4-... 08be379d1fe34c9ae1d389e60647506950cb07ba + try $WINE "$WINETRICKS_CACHE"/mono-2.6.4-gtksharp-2.12.10-win32-3.exe $WINETRICKS_SILENT # FIXME: what should this be for mono 2.6? cat > "$WINETRICKS_TMP"/mono_2.0.reg <<_EOF_ @@ -2522,8 +2594,8 @@ cd "$olddir" unset_winver - override_dlls native,builtin COMPOBJ.DLL OLE2CONV.DLL OLE2DISP.DLL OLE2.DLL - override_dlls native,builtin OLE2NLS.DLL OLE2PROX.DLL STORAGE.DLL TYPELIB.DLL + override_dlls native,builtin COMPOBJ OLE2CONV OLE2DISP OLE2 + override_dlls native,builtin OLE2NLS OLE2PROX STORAGE TYPELIB } #---------------------------------------------------------------- @@ -2796,22 +2868,18 @@ # 2009-07-31 sha1sum: 0bb506ef67a268e8d3fb6c7ce556320ee10b9da5 # 2009-12-13 sha1sum: d35649883bf13cb1a86f5650e1050d15533ac0f4 # 2010-01-23 sha1sum: 4a837d238c28c5f345d73f105711f20c6d059273 - - download . http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/lates... 4a837d238c28c5f345d73f105711f20c6d059273 + # 2010-05-15 sha1sum: bdce02afc82233801e84137e78c2c5fe574db253 + + download . http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/lates... bdce02afc82233801e84137e78c2c5fe574db253 try $WINE msiexec /i "$WINETRICKS_CACHE"/sw_lic_full_installer.msi $WINETRICKS_QUIET } #---------------------------------------------------------------- load_steam() { - load_flash - load_fontfix - load_gecko - load_ie6 - load_liberation - load_tahoma download . http://storefront.steampowered.com/download/SteamInstall.msi a0ca8791b7b2e96665ee059e03eebbfb3d95be55 try $WINE msiexec /i "$WINETRICKS_CACHE"/SteamInstall.msi $WINETRICKS_QUIET + warn "Before running Steam, make sure you have corefonts installed, or it may crash; see wine bug 22751" warn "Once Steam is running, disable player notifications and in-game chat in Settings, or games will crash on launch; see wine bug 22053" } @@ -2850,6 +2918,16 @@ #---------------------------------------------------------------- +load_utorrent() { + # Torrent client supported on Windows,Mac OSX, Linux through WINE + download . http://download.utorrent.com/2.0.2/utorrent.exe dfec781877aa86afa941d512c3fc9e95c2b2bdea + + try cp -f "$WINETRICKS_CACHE"/utorrent.exe "$WINDIR"/utorrent.exe + warn "utorrent is now installed to $WINDIR/utorrent.exe" +} + +#---------------------------------------------------------------- + load_vb2run() { # Not referenced on MS web anymore. But the old Microsoft Software Library FTP still has it. # See ftp://ftp.microsoft.com/Softlib/index.txt @@ -3598,9 +3676,10 @@ download . http://download.microsoft.com/download/4/4/d/44de8a9e-630d-4c10-9f17-b9b34d3... b15c6a834b7029e2dfed22127cf905b06857e6f5 try_cabextract -d "$WINDIR"/system32 "$WINETRICKS_CACHE"/scripten.exe - + # Wine doesn't provide the other dll's (yet?) override_dlls native,builtin jscript.dll + try $WINE regsvr32 dispex.dll jscript.dll scrobj.dll scrrun.dll vbscript.dll wshcon.dll wshext.dll } #---------------------------------------------------------------- @@ -3698,7 +3777,7 @@ # Prevent running with wrong user id. # It's bad to create files as the wrong user! die_if_user_not_dirowner "$WINEPREFIX" - die_if_user_not_dirowner "$WINETRICKS_CACHE" + #die_if_user_not_dirowner "$WINETRICKS_CACHE" if [ ! -x "`which "$WINE" 2>/dev/null`" ] then @@ -3866,6 +3945,7 @@ tahoma) load_tahoma;; urlmon) load_urlmon;; usp10) load_usp10;; + utorrent) load_utorrent;; vbrun200|vb2run) load_vb2run;; vbrun300|vb3run) load_vb3run;; vbrun400|vb4run) load_vb4run;; @@ -3901,11 +3981,17 @@ allcodecs|allvcodecs) load_vcrun6; load_ffdshow; load_xvid;; allfonts) load_corefonts; load_tahoma; load_liberation; load_droid; load_wenquanyi;; + alldlls=builtin) override_all_dlls;; + alldlls=default) override_no_dlls;; ddr=gdi) set_ddr gdi;; ddr=opengl) set_ddr opengl;; dsoundbug9612) load_dsoundbug9612;; fakeie6) set_fakeie6;; + forcemono|force_mono) load_forcemono;; heapcheck) set_heapcheck;; + mmdevapi=builtin) set_mmdevapi builtin ;; + mmdevapi=native) set_mmdevapi native ;; + mmdevapi=disabled) set_mmdevapi disabled ;; multisampling=enabled|multisampling=on) set_multisampling enabled;; multisampling=disabled|multisampling=off) set_multisampling disabled;; native_mdac) set_native_mdac;; ++++++ wisotool ++++++ ++++ 2415 lines (skipped) ++++ between wine/wisotool ++++ and /mounts/work_src_done/STABLE/wine/wisotool ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org