Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2014-06-16 21:38:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-04-29 17:36:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2014-06-16 21:38:16.000000000 +0200 @@ -1,0 +2,35 @@ +Fri Jun 13 22:49:37 UTC 2014 - [email protected] + +- Updated to 1.7.20 development snapshot + - X11 drag & drop fixes. + - A few more C/C++ runtime functions. + - Fixes for various memory issues found by Valgrind. + - Some OLE storage fixes. + - Various bug fixes. +- winetricks updated + +------------------------------------------------------------------- +Mon May 19 11:54:30 UTC 2014 - [email protected] + +- Updated to 1.7.19 development snapshot + - New JSProxy DLL for automatic proxy configuration. + - More OLE Accessible Object support. + - Improvements to the XML writer. + - Fixes for various memory issues found by Valgrind. + - Initial headers for Direct2D support. + - Various bug fixes. +- winetricks updated + +------------------------------------------------------------------- +Fri May 2 18:39:29 UTC 2014 - [email protected] + +- Updated to 1.7.18 development snapshot + - Improved OLE Accessible Object support. + - Window sizing improvements in the Mac driver. + - Fixes for various memory issues found by Valgrind. + - A few more MSHTML functions. + - Some DirectDraw cleanups. + - Various bug fixes. +- winetricks updated + +------------------------------------------------------------------- Old: ---- README.SuSE wine-1.7.17.tar.bz2 wine-1.7.17.tar.bz2.sign New: ---- README.SUSE wine-1.7.20.tar.bz2 wine-1.7.20.tar.bz2.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.YwBuYE/_old 2014-06-16 21:38:17.000000000 +0200 +++ /var/tmp/diff_new_pack.YwBuYE/_new 2014-06-16 21:38:17.000000000 +0200 @@ -55,7 +55,7 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.7.17 +Version: 1.7.20 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ @@ -67,7 +67,7 @@ Source1: winetricks Source11: winetricks.1 Source2: http://kegel.com/wine/wisotool -Source3: README.SuSE +Source3: README.SUSE Source4: wine.desktop Source6: wine-msi.desktop Source5: ubuntuwine.tar.bz2 @@ -104,7 +104,7 @@ It is not necessary to have a Windows installation to run WINE. -Refer to %{_datadir}/doc/packages/wine/README.SuSE. There is more +Refer to %{_datadir}/doc/packages/wine/README.SUSE. There is more documentation available in that directory. Read 'man wine' for further information. ++++++ README.SUSE ++++++ Start wine: ----------- Check whether wine runs by entering (e.g.) 'wine notepad.exe' or 'wine progman'. General Notes: -------------- 1. All configuration data is in the registry, and can be accessed directly by editing system.reg or user.reg, "wine regedit.exe" or with the graphical configuration frontend "winecfg". 2. Drives are configured by symlinking in ~/.wine/dosdevices/, or by using "winecfg". 3. You have to set the WINEPREFIX variable to the wine base dir, if it is different than ~/.wine. There usually is no need for additionaly configuring wine. If no ~/.wine is present, Wine will setup a fake windows environment in ~/.wine by itself, including all necessary config file and registry settings using the "wine.inf" file. Windows DLLs not supported by Wine: -------------------------------------- A shell script called "winetricks" is included in this RPM which can be used to quickly install missing DLLs from public redistributable archives. winetricks help shows all installation possibilities winetricks gecko Installs the Mozilla Gecko rendering engine, which provides generic HTML rendering support to Wine. This engine is also in the wine-gecko RPM. winetricks mfc40 installs the MFC40.DLL winetricks mfc42 installs the MFC42.DLL (Applications might need it) Violation of existing windows: ------------------------------ Wine can corrupt MS Windows installation. It is not recommended to point Wine to an existing Windows installation. Also it should no longer be necessary to copy stuff from Windows installations. Error and warning messages: --------------------------- Wine is intensively developed but is not always complete. Therefore things might not work and wine might print error and warning messages. ++++++ wine-1.7.17.tar.bz2 -> wine-1.7.20.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wine/wine-1.7.17.tar.bz2 /work/SRC/openSUSE:Factory/.wine.new/wine-1.7.20.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.YwBuYE/_old 2014-06-16 21:38:17.000000000 +0200 +++ /var/tmp/diff_new_pack.YwBuYE/_new 2014-06-16 21:38:17.000000000 +0200 @@ -2,7 +2,7 @@ # Name of this version of winetricks (YYYYMMDD) # (This doesn't change often, use the sha1sum of the file when reporting problems) -WINETRICKS_VERSION=20140415 +WINETRICKS_VERSION=20140521 # This is a utf-8 file # You should see an o with two dots over it here [รถ] @@ -1873,6 +1873,11 @@ w_metadata() { + case $WINETRICKS_OPT_VERBOSE in + 2) set -x ;; + *) set +x ;; + esac + if test "$installed_exe1" || test "$installed_file1" || test "$publisher" || test "$year" then w_die "bug: stray metadata tags set: somebody forgot a backslash in a w_metadata somewhere. Run with sh -x to see where." @@ -1924,6 +1929,12 @@ ;; esac unset _W_md_cmd + + # Restore verbosity: + case $WINETRICKS_OPT_VERBOSE in + 1|2) set -x ;; + *) set +x ;; + esac } # Function for verbs to register their main executable [or, if name is given, @@ -3741,7 +3752,7 @@ w_die "WINE is $WINE, which is neither on the path nor an executable file" fi case "$WINETRICKS_OPT_VERBOSE" in - "1") echo -n "Wine is '$WINE'; Wine version is " + 1|2) echo -n "Wine is '$WINE'; Wine version is " "$WINE" --version || w_die "Can't get wine version" echo "winetricks is $0 ; winetricks version is $WINETRICKS_VERSION" ;; @@ -3861,7 +3872,8 @@ -r|--ddrescue) WINETRICKS_OPT_DD=ddrescue ;; -k|--keep_isos) WINETRICKS_OPT_KEEPISOS=1 ;; -q|--unattended) winetricks_set_unattended 1 ;; - -v|--verbose) WINETRICKS_OPT_VERBOSE=1; set -x ;; + -v|--verbose) WINETRICKS_OPT_VERBOSE=1 ; set -x;; + -vv|--really-verbose) WINETRICKS_OPT_VERBOSE=2 ; set -x ;; -V|--version) winetricks_print_version ; exit 0;; --verify) WINETRICKS_VERIFY=1 ;; -h|--help) winetricks_usage ; exit 0 ;; @@ -4810,21 +4822,15 @@ w_die "This package does not work on a 64-bit installation" fi - w_call fontfix - # http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589-4842-8157-034D1E7CF3A3 w_download http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe 16a354a2207c4c8846b617cbc78f7b7c1856340e - # Remove bits of Wine that conflict with native .net 11 - rm -rf "$W_WINDIR_UNIX/Microsoft.NET/Framework/v1.1.4322" - "$WINE" reg delete "HKLM\Software\Microsoft\.NETFramework\policy\v2.0" /f || true - "$WINE" reg delete "HKLM\Software\Microsoft\.NETFramework" /v InstallRoot /f || true - - # need corefonts, else installer crashes + w_call remove_mono w_call corefonts + w_call fontfix w_try cd "$W_CACHE/dotnet11" - # Use builtin regsvcs.exe to work around http://bugs.winehq.org/show_bug.cgi?id=25120 + # Use builtin regsvcs.exe to work around https://bugs.winehq.org/show_bug.cgi?id=25120 if test $W_OPT_UNATTENDED then WINEDLLOVERRIDES="regsvcs.exe=b" w_ahk_do " @@ -4869,9 +4875,11 @@ load_dotnet11sp1() { - w_call dotnet11 w_download http://download.microsoft.com/download/8/b/4/8b4addd8-e957-4dea-bdb8-c4e00af5b94b/NDP1.1sp1-KB867460-X86.exe 74a5b25d65a70b8ecd6a9c301a0aea10d8483a23 + w_call remove_mono + w_call dotnet11 + w_try cd "$W_CACHE/dotnet11sp1" # Use builtin regsvcs.exe to work around http://bugs.winehq.org/show_bug.cgi?id=25120 if test $W_OPT_UNATTENDED @@ -4941,6 +4949,9 @@ load_dotnet20() { + # http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5 + w_download http://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a + w_call remove_mono w_call fontfix @@ -4954,9 +4965,6 @@ "$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled' fi - # http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5 - w_download http://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a - cd "$W_CACHE"/dotnet20 if w_workaround_wine_bug 30845 "Using native fusion while installing..." 1.5.8, then @@ -4999,11 +5007,13 @@ load_dotnet20sdk() { - w_call dotnet20 - # http://www.microsoft.com/en-us/download/details.aspx?id=19988 w_download http://download.microsoft.com/download/c/4/b/c4b15d7d-6f37-4d5a-b9c6-8f07e7d46635/setup.exe 4e4b1072b5e65e855358e2028403f2dc52a62ab4 + w_call remove_mono + + w_call dotnet20 + cd "$W_CACHE"/dotnet20sdk w_ahk_do " SetTitleMatchMode, 2 @@ -5066,10 +5076,10 @@ load_dotnet20sp1() { - if w_workaround_wine_bug 16956 "wine version too old" 1.3.22, - then - w_die "wine-1.3.22 or later required to install dotnet20sp1 properly" - fi + # FIXME: URL? + w_download http://download.microsoft.com/download/0/8/c/08c19fa4-4c4f-4ffb-9d6c-150906578c9e/NetFx20SP1_x86.exe eef5a36924cdf0c02598ccf96aa4f60887a49840 + + w_call remove_mono w_call dotnet20 @@ -5084,10 +5094,10 @@ WINEDLLOVERRIDES=ngen.exe,regsvcs.exe,mscorsvw.exe=b export WINEDLLOVERRIDES + # FIXME: still needed? # Workaround Wine/Mono integration: "$WINE" reg add "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v2.0.50727" /v Version /t REG_SZ /d "2.0.50727" /f - w_download http://download.microsoft.com/download/0/8/c/08c19fa4-4c4f-4ffb-9d6c-150906578c9e/NetFx20SP1_x86.exe eef5a36924cdf0c02598ccf96aa4f60887a49840 cd "$W_CACHE"/dotnet20sp1 "$WINE" NetFx20SP1_x86.exe ${W_OPT_UNATTENDED:+/q} status=$? @@ -5124,10 +5134,15 @@ media="download" \ conflicts="dotnet11" \ file1="NetFx20SP2_x86.exe" \ - installed_file1="c:/windows/assembly/NativeImages_v2.0.50727_32/mscorlib/fbb56b651d41914fad1c998a3602fb7b/mscorlib.ni.dll" + installed_file1="c:/windows/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.3053_x-ww_b80fa8ca.cat" load_dotnet20sp2() { + # http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B-4EB5-9B1D-10E506DA9D0F + w_download http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe 22d776d4d204863105a5db99e8b8888be23c61a7 + + w_call remove_mono + w_call dotnet20 WINEDLLOVERRIDES= @@ -5151,8 +5166,6 @@ "$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled' fi - # http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B-4EB5-9B1D-10E506DA9D0F - w_download http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe 22d776d4d204863105a5db99e8b8888be23c61a7 cd "$W_CACHE"/dotnet20sp2 w_ahk_do " SetTitleMatchMode, 2 @@ -5204,6 +5217,11 @@ load_dotnet30() { + # http://msdn.microsoft.com/en-us/netframework/bb264589.aspx + w_download_manual http://www.oldversion.com/download-.Net-Framework-3.0.html netframework3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039 + + w_call remove_mono + if test -f /proc/sys/kernel/yama/ptrace_scope then case `cat /proc/sys/kernel/yama/ptrace_scope` in @@ -5221,18 +5239,9 @@ ;; esac - # dotnet20 does this: - # w_call remove_mono w_call dotnet20 - # Delete files and registry keys related to .net 3.x - # Breaks .net 3.5 installation, so don't do this yet - #rm -rf "$W_WINDIR_UNIX"/Microsoft.NET/Framework/v3.0 - #$WINE reg delete "HKLM\\Software\Microsoft\NET Framework Setup\NDP\v3.0" - w_warn "Installing .net 3.0 runtime takes 3 minutes on a very fast machine, and the Finished dialog may hide in the taskbar." - # http://msdn.microsoft.com/en-us/netframework/bb264589.aspx - w_download_manual http://www.oldversion.com/download-.Net-Framework-3.0.html netframework3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039 # AF's workaround to avoid long pause LANGPACKS_BASE_PATH="${W_WINDIR_UNIX}/SYSMSICache/Framework/v3.0" @@ -5282,26 +5291,22 @@ load_dotnet30sp1() { - case "$OS" in - "Windows_NT") ;; - *) w_warn "dotnet30sp1 does not yet fully work or install on wine. Caveat emptor." ;; - esac + # FIXME: URL? + w_download http://download.microsoft.com/download/8/F/E/8FEEE89D-9E4F-4BA3-993E-0FFEA8E21E1B/NetFx30SP1_x86.exe 8d779e337920b097aa0c01859912950606e9fc12 + # Recipe from http://bugs.winehq.org/show_bug.cgi?id=25060#c10 + w_download http://download.microsoft.com/download/2/5/2/2526f55d-32bc-410f-be18-164ba67ae07d/XPSEP%20XP%20and%20Server%202003%2032%20bit.msi 5d332ebd1025e294adafe72030fe33db707b2c82 "XPSEP XP and Server 2003 32 bit.msi" - # dotnet20 does this, which is called by dotnet30: - # w_call remove_mono + w_call remove_mono w_call dotnet30 $WINESERVER -w w_call dotnet20sp1 $WINESERVER -w - w_download http://download.microsoft.com/download/8/F/E/8FEEE89D-9E4F-4BA3-993E-0FFEA8E21E1B/NetFx30SP1_x86.exe 8d779e337920b097aa0c01859912950606e9fc12 cd "$W_CACHE/$W_PACKAGE" "$WINE" reg add "HKLM\\Software\\Microsoft\\Net Framework Setup\\NDP\\v3.0" /v Version /t REG_SZ /d "3.0" /f "$WINE" reg add "HKLM\\Software\\Microsoft-\\Net Framework Setup\\NDP\\v3.0" /v SP /t REG_DWORD /d 0001 /f - # Recipe from http://bugs.winehq.org/show_bug.cgi?id=25060#c10 - w_download http://download.microsoft.com/download/2/5/2/2526f55d-32bc-410f-be18-164ba67ae07d/XPSEP%20XP%20and%20Server%202003%2032%20bit.msi 5d332ebd1025e294adafe72030fe33db707b2c82 "XPSEP XP and Server 2003 32 bit.msi" w_try "$WINE" msiexec /i "XPSEP XP and Server 2003 32 bit.msi" ${W_OPT_UNATTENDED:+/qb} "$WINE" sc delete FontCache3.0.0.0 @@ -5333,6 +5338,11 @@ *) w_warn "dotnet35 does not yet fully work or install on wine. Caveat emptor." ;; esac + # http://www.microsoft.com/downloads/details.aspx?FamilyId=333325FD-AE52-4E35-B531-508D977D32A6 + w_download http://download.microsoft.com/download/6/0/f/60fc5854-3cb8-4892-b6db-bd4f42510f28/dotnetfx35.exe 0a271bb44531aadef902829f98dfad66e4a57586 + + w_call remove_mono + w_call dotnet30sp1 $WINESERVER -w @@ -5341,9 +5351,6 @@ w_call msxml3 fi - # http://www.microsoft.com/downloads/details.aspx?FamilyId=333325FD-AE52-4E35-B531-508D977D32A6 - w_download http://download.microsoft.com/download/6/0/f/60fc5854-3cb8-4892-b6db-bd4f42510f28/dotnetfx35.exe 0a271bb44531aadef902829f98dfad66e4a57586 - "$WINE" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5" # See also http://blogs.msdn.com/astebner/archive/2008/07/17/8745415.aspx @@ -5376,14 +5383,16 @@ *) w_warn "dotnet35sp1 does not yet fully work or install on wine. Caveat emptor." ;; esac + # http://www.microsoft.com/download/en/details.aspx?id=25150 + w_download http://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe 3dce66bae0dd71284ac7a971baed07030a186918 + + w_call remove_mono + w_call dotnet35 $WINESERVER -w w_call dotnet20sp2 $WINESERVER -w - # http://www.microsoft.com/download/en/details.aspx?id=25150 - w_download http://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe 3dce66bae0dd71284ac7a971baed07030a186918 - # Work around hang in http://bugs.winehq.org/show_bug.cgi?id=25060#c19 WINEDLLOVERRIDES=ngen.exe,mscorsvw.exe=b export WINEDLLOVERRIDES @@ -5422,7 +5431,7 @@ title="MS .NET 4.0" \ publisher="Microsoft" \ year="2011" \ - media="manual_download" \ + media="download" \ conflicts="dotnet20sdk" \ file1="dotNetFx40_Full_x86_x64.exe" \ installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe" @@ -6772,8 +6781,9 @@ # 2014-01-22 sha1sum: c8f1b2c137a1373d591f7c1d48db9c6baa961caf # 2014-02-26 sha1sum: ae2855b729bfaedc766f3addd8c2b74eac576909 # 2014-04-15 sha1sum: c2ea56450fb4a5bac66cb7d70e3b522431521787 + # 2014-05-21 sha1sum: d95d1a14ee264235b29e093105bd2baa8b06eb12 - w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi c2ea56450fb4a5bac66cb7d70e3b522431521787 + w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi d95d1a14ee264235b29e093105bd2baa8b06eb12 cd "$W_CACHE"/shockwave w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q } @@ -6877,7 +6887,9 @@ { # Not referenced on MS web anymore, but the old Microsoft Software Library FTP still has it. # See ftp://ftp.microsoft.com/Softlib/index.txt - w_download ftp://$ftp_microsoft_com/Softlib/MSLFILES/VBRUN200.EXE ac0568b73ee375408778e9b505df995f79ab907e + # 2014/05/31: Microosfot FTP is down ftp://$ftp_microsoft_com/Softlib/MSLFILES/VBRUN200.EXE + # Mirror list: http://www.filewatcher.com/m/VBRUN200.EXE.220504-0.html + w_download ftp://ftp.chatnfiles.com/Winfilesdotcom/winfilesdotcom-june-98-4-of-4/required/VBRUN200.EXE ac0568b73ee375408778e9b505df995f79ab907e w_try_unzip -d "$W_TMP" "$W_CACHE"/vb2run/VBRUN200.EXE w_try cp -f "$W_TMP/VBRUN200.DLL" "$W_SYSTEM32_DLLS" } @@ -7218,6 +7230,40 @@ #---------------------------------------------------------------- +w_metadata vcrun2012 dlls \ + title="Visual C++ 2012 libraries (atl110,mfc110,mfc110u,msvcp110,msvcr110,vcomp110)" \ + publisher="Microsoft" \ + year="2012" \ + media="download" \ + file1="vcredist_x86.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/mfc110.dll" + +load_vcrun2012() +{ + # http://www.microsoft.com/download/details.aspx?id=30679 + w_download http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe 96b377a27ac5445328cbaae210fc4f0aaa750d3f + + w_override_dlls native,builtin atl110 msvcp110 msvcr110 vcomp110 + cd "$W_CACHE"/vcrun2012 + if w_workaround_wine_bug 17273 "Manually extracting dlls" + then + w_try_cabextract --directory="$W_TMP" vcredist_x86.exe + w_try_cabextract --directory="$W_TMP" "$W_TMP/a2" + w_try_cabextract --directory="$W_TMP" "$W_TMP/a3" + cp "$W_TMP"/F_CENTRAL_atl110_x86 "$W_SYSTEM32_DLLS"/atl110.dll + cp "$W_TMP"/F_CENTRAL_mfc110_x86 "$W_SYSTEM32_DLLS"/mfc110.dll + cp "$W_TMP"/F_CENTRAL_mfc110u_x86 "$W_SYSTEM32_DLLS"/mfc110u.dll + cp "$W_TMP"/F_CENTRAL_msvcp110_x86 "$W_SYSTEM32_DLLS"/msvcp110.dll + cp "$W_TMP"/F_CENTRAL_msvcr110_x86 "$W_SYSTEM32_DLLS"/msvcr110.dll + cp "$W_TMP"/F_CENTRAL_vcomp110_x86 "$W_SYSTEM32_DLLS"/vcomp110.dll + else + w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q + fi + +} + +#---------------------------------------------------------------- + w_metadata vjrun20 dlls \ title="MS Visual J# 2.0 SE libraries (requires dotnet20)" \ publisher="Microsoft" \ @@ -8055,7 +8101,7 @@ load_lucida() { - w_download ftp://$ftp_microsoft_com/bussys/winnt/winnt-public/fixes/usa/NT40TSE/hotfixes-postSP3/Euro-fix/eurofixi.exe 64c47ad92265f6f10b0fd909a703d4fd1b05b2d5 + w_download ftp://ftp.fu-berlin.de/pc/security/ms-patches/winnt/usa/NT40TSE/hotfixes-postSP3/Euro-fix/eurofixi.exe 64c47ad92265f6f10b0fd909a703d4fd1b05b2d5 w_try_cabextract -d "$W_FONTSDIR_UNIX" -L -F 'lucon.ttf' "$W_CACHE"/lucida/eurofixi.exe w_register_font lucon.ttf "Lucida Console" } @@ -8098,7 +8144,7 @@ { # The tahoma and tahomabd fonts are needed by e.g. Steam - w_download ftp://$ftp_microsoft_com/Softlib/MSLFILES/tahoma32.exe 888ce7b7ab5fd41f9802f3a65fd0622eb651a068 + w_download http://download.microsoft.com/download/office97pro/fonts/1/w95/en-us/tahoma32.exe 888ce7b7ab5fd41f9802f3a65fd0622eb651a068 w_try_cabextract --directory="$W_TMP" "$W_CACHE"/tahoma/tahoma32.exe w_try cp -f "$W_TMP"/Tahoma.TTF "$W_FONTSDIR_UNIX"/tahoma.ttf w_try cp -f "$W_TMP"/Tahomabd.TTF "$W_FONTSDIR_UNIX"/tahomabd.ttf @@ -8371,25 +8417,6 @@ #---------------------------------------------------------------- -w_metadata kobo apps \ - title="Kobo e-book reader" \ - publisher="Kobo" \ - year="2011" \ - media="download" \ - file1="KoboSetup.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Kobo/Kobo.exe" \ - homepage="http://www.borders.com/online/store/MediaView_ereaderapps"; - -load_kobo() -{ - w_download http://download.kobobooks.com/desktop/1/KoboSetup.exe 31a5f5583edf4b716b9feacb857d2170104cabd9 - cd "$W_CACHE"/kobo - w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S} - w_declare_exe "$W_PROGRAMS_X86_WIN\\Kobo" "Kobo.exe" -} - -#---------------------------------------------------------------- - w_metadata cmake apps \ title="CMake 2.8" \ publisher="Kitware" \ @@ -8463,6 +8490,23 @@ #---------------------------------------------------------------- +w_metadata controlspy apps \ + title="Control Spy 2.0 " \ + publisher="Microsoft" \ + year="2005" \ + media="download" \ + file1="ControlSpy.msi" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Microsoft/ControlSpy/ControlSpyV6.exe" + +load_controlspy() +{ + w_download http://download.microsoft.com/download/a/3/1/a315b133-03a8-4845-b428-ec585369b285/ControlSpy.msi efe33701f78b5853ba73353f028b777b4c849e77 + cd "$W_CACHE/$W_PACKAGE" + w_try "$WINE" msiexec /i ControlSpy.msi ${W_OPT_UNATTENDED:+/qb} +} + +#---------------------------------------------------------------- + # dxdiag is a system component that one usually adds to an existing wineprefix, # so it belongs in 'dlls', not apps. w_metadata dxdiag dlls \ @@ -8739,7 +8783,10 @@ load_ie7() { - echo "This fails in about 1 of 30 runs (see bug 26016), just retry if that happens" + if w_workaround_wine_bug 21947 "Working around heap corruption (see also bug 26016)" 1.7.19, + then + echo "This fails in about 1 of 30 runs (see bug 26016), just retry if that happens" + fi # Unregister Wine IE if grep -q -i "wine placeholder" "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe" @@ -8787,7 +8834,7 @@ mv "$WINEPREFIX/dosdevices/z:" "$WINEPREFIX/dosdevices/z:.bak_wt" fi - if w_workaround_wine_bug 21947 "Working around heap corruption (see also bug 26016)" + if w_workaround_wine_bug 21947 "Working around heap corruption (see also bug 26016)" 1.7.19, then WINEDEBUG=warn+heap "$WINE" IE7-WindowsXP-x86-enu.exe $quiet else @@ -8945,6 +8992,25 @@ #---------------------------------------------------------------- +w_metadata kobo apps \ + title="Kobo e-book reader" \ + publisher="Kobo" \ + year="2011" \ + media="download" \ + file1="KoboSetup.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Kobo/Kobo.exe" \ + homepage="http://www.borders.com/online/store/MediaView_ereaderapps"; + +load_kobo() +{ + w_download http://download.kobobooks.com/desktop/1/KoboSetup.exe 31a5f5583edf4b716b9feacb857d2170104cabd9 + cd "$W_CACHE"/kobo + w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S} + w_declare_exe "$W_PROGRAMS_X86_WIN\\Kobo" "Kobo.exe" +} + +#---------------------------------------------------------------- + w_metadata mingw apps \ title="Minimalist GNU for Windows, including GCC for Windows" \ publisher="GNU" \ @@ -17962,6 +18028,10 @@ #---- Derived Metadata ---- # Generated automatically by measuring time and space requirements of all verbs # size_MB includes size of virgin wineprefix, but not the cached installer +case $WINETRICKS_OPT_VERBOSE in + 2) set -x ;; + *) set +x ;; +esac for data in \ 3dmark03:size_MB=895,time_sec=149 \ @@ -18171,6 +18241,12 @@ unset size_MB time_sec done +# Restore verbosity: +case $WINETRICKS_OPT_VERBOSE in + 1|2) set -x ;; + *) set +x ;; +esac + #---- Main Program ---- winetricks_stats_save() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
