From f54d3d73d574d3660d88bf50943e39941011a4299d7e5eb9829dce2c5b8892b1 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 4 Oct 2007 22:39:47 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=20 --- README.SuSE | 27 ++++----- wine-0.9.44.tar.bz2 | 3 - wine-0.9.46.tar.bz2 | 3 + wine.changes | 16 +++++ wine.spec | 30 +++++++--- winetricks | 143 ++++++++++++++++++++++++++------------------ 6 files changed, 134 insertions(+), 88 deletions(-) delete mode 100644 wine-0.9.44.tar.bz2 create mode 100644 wine-0.9.46.tar.bz2 diff --git a/README.SuSE b/README.SuSE index 4b71e49..2b9b966 100644 --- a/README.SuSE +++ b/README.SuSE @@ -1,28 +1,21 @@ Violation of existing windows: ------------------------------ -Wine can violate MS Windows installation. +Wine can corrupt MS Windows installation. It is recommended to copy whole of windows to another destination and to configure wine for this copy. -Configuration: --------------- -The wine config has been changed: - 1. The /etc/wine.conf does not exist anymore and neither does - ~/.wine/config since WINE release 20050628. +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. All configuration data is now 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/ - 3. Drives and Devices are configured by symlinking in ~/.wine/dosdevices/ +3. You have to set the WINEPREFIX variable to the wine base dir. - 4. You have to set the WINEPREFIX variable to the wine base dir. - Default is ~/.wine/ - - 5. Running "wineprefixcreate" will update or create such a wine base - directory. +4. Running "wineprefixcreate" will update or create such a wine base + directory. There usually is no need for additionaly configuring wine. @@ -32,11 +25,11 @@ file and registry settings by running "wineprefixcreate". Start wine: ----------- -Check whether wine runs by entering (e.g.) 'wine notepad.exe' or +Check whether wine runs by entering (e.g.) 'wine sol.exe' or 'wine progman'. Error and warning messages: --------------------------- -Wine is intensively developed but isn't complete yet. Therefore +Wine is intensively developed but always isn't complete. Therefore many things don't work and wine print many error and warning messages. diff --git a/wine-0.9.44.tar.bz2 b/wine-0.9.44.tar.bz2 deleted file mode 100644 index 16ad805..0000000 --- a/wine-0.9.44.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e10a1965412296c10e87f8705bcef5c347047a9246b5dbae33d7d13785c07d4 -size 12424896 diff --git a/wine-0.9.46.tar.bz2 b/wine-0.9.46.tar.bz2 new file mode 100644 index 0000000..db85695 --- /dev/null +++ b/wine-0.9.46.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:889d28907acbf1c7a8bd2bffeb1971c6139b4869fb4b45062b42eb00b17221a2 +size 12515196 diff --git a/wine.changes b/wine.changes index 45ad7dd..14dcf7e 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Sep 30 17:13:32 CEST 2007 - meissner@suse.de + +- Upgraded to upstream 0.9.46: + - A variety of fixes to improve Photoshop CS2 support. + - More complete support for device installation in setupapi. + - New Bidi text implementation that doesn't depend on libicu. + - The usual assortment of Direct3D improvements. + - Beginning of I/O completion ports support. +- Upgraded to upstream 0.9.45: + - Many improvements to the crypto dlls (should make iTunes work). + - The usual assortment of Direct3D improvements. + - A number of fixes to sound support. + - Many more WordPad features. +- New winetricks version + ------------------------------------------------------------------- Fri Aug 24 17:29:00 CEST 2007 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 1545973..7ca8ac6 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 0.9.44) +# spec file for package wine (Version 0.9.46) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,14 +11,14 @@ # norootforbuild Name: wine -BuildRequires: alsa-devel audiofile bison capi4linux-devel cups-devel desktop-file-utils fdupes flex fontforge freeglut-devel freetype2-devel giflib-devel hal-devel jack-devel libgphoto2-devel libicu-devel liblcms-devel libpng-devel libtiff-devel libxslt-devel ncurses-devel openldap2-devel prelink sane-backends update-desktop-files +BuildRequires: alsa-devel audiofile bison capi4linux-devel cups-devel desktop-file-utils fdupes flex fontforge freeglut-devel freetype2-devel giflib-devel hal-devel jack-devel libgphoto2-devel liblcms-devel libpng-devel libtiff-devel libxslt-devel ncurses-devel openldap2-devel prelink sane-backends update-desktop-files License: LGPL v2 or later Group: System/Emulators/PC -Autoreqprov: on -Version: 0.9.44 +AutoReqProv: on +Version: 0.9.46 Release: 1 Summary: An MS Windows Emulator -URL: http://www.winehq.com +Url: http://www.winehq.com Source0: wine-%version.tar.bz2 Source1: http://kegel.com/wine/winetricks Source3: README.SuSE @@ -64,13 +64,14 @@ test -d dlls/winemp3.acm && ( %build rm -f ./config.cache autoconf -CFLAGS="${RPM_OPT_FLAGS}" \ -./configure --prefix=/usr --mandir=$RPM_BUILD_ROOT/%{_mandir} +CFLAGS="$RPM_OPT_FLAGS" \ +./configure --prefix=/usr make %{?jobs:-j%jobs} depend make %{?jobs:-j%jobs} all %install rm -rf $RPM_BUILD_ROOT +mkdir $RPM_BUILD_ROOT make install prefix=$RPM_BUILD_ROOT%{_prefix} # # install documentation @@ -83,7 +84,6 @@ find $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -type f|xargs chmod ogu+r install -d $RPM_BUILD_ROOT/usr/share/applications/ install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/applications/ install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/ - %fdupes -s $RPM_BUILD_ROOT %clean @@ -113,8 +113,20 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/wine/*.def %{_libdir}/wine/*.a /usr/share/aclocal/wine.m4 - %changelog +* Sun Sep 30 2007 - meissner@suse.de +- Upgraded to upstream 0.9.46: + - A variety of fixes to improve Photoshop CS2 support. + - More complete support for device installation in setupapi. + - New Bidi text implementation that doesn't depend on libicu. + - The usual assortment of Direct3D improvements. + - Beginning of I/O completion ports support. +- Upgraded to upstream 0.9.45: + - Many improvements to the crypto dlls (should make iTunes work). + - The usual assortment of Direct3D improvements. + - A number of fixes to sound support. + - Many more WordPad features. +- New winetricks version * Fri Aug 24 2007 - meissner@suse.de - Upgraded to upstream 0.9.44: - Better heuristics for making windows managed. diff --git a/winetricks b/winetricks index ee5660c..212d913 100644 --- a/winetricks +++ b/winetricks @@ -6,13 +6,30 @@ # Thanks to Detlef Riekenberg for lots of updates # Thanks to Saulius Krasuckas for corrections and suggestions -# FIXME get these settings right +# Default values for important settings if not already in environment. +# These settings should not need editing here. WINE=${WINE:-wine} WINEPREFIXCREATE=${WINEPREFIXCREATE:-wineprefixcreate} WINEPREFIX=${WINEPREFIX:-$HOME/.wine} + +# Internal variables; these locations are not too important WINETRICKS_CACHE=$HOME/winetrickscache WINETRICKS_TMP=$WINEPREFIX/drive_c/winetrickstmp +which "$WINE" > /dev/null +if test "$?" -ne "0" +then + echo "Cannot find wine ($WINE)" + exit 1 +fi + +which "$WINEPREFIXCREATE" > /dev/null +if test "$?" -ne "0" +then + echo "Cannot find wineprefixcreate ($WINEPREFIXCREATE)" + exit 1 +fi + #---------------------------------------------------------------- usage() { @@ -59,6 +76,7 @@ usage() { echo " winver=win98 Set windows version to win98" echo " winver=winxp Set windows version to winxp" echo " winver= Set windows version to default (win2k)" + echo " volnum Rename drive_c to harddiskvolume0 (needed by some installers)" exit 1 } @@ -75,18 +93,11 @@ olddir=`pwd` # Clean up after failed runs, if needed rm -rf $WINETRICKS_TMP/* -#----- Helpers ------------------------------------------------ +# The folder-name is localized! +programfilesdir_win=`$WINE cmd.exe /c echo "%ProgramFiles%"` +programfilesdir_unix=`$WINE winepath -u "$programfilesdir_win"` -# Download a file -download() { - file=`basename $1` - test -f $WINETRICKS_CACHE/$file || (cd $WINETRICKS_CACHE; wget -c $1) - if [ "$2"x != ""x ] - then - echo "$2 $WINETRICKS_CACHE/$file" > $WINETRICKS_CACHE/$file.sha1sum - try sha1sum --status -c $WINETRICKS_CACHE/$file.sha1sum - fi -} +#----- Helpers ------------------------------------------------ # Execute with error checking try() { @@ -104,6 +115,17 @@ try() { fi } +# Download a file +download() { + file=`basename "$1"` + test -f $WINETRICKS_CACHE/$file || (cd $WINETRICKS_CACHE; wget -c "$1") + if [ "$2"x != ""x ] + then + echo "$2 $WINETRICKS_CACHE/$file" > $WINETRICKS_CACHE/$file.sha1sum + try sha1sum --status -c $WINETRICKS_CACHE/$file.sha1sum + fi +} + set_winver() { echo "Setting Windows version to $1" cat > $WINETRICKS_TMP/set-winver.reg <<_EOF_ @@ -212,34 +234,11 @@ load_dcom98() { #---------------------------------------------------------------- -find_program_files() -{ - for i in \ - "Programme" \ - "Program Files" \ - "Archivos de programa" \ - "Ohjelmatiedostot" \ - "Programmi" \ - "Programfiler" \ - "Arquivos de programas" \ - "Programas"; do - if [ -x "$WINEPREFIX/drive_c/$i" ]; then - PROGRAM_FILES=$i; - return 0; - fi - done - echo "Couldn't find program files" - exit 1 -} - # Fake IE per workaround in http://bugs.winehq.org/show_bug.cgi?id=3453 # Just the first registry key works for most apps. # The App Paths part is required by a few apps, like Quickbooks Pro; # see http://windowsxp.mvps.org/ie/qbooks.htm -# Put iexplore.exe in c:/windows/command as wine.inf can't handle -# c:/Program Files yet. set_fakeie6() { - find_program_files cat > $WINETRICKS_TMP/fakeie6.reg <<"_EOF_" REGEDIT4 @@ -248,21 +247,26 @@ REGEDIT4 "Version"="6.0.2900.2180" [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\App Paths\IEXPLORE.EXE] -@="C:\\__PROGRAM_FILES__\\Internet Explorer\\iexplore.exe" -"PATH"="c:\\__PROGRAM_FILES__\\Internet Explorer" _EOF_ - sed -i -e "s/__PROGRAM_FILES__/$PROGRAM_FILES/" $WINETRICKS_TMP/fakeie6.reg + echo -n '@="' >>$WINETRICKS_TMP/fakeie6.reg + echo -n "${programfilesdir_win}" | sed "s/\\\\/\\\\\\\\/" >>$WINETRICKS_TMP/fakeie6.reg + echo '\\\\Internet Explorer\\\\iexplore.exe"' >>$WINETRICKS_TMP/fakeie6.reg + + echo -n '"PATH"="' >>$WINETRICKS_TMP/fakeie6.reg + echo -n "${programfilesdir_win}" | sed "s/\\\\/\\\\\\\\/" >>$WINETRICKS_TMP/fakeie6.reg + echo '\\\\Internet Explorer"' >>$WINETRICKS_TMP/fakeie6.reg + try $WINE regedit $WINETRICKS_TMP/fakeie6.reg - # On old wineprefixes iexlore.exe is not created. Create a fake dll using + # On old wineprefixes iexplore.exe is not created. Create a fake dll using # shdocvw.dll that should have similar VERSIONINFO. - if [ ! -f "$WINEPREFIX/drive_c/$PROGRAM_FILES/Internet Explorer/iexplore.exe" ]; then + if [ ! -f "$programfilesdir_unix/Internet Explorer/iexplore.exe" ]; then echo "You have an old wineprefix without iexplore.exe. Will create a fake now" - if [ ! -d "$WINEPREFIX/drive_c/$PROGRAM_FILES/Internet Explorer/iexplore.exe" ]; then - try mkdir "$WINEPREFIX/drive_c/$PROGRAM_FILES/Internet Explorer"; + if [ ! -d "$programfilesdir_unix/Internet Explorer/iexplore.exe" ]; then + try mkdir "$programfilesdir_unix/Internet Explorer"; fi - try cp -f "$WINEPREFIX/drive_c/windows/system32/shdocvw.dll" "$WINEPREFIX/drive_c/$PROGRAM_FILES/Internet Explorer/iexplore.exe" + try cp -f "$WINEPREFIX/drive_c/windows/system32/shdocvw.dll" "$programfilesdir_unix/Internet Explorer/iexplore.exe" fi } @@ -275,32 +279,30 @@ load_gecko() { # (e.g. we hardcode gecko's url here, but it's normally # only hardcoded in wine.inf, and fetched from the registry thereafter, # so we're adding a maintenance burden here.) + GECKO_VERSION=0.1.0 - if ! test -f $WINETRICKS_CACHE/wine_gecko.cab + if ! test -f $WINETRICKS_CACHE/wine_gecko-$GECKO_VERSION.cab then - download http://source.winehq.org/winegecko.php + download "http://source.winehq.org/winegecko.php?v=$GECKO_VERSION" fi - # The folder-name is localized! - programfilesdir_win=`$WINE cmd.exe /c echo "%ProgramFiles%"` - programfilesdir_unix=`$WINE winepath -u "$programfilesdir_win"` - - cat > $WINETRICKS_TMP/geckopath.reg <<"_EOF_" + cat > $WINETRICKS_TMP/geckopath.reg <<_EOF_ REGEDIT4 -[HKEY_CURRENT_USER\Software\Wine\MSHTML] +[HKEY_CURRENT_USER\\Software\\Wine\\MSHTML\\$GECKO_VERSION] _EOF_ #The registry-entry does not support an environment-variable # note: echo's behavior with backslashes and options is nonportable, # see http://www.opengroup.org/onlinepubs/009695399/utilities/echo.html echo -n '"GeckoPath"="' >>$WINETRICKS_TMP/geckopath.reg - echo -n "${programfilesdir_win}" | sed "s/\\\\/\\\\\\\\/" >>$WINETRICKS_TMP/geckopath.reg + echo -n 'c:\\windows\\gecko\\'$GECKO_VERSION | sed "s/\\\\/\\\\\\\\/g" >>$WINETRICKS_TMP/geckopath.reg echo '\\\\wine_gecko"' >>$WINETRICKS_TMP/geckopath.reg # extract the files - cd "$programfilesdir_unix" - try cabextract $WINETRICKS_UNIXQUIET $WINETRICKS_CACHE/wine_gecko.cab + mkdir -p $WINEPREFIX/drive_c/windows/gecko/$GECKO_VERSION + cd $WINEPREFIX/drive_c/windows/gecko/$GECKO_VERSION + try cabextract $WINETRICKS_UNIXQUIET $WINETRICKS_CACHE/wine_gecko-$GECKO_VERSION.cab cd "$olddir" # set install-path @@ -311,14 +313,13 @@ _EOF_ load_gdiplus() { # gdiplus is documented here as a redistributable: - # http://msdn.microsoft.com/library/default.asp?url=/library/en-us/gdicpp/GDIPlus/GDIPlus.asp + # http://msdn.microsoft.com/library/en-us/gdicpp/GDIPlus/GDIPlus.asp # however, there's no standalone installer. So install a random # app that happens to bundle it. download http://download.microsoft.com/download/a/1/a/a1adc39b-9827-4c7a-890b-91396aed2b86/ppviewer.exe 4d13ca85d1d366167b6247ac7340b7736b1bff87 try $WINE $WINETRICKS_CACHE/ppviewer.exe $WINETRICKS_QUIET # And then make it globally available. - # FIXME: use localized name for ProgramFiles (see gecko above) - try cp $WINEPREFIX/drive_c/Program\ Files/Microsoft\ Office/PowerPoint\ Viewer/GDIPLUS.DLL $WINEPREFIX/drive_c/windows/system32/ + try cp "$programfilesdir_unix/Microsoft Office/PowerPoint Viewer/GDIPLUS.DLL" $WINEPREFIX/drive_c/windows/system32/ } #---------------------------------------------------------------- @@ -334,8 +335,8 @@ load_jet40() { load_liberation() { # http://www.redhat.com/promo/fonts/ - download http://www.redhat.com/f/fonts/liberation-fonts-ttf-2.tar.gz c49cae316fa454a10502feb2122e7d3b33ab06d5 - tar --wildcards -C $WINEPREFIX/drive_c/windows/fonts -xvzf $WINETRICKS_CACHE/liberation-fonts-ttf-2.tar.gz '*.ttf' + download http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz 503fd3c60174b53f59ca41927b72e4a44bab586b + tar --wildcards -C $WINEPREFIX/drive_c/windows/fonts -xvzf $WINETRICKS_CACHE/liberation-fonts-ttf-3.tar.gz '*.ttf' } #---------------------------------------------------------------- @@ -498,6 +499,29 @@ load_pdh() { #---------------------------------------------------------------- +volnum() { + # Recent Microsoft installers are often based on "windows package manager", see + # http://support.microsoft.com/kb/262841 and + # http://www.microsoft.com/technet/prodtechnol/windowsserver2003/deployment/winupdte.mspx + # These installers check the drive name, and if it doesn't start with 'harddisk', + # they complain "Unable to find a volume for file extraction", see + # http://bugs.winehq.org/show_bug.cgi?id=5351 + # You may be able to work around this by using the installer's /x or /extract switch, + # but renaming drive_c to "harddiskvolume0" lets you just run the installer as normal. + + if ! test -d $WINEPREFIX/harddiskvolume0/ + then + ln -s drive_c $WINEPREFIX/harddiskvolume0 + rm $WINEPREFIX/dosdevices/c: + ln -s ../harddiskvolume0 $WINEPREFIX/dosdevices/c: + echo "Renamed drive_c to harddiskvolume0" + else + echo "drive_c already named harddiskvolume0" + fi +} + +#---------------------------------------------------------------- + load_tahoma() { # The tahoma font is needed by e.g. Steam download http://internap.dl.sourceforge.net/sourceforge/corefonts/wd97vwr32.exe 8edf758f92513094a94e50b7826cd6f2b7696b8c @@ -652,6 +676,7 @@ do winver=winxp) set_winver winxp;; winver=) unset_winver;; native_mdac) set_native_mdac;; + volnum) volnum;; *) echo Unknown arg $1; usage;; esac # Provide a bit of feedback