diff --git a/README.SuSE b/README.SuSE index 32897d5..4eb21f1 100644 --- a/README.SuSE +++ b/README.SuSE @@ -32,5 +32,6 @@ Check whether wine runs by entering (e.g.) 'wine sol.exe' or Error and warning messages: --------------------------- -Wine is intensively developed but always isn't complete. Therefore -many things don't work and wine print many error and warning messages. +Wine is intensively developed but always isn't complete. +Therefore things might not work and wine prints lots of error and +warning messages. diff --git a/wine-0.9.65_aka_1.0.rc4.tar.bz2 b/wine-0.9.65_aka_1.0.rc4.tar.bz2 deleted file mode 100644 index 812d4c1..0000000 --- a/wine-0.9.65_aka_1.0.rc4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2b59e6663919ec46e61740dabd3922a6c4909f0bc43dd42cf604aaa042b6fcd -size 13989896 diff --git a/wine-1.0.tar.bz2 b/wine-1.0.tar.bz2 new file mode 100644 index 0000000..3369212 --- /dev/null +++ b/wine-1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:734c7f9d2b2ad2eed25b899e7d2235d7c82ac49d31aee23c585eebba50e2130d +size 13950187 diff --git a/wine.changes b/wine.changes index 72409a9..e900eb0 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jun 17 16:45:46 CEST 2008 - meissner@suse.de + +- Upgraded to upstream 1.0 - first stable release +- updated winetricks + - comctl32.ocx downloader added + - dirac,vlc downloader + +------------------------------------------------------------------- +Fri Jun 13 17:50:26 CEST 2008 - meissner@suse.de + +- Upgraded to upstream 1.0-rc5 + - Lots of bug fixes. + ------------------------------------------------------------------- Sun Jun 8 12:01:29 CEST 2008 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 54d07a7..e35ed29 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 0.9.65_aka_1.0.rc4) +# spec file for package wine (Version 1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils License: LGPL v2.1 or later Group: System/Emulators/PC AutoReqProv: on -Version: 0.9.65_aka_1.0.rc4 +Version: 1.0 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -118,6 +118,14 @@ rm -rf $RPM_BUILD_ROOT /usr/share/aclocal/wine.m4 %changelog +* Tue Jun 17 2008 meissner@suse.de +- Upgraded to upstream 1.0 - first stable release +- updated winetricks + - comctl32.ocx downloader added + - dirac,vlc downloader +* Fri Jun 13 2008 meissner@suse.de +- Upgraded to upstream 1.0-rc5 + - Lots of bug fixes. * Sun Jun 08 2008 meissner@suse.de - Upgraded to upstream 1.0-rc4 (labeled 0.9.65_aka_1.0.rc4 to avoid update problems to 1.0) diff --git a/winetricks b/winetricks index 2a51759..510dae1 100644 --- a/winetricks +++ b/winetricks @@ -31,7 +31,7 @@ esac case "$1" in -V|--version) - echo "Winetricks version 20080527. (C) Dan Kegel. LGPL." + echo "Winetricks version 20080622. (C) Dan Kegel. LGPL." exit 0 ;; esac @@ -74,69 +74,74 @@ usage() { echo " -v verbose" echo " -V display Version" echo "Packages:" - echo " art2kmin Access 2000 runtime. License required!" - echo " cc580 Install native common controls 5.80, override comctl32" - echo " colorprofile Install standard RGB color profile" - echo " corefonts Install MS Arial, Courier, Times fonts" - echo " dcom98 Install native DCOM, override the Wine implementation" - echo " directx9 Install DirectX 9 user redistributable" - echo " dotnet11 Install native .NET 1.1 (requires Windows license)" - echo " dotnet20 Install native .NET 2.0 (requires Windows license)" - echo " ffdshow Install ffdshow video codecs" - echo " flash Install Adobe Flash Player activex" - echo " fontfix Fix bad fonts which cause crash in some apps (e.g. .net)." - echo " gdiplus Install gdiplus.dll from pp viewer (got a better idea?)" - echo " gecko Install the HTML rendering Engine (Mozilla)" - echo " icodecs Intel Codecs" - echo " jet40 Install Jet 4.0 Service Pack 8" - echo " liberation Install Red Hat Liberation fonts (Sans, Serif, Mono)" - echo " mdac25 MDAC 2.5: Microsoft ODBC drivers, etc." - echo " mdac27 MDAC 2.7" - echo " mdac28 MDAC 2.8" - echo " mfc40" - echo " mfc42 see vcrun6" - echo " mono19 mono-1.9.1-gtksharp-2.10.4-win32-2" - echo " msi2 Microsoft Installer 2.0" - echo " msls31 Microsoft Line Services 3.1 (needed by native riched?)" - echo " msxml3 Microsoft XML version 3" - echo " msxml4 Microsoft XML version 4" - echo " msxml6 Microsoft XML version 6" - echo " pdh Install pdh.dll (Performance Data Helper)" - echo " quicktime72 Apple Quicktime 7.2" - echo " riched20 Use Microsoft riched20 and riched32" - echo " riched30 Use Microsoft riched30" - echo " tahoma Install MS Tahoma font (not part of corefonts)" - echo " vb3run Visual Basic 3 runtime" - echo " vb4run Visual Basic 4 runtime" - echo " vb5run Visual Basic 5 runtime" - echo " vb6run Visual Basic 6 runtime" - echo " vcrun6 vc6redist from VS6sp4 (mfc42, msvcp60, msvcrt)" - echo " vcrun2003 Visual C++ 2003 redistributables (mfc71,msvcp71,msvcr71)" - echo " vcrun2005 Visual C++ 2005 redistributable libraries (mfc80,msvcp80,msvcr80)" - echo " vcrun2005sp1 Visual C++ 2005sp1 redistributable libraries" - echo " vcrun2008 Visual C++ 2008 redistributable libraries (mfc90,msvcp90,msvcr90)" - echo " wmp9 Windows Media Player 9 (requires Windows license)" - echo " wmp10 Windows Media Player 10 (requires Windows license)" - echo " wsh51 Windows Scripting Host 5.1" - echo " wsh56 Windows Scripting Host 5.6" - echo " wsh56js Windows scripting 5.6, jscript only, no cscript" - echo " wsh56vb Windows scripting 5.6, vbscript only, no cscript" - echo " xvid Install xvid video codecs" + echo " art2kmin MS Access 2000 runtime. License required!" + echo " colorprofile Standard RGB color profile" + echo " comctl32 MS common controls 5.80" + echo " comctl32.ocx MS comctl32.ocx and mscomctl.ocx, comctl32 wrappers for VB6" + echo " corefonts MS Arial, Courier, Times fonts" + echo " dcom98 MS DCOM, override the Wine implementation" + echo " dirac0.8 the obsolete Dirac 0.8 directshow filter" + echo " directx9 MS DirectX 9 user redistributable" + echo " divx divx video codec" + echo " dotnet11 MS .NET 1.1 (requires Windows license)" + echo " dotnet20 MS .NET 2.0 (requires Windows license)" + echo " ffdshow ffdshow video codecs" + echo " flash Adobe Flash Player activex" + echo " fontfix Fix bad fonts which cause crash in some apps (e.g. .net)." + echo " gdiplus MS gdiplus.dll (from powerpoint viewer)" + echo " gecko The HTML rendering Engine (Mozilla)" + echo " icodecs Intel Codecs" + echo " jet40 MS Jet 4.0 Service Pack 8" + echo " liberation Red Hat Liberation fonts (Sans, Serif, Mono)" + echo " mdac25 MS MDAC 2.5: Microsoft ODBC drivers, etc." + echo " mdac27 MS MDAC 2.7" + echo " mdac28 MS MDAC 2.8" + echo " mfc40 MS mfc40 (Microsoft Foundation Classes from Visual C++ 4)" + echo " mfc42 MS mfc42 (see vcrun6 below)" + echo " mono19 mono-1.9.1-gtksharp-2.10.4-win32-2" + echo " msi2 MS Installer 2.0" + echo " msls31 MS Line Services 3.1 (needed by native riched?)" + echo " msxml3 MS XML version 3" + echo " msxml4 MS XML version 4" + echo " msxml6 MS XML version 6" + echo " pdh MS pdh.dll (Performance Data Helper)" + echo " quicktime72 Apple Quicktime 7.2" + echo " riched20 MS riched20 and riched32" + echo " riched30 MS riched30" + echo " tahoma MS Tahoma font (not part of corefonts)" + echo " vb3run MS Visual Basic 3 runtime" + echo " vb4run MS Visual Basic 4 runtime" + echo " vb5run MS Visual Basic 5 runtime" + echo " vb6run MS Visual Basic 6 runtime" + echo " vcrun6 MS Visual C++ 6 sp4 libraries (mfc42, msvcp60, msvcrt)" + echo " vcrun2003 MS Visual C++ 2003 libraries (mfc71,msvcp71,msvcr71)" + echo " vcrun2005 MS Visual C++ 2005 libraries (mfc80,msvcp80,msvcr80)" + echo " vcrun2005sp1 MS Visual C++ 2005 sp1 libraries" + echo " vcrun2008 MS Visual C++ 2008 libraries (mfc90,msvcp90,msvcr90)" + echo " vjrun20 MS Visual J# 2.0 libraries (requires dotnet20)" + echo " wmp9 MS Windows Media Player 9 (requires Windows license)" + echo " wmp10 MS Windows Media Player 10 (requires Windows license)" + echo " wsh51 MS Windows Scripting Host 5.1" + echo " wsh56 MS Windows Scripting Host 5.6" + echo " wsh56js MS Windows scripting 5.6, jscript only, no cscript" + echo " wsh56vb MS Windows scripting 5.6, vbscript only, no cscript" + echo " xvid xvid video codec" echo "Apps:" - echo " vlc VLC media player" - echo " mpc Media Player Classic" + echo " autohotkey Autohotkey (open source gui scripting language)" + echo " mpc Media Player Classic" + echo " vlc VLC media player" echo "Pseudopackages:" - echo " allfonts Install all listed fonts (corefonts, tahoma, liberation)" - echo " allcodecs Install all listed codecs (xvid, ffdshow, icodecs)" - echo " fakeie6 Set registry to claim IE6sp1 is installed" - echo " native_mdac Override odbc32 and odbccp32" - echo " nt40 Set windows version to nt40" - echo " win98 Set windows version to Windows 98" - echo " win2k Set windows version to Windows 2000" - echo " winxp Set windows version to Windows XP" - echo " vista Set windows version to Windows Vista" - echo " winver= Set windows version to default (winxp)" - echo " volnum Rename drive_c to harddiskvolume0 (needed by some installers)" + echo " allfonts All listed fonts (corefonts, tahoma, liberation)" + echo " allcodecs All listed codecs (xvid, ffdshow, icodecs)" + echo " fakeie6 Set registry to claim IE6sp1 is installed" + echo " native_mdac Override odbc32 and odbccp32" + echo " nt40 Set windows version to nt40" + echo " win98 Set windows version to Windows 98" + echo " win2k Set windows version to Windows 2000" + echo " winxp Set windows version to Windows XP" + echo " vista Set windows version to Windows Vista" + echo " winver= Set windows version to default (winxp)" + echo " volnum Rename drive_c to harddiskvolume0 (needed by some installers)" } #---------------------------------------------------------------- @@ -216,7 +221,7 @@ dogui() detectDE if [ $DE = gnome ] then - echo "zenity --title 'Select a package to install' --text 'Install?' --list --checklist --column '' --column Package --column Description --height 400 --width 400 \\" > $WINETRICKS_TMP/zenity.sh + echo "zenity --title 'Select a package to install' --text 'Install?' --list --checklist --column '' --column Package --column Description --height 440 --width 600 \\" > $WINETRICKS_TMP/zenity.sh usage | grep '^ [a-z]' | sed 's/^ \([^ ]*\) *\(.*\)/FALSE "\1" '"'\2'/" | sed 's/$/ \\/' >> $WINETRICKS_TMP/zenity.sh export todo="`sh $WINETRICKS_TMP/zenity.sh | tr '|' ' '`" else @@ -442,6 +447,13 @@ load_art2kmin() { #---------------------------------------------------------------- +load_autohotkey() { + download . http://www.autohotkey.net/programs/AutoHotkey104706_Install.exe 3d3d8845473dea477d6983d063f0afc9999d880f + try $WINE "$WINETRICKS_CACHE"/AutoHotkey104706_Install.exe $WINETRICKS_S +} + +#---------------------------------------------------------------- + load_cc580() { # http://www.microsoft.com/downloads/details.aspx?familyid=6f94d31a-d1e0-4658-a566-93af0d8d4a1e download . http://download.microsoft.com/download/platformsdk/redist/5.80.2614.3600/w9xnt4/en-us/cc32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde @@ -456,6 +468,19 @@ load_cc580() { #---------------------------------------------------------------- +load_comctl32ocx() { + # http://www.microsoft.com/downloads/details.aspx?FamilyID=25437D98-51D0-41C1-BB14-64662F5F62FE + download . http://download.microsoft.com/download/3/a/5/3a5925ac-e779-4b1c-bb01-af67dc2f96fc/VisualBasic6-KB896559-v1-ENU.exe f52cf2034488235b37a1da837d1c40eb2a1bad84 + + try cabextract -q --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/VisualBasic6-KB896559-v1-ENU.exe + cp "$WINETRICKS_TMP"/mscomctl.ocx "$WINEPREFIX"/drive_c/windows/system32/mscomctl.ocx + cp "$WINETRICKS_TMP"/comctl32.ocx "$WINEPREFIX"/drive_c/windows/system32/comctl32.ocx + try $WINE regsvr32 comctl32.ocx + try $WINE regsvr32 mscomctl.ocx +} + +#---------------------------------------------------------------- + load_colorprofile() { download . http://download.microsoft.com/download/whistler/hwdev1/1.0/wxp/en-us/ColorProfile.exe 6b72836b32b343c82d0760dff5cb51c2f47170eb try unzip -o $WINETRICKS_UNIXQUIET -d "$WINETRICKS_TMP" "$WINETRICKS_CACHE"/ColorProfile.exe @@ -559,6 +584,13 @@ load_corefonts() { #---------------------------------------------------------------- +load_dirac() { + download . http://codecpack.nl/dirac_dsfilter_080.exe aacfcddf6b2636de5f0a50422ba9155e395318af + try $WINE "$WINETRICKS_CACHE"/dirac_dsfilter_080.exe $WINETRICKS_SILENT +} + +#---------------------------------------------------------------- + load_directx9() { # March 2008 DirectX 9c User Redistributable # http://www.microsoft.com/downloads/details.aspx?familyid=740AC79A-5B72-447D-84F9-EE6407ED1A91 @@ -573,11 +605,32 @@ load_directx9() { set_winver win2k WINEDLLOVERRIDES="wintrust=b,mscoree=,ddraw,d3d8,d3d9,dsound,dinput=n" \ try $WINE "$WINETRICKS_CACHE"/directx_mar2008_redist.exe /t:"$WINETRICKS_TMP_WIN" $WINETRICKS_QUIET + + # How many of these do we really need? + override_dlls native d3dim d3drm d3dx8 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 + override_dlls native d3dx9_30 d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dxof + override_dlls native dciman32 ddrawex devenum dmband dmcompos dmime dmloader dmscript dmstyle + override_dlls native dmsynth dmusic dmusic32 dnsapi dplay dplayx dpnaddr dpnet dpnhpast dpnlobby + override_dlls native dswave dxdiagn mscoree msdmo qcap quartz streamci + override_dlls builtin d3d8 d3d9 dinput dinput8 dsound + + try $WINE "$WINETRICKS_TMP_WIN"/DXSETUP.exe + unset_winver } #---------------------------------------------------------------- +load_divx() { + # 6.8.2: 02203fdc4dddd13e789c39b22902837da31d2a1d ? + # 6.8.2: e36bf87c1675d0cf9169839bc0cd8f866b9db026 as of 4 jun 2008 as http://download.divx.com/divx/DivXInstaller.exe + # 6.8.3: f4f4387ef89316aea440a29f3e24c1f1945e14af as of 20 jun 2008 as http://download.divx.com/divx/abt/b1/DivXInstaller.exe + download . http://download.divx.com/divx/abt/b1/DivXInstaller.exe f4f4387ef89316aea440a29f3e24c1f1945e14af + try $WINE "$WINETRICKS_CACHE"/DivXInstaller $WINETRICKS_SILENT +} + +#---------------------------------------------------------------- + load_dcom98() { # Install native dcom per http://wiki.winehq.org/NativeDcom # to avoid http://bugs.winehq.org/show_bug.cgi?id=4228 @@ -650,6 +703,7 @@ load_dotnet20() { else try $WINE "$WINETRICKS_CACHE"/dotnet20/dotnetfx.exe /q /c:"install.exe /q" fi + unset_winver } #---------------------------------------------------------------- @@ -1205,6 +1259,13 @@ load_vcrun2008() { #---------------------------------------------------------------- +load_vjrun20() { + download vjrun20 http://download.microsoft.com/download/9/2/3/92338cd0-759f-4815-8981-24b437be74ef/vjredist.exe 80a098e36b90d159da915aebfbfbacf35f302bd8 + try $WINE "$WINETRICKS_CACHE"/vjrun20/vjredist.exe $WINETRICKS_QUIET +} + +#---------------------------------------------------------------- + load_vlc() { # want http://www.videolan.org/mirror.php?file=vlc/0.8.6f/win32/vlc-0.8.6f-win32.exe but it doesn't redirect? download . http://mirrors.optralan.com/videolan/vlc/0.8.6f/win32/vlc-0.8.6f-win32.exe b83558e4232c47a385dbc93ebdc2e6b942fbcfbf @@ -1301,8 +1362,8 @@ load_wsh56vb() { load_xvid() { # xvid - download . http://download.videohelp.com/download/Xvid-1.1.3-12042008.exe 8de4950fb3c53dd3c8d486c0b9d516ede4beded6 - try $WINE "$WINETRICKS_CACHE"/Xvid-1.1.3-12042008.exe $WINETRICKS_SILENT + download . http://download2.videohelp.com/download/Xvid-1.1.3-27042008.exe f1008a11037c0b9368aa4979e62d0963d05d8007 + try $WINE "$WINETRICKS_CACHE"/Xvid-1.1.3-27042008.exe $WINETRICKS_SILENT } #---------------------------------------------------------------- @@ -1321,11 +1382,15 @@ do ;; -v) set -x;; art2kmin) load_art2kmin;; - cc580) load_cc580;; + autohotkey) load_autohotkey;; + cc580|comctl32) load_cc580;; + comctl32.ocx) load_comctl32ocx;; colorprofile) load_colorprofile;; corefonts) load_corefonts;; dcom98) load_dcom98;; + dirac) load_dirac;; directx9) load_directx9;; + divx) load_divx;; dotnet11) load_dotnet11; load_fontfix;; dotnet20) load_dotnet20; load_fontfix;; ffdshow) load_ffdshow;; @@ -1361,6 +1426,7 @@ do vcrun2005) load_vcrun2005;; vcrun2005sp1) load_vcrun2005sp1;; vcrun2008) load_vcrun2008;; + vjrun20) load_vjrun20;; vlc) load_vlc;; wmp9) load_vcrun6; load_wsh56; load_wmp9;; wmp10) load_vcrun6; load_wsh56; load_wmp10;;