From 6e415507b8b1ce581c79309afc39bd46613f85eaa7173d26476fb2585c35ff61 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 15 Feb 2008 00:47:21 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=29 --- wine-0.9.54.tar.bz2 | 3 - wine-0.9.55.tar.bz2 | 3 + wine.changes | 13 ++++ wine.spec | 17 ++++- winetricks | 152 ++++++++++++++++++++++++++++++++++++++++---- 5 files changed, 169 insertions(+), 19 deletions(-) delete mode 100644 wine-0.9.54.tar.bz2 create mode 100644 wine-0.9.55.tar.bz2 diff --git a/wine-0.9.54.tar.bz2 b/wine-0.9.54.tar.bz2 deleted file mode 100644 index 6e48569..0000000 --- a/wine-0.9.54.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b2ba6a671cd85f30def4b189e10a26ae22fda2e4e13db0a0702db73d95bcf95 -size 13119230 diff --git a/wine-0.9.55.tar.bz2 b/wine-0.9.55.tar.bz2 new file mode 100644 index 0000000..e288e10 --- /dev/null +++ b/wine-0.9.55.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e789ea1fc1e243a0f60340992a7dbe7855f82fcc72444513233711a3153518ad +size 13107628 diff --git a/wine.changes b/wine.changes index c8e61ca..f0208ec 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Feb 11 11:05:56 CET 2008 - meissner@suse.de + +- Upgraded to upstream 0.9.55 + - Direct3D improvements, including driver version emulation. + - Beginnings of support for OLE objects in Richedit. + - Several fixes to the animation control. + - A bunch of fixes for regression test failures. + - Lots of bug fixes. +- Updated winetricks + - added msxml6, riched30 + - added GUI dialogs (using kdialog, etc.) + ------------------------------------------------------------------- Fri Jan 25 19:13:22 CET 2008 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 907e07c..fb2986d 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 0.9.54) +# spec file for package wine (Version 0.9.55) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,12 +10,13 @@ # 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 liblcms-devel libpng-devel libtiff-devel libxslt-devel ncurses-devel openldap2-devel prelink sane-backends update-desktop-files License: LGPL v2.1 or later Group: System/Emulators/PC AutoReqProv: on -Version: 0.9.54 +Version: 0.9.55 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -118,6 +119,16 @@ rm -rf $RPM_BUILD_ROOT /usr/share/aclocal/wine.m4 %changelog +* Mon Feb 11 2008 meissner@suse.de +- Upgraded to upstream 0.9.55 + - Direct3D improvements, including driver version emulation. + - Beginnings of support for OLE objects in Richedit. + - Several fixes to the animation control. + - A bunch of fixes for regression test failures. + - Lots of bug fixes. +- Updated winetricks + - added msxml6, riched30 + - added GUI dialogs (using kdialog, etc.) * Fri Jan 25 2008 meissner@suse.de - Upgraded to upstream 0.9.54 - Photoshop CS/CS2 should now work, please help us testing it. @@ -207,7 +218,7 @@ rm -rf $RPM_BUILD_ROOT - Note a few downloads are no longer available (replacements, anyone?) - Note mono11 is deprecated - Add Mikolaj's nifty fakeie changes -* Fri Aug 10 2007 meissner@suse.de +* Sat Aug 11 2007 meissner@suse.de - Upgraded to upstream 0.9.43: - Direct3D support on top of WGL instead of GLX for better portability. - Many DirectSound fixes. diff --git a/winetricks b/winetricks index 83fe2f9..0943d7a 100644 --- a/winetricks +++ b/winetricks @@ -59,10 +59,12 @@ usage() { echo " mono11 mono 1.1.13-gtksharp-2.8.2 (deprecated, use 1.2)" echo " mono12 mono mono-1.2.6-gtksharp-2.10.2" echo " msi2 Microsoft Installer 2.0" - echo " msxml3 (Note: install a bit squidgy; see http://bugs.winehq.org/show_bug.cgi?id=7849)" - echo " msxml4 (Note: installing this requires fake c: to be named harddrive1!)" + 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 " riched20 Use Microsoft's riched20 and riched32" + echo " riched30 Use Microsoft's riched30" echo " tahoma Install MS Tahoma font (not part of corefonts)" echo " vbvm50 Visual Basic 5 runtime" echo " vbrun60 Visual Basic 6 runtime" @@ -85,16 +87,114 @@ 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 + echo " volnum Rename drive_c to harddiskvolume0 (was needed by some installers before 0.9.54)" +} + +#---------------------------------------------------------------- +# Trivial GUI just to handle case where user tries running without commandline + +# Checks for known desktop environments +# set variable DE to the desktop environments name, lowercase + +detectDE() { + if [ x"$KDE_FULL_SESSION" = x"true" ] + then + DE=kde + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ] + then + DE=gnome + elif [ x"$DISPLAY" != x"" ] + then + DE=x + else + DE=none + fi +} + +gnome_showmenu() { + title="$1" + shift + text="$1" + shift + col1name="$1" + shift + col2name="$1" + shift + while test $# -gt 0 + do + args="$args FALSE $1" + shift + done + zenity --title "$title" --text "$text" --list --checklist --column "$col1name" --column "$col2name" --height 400 $args | tr '|' '\012' +} + +kde_showmenu() { + title="$1" + shift + text="$1" + shift + col1name="$1" + shift + col2name="$1" + shift + while test $# -gt 0 + do + args="$args $1 $1 off" + shift + done + kdialog --title "$title" --separate-output --checklist "$text" $args +} + +x_showmenu() { + title="$1" + shift + text="$1" + shift + col1name="$1" + shift + col2name="$1" + shift + if test $# -gt 0 + then + args="$1" + shift + fi + while test $# -gt 0 + do + args="$args,$1" + shift + done + (echo "$title"; echo ""; echo "$text") > /tmp/x_showmenu.txt + xmessage -print -file /tmp/x_showmenu.txt -buttons "Cancel,$args" | sed 's/Cancel//' +} + +showmenu() +{ + detectDE + case $DE in + kde) kde_showmenu "$@" ;; + gnome) gnome_showmenu "$@" ;; + x) x_showmenu "$@" ;; + none) usage 1>&2; exit 1;; + esac +} + +dogui() +{ + packages=`usage | awk '/^ [a-z]/ {print $1}'` + export todo=`showmenu "winetricks" "Select a package to install" "Install?" "Package" $packages` + if test "$todo"x = x + then + exit 0 + fi } #---------------------------------------------------------------- -if test "$1" = "" -then - usage -fi +case x"$1" in +x) dogui ; set $todo ;; +x-h|x--help|xhelp) usage ; exit 1 ;; +esac test -d $WINEPREFIX || $WINEPREFIXCREATE mkdir -p $WINETRICKS_CACHE mkdir -p $WINETRICKS_TMP @@ -462,6 +562,7 @@ _EOF_ load_msi2() { # Install native msi per http://wiki.winehq.org/NativeMsi + # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=CEBBACD8-C094-4255-B702-DE3BB768148F download . http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366 # Pick win98 so we can install native msi @@ -514,12 +615,18 @@ load_msxml4() { #---------------------------------------------------------------- +load_msxml6() { + # http://www.microsoft.com/downloads/details.aspx?FamilyID=993c0bcf-3bcf-4009-be21-27e85e1857b1 + download . http://download.microsoft.com/download/2/e/0/2e01308a-e17f-4bf9-bf48-161356cf9c81/msxml6.msi 2308743ddb4cb56ae910e461eeb3eab0a9e58058 + + try $WINE msiexec /i $WINETRICKS_CACHE/msxml6.msi $WINETRICKS_QUIET +} + +#---------------------------------------------------------------- + load_pdh() { # http://support.microsoft.com/kb/284996 - if ! test -f $WINETRICKS_CACHE/pdhinst.exe - then - download . http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe f42448660def8cd7f42b34aa7bc7264745f4425e - fi + download . http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe f42448660def8cd7f42b34aa7bc7264745f4425e try $WINE $WINETRICKS_CACHE/pdhinst.exe try cp -f $WINEPREFIX/drive_c/windows/temp/x86/Pdh.Dll $WINEPREFIX/drive_c/windows/system32/pdh.dll } @@ -561,6 +668,23 @@ load_riched20() { #---------------------------------------------------------------- +load_riched30() { + # http://www.novell.com/documentation/nm1/readmeen_web/readmeen_web.html#Akx3j64 + # claims that Groupwise Messenger's View / Text Size command + # only works with riched30, and recommends getting it by installing + # msi 2, which just happens to come with riched30 version of riched20 + # (though not with a corresponding riched32, which might be a problem) + # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=CEBBACD8-C094-4255-B702-DE3BB768148F + download . http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366 + try cabextract --directory=$WINETRICKS_TMP $WINETRICKS_CACHE/InstMsiA.exe + try cp -f $WINETRICKS_TMP/riched20.dll $WINEPREFIX/drive_c/windows/system32 + override_dlls riched20 + + rm -rf $WINETRICKS_TMP/* +} + +#---------------------------------------------------------------- + load_tahoma() { # The tahoma font is needed by e.g. Steam download . http://downloads.sourceforge.net/corefonts/wd97vwr32.exe 8edf758f92513094a94e50b7826cd6f2b7696b8c @@ -732,8 +856,10 @@ do msi2) load_msi2;; msxml3) load_msxml3;; msxml4) load_msxml4;; + msxml6) load_msxml6;; pdh) load_pdh;; riched20) load_riched20;; + riched30) load_riched30;; tahoma) load_tahoma;; vbvm50) load_vbvm50;; vbrun60) load_vbrun60;; @@ -757,7 +883,7 @@ do winver=) unset_winver;; native_mdac) set_native_mdac;; volnum) volnum;; - *) echo Unknown arg $1; usage;; + *) echo Unknown arg $1; usage ; exit 1;; esac # Provide a bit of feedback test "$WINETRICKS_QUIET" = "" && case $1 in