From 0514099cc066de09421749807a57886abb4322ca8eba4800a05bf542ef20afda Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sun, 6 Apr 2008 07:16:00 +0000
Subject: [PATCH] OBS-URL:
https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=33
---
wine-0.9.58.tar.bz2 | 3 -
wine-0.9.59.tar.bz2 | 3 +
wine.changes | 15 +++++
wine.spec | 27 +++++---
winetricks | 147 ++++++++++++++++++++++++++++++++++++--------
5 files changed, 161 insertions(+), 34 deletions(-)
delete mode 100644 wine-0.9.58.tar.bz2
create mode 100644 wine-0.9.59.tar.bz2
diff --git a/wine-0.9.58.tar.bz2 b/wine-0.9.58.tar.bz2
deleted file mode 100644
index aaa3f86..0000000
--- a/wine-0.9.58.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76195618194da1542ffe2eab95eb718dc52a9dfe0885e5080649e969d5dbf5cb
-size 13367612
diff --git a/wine-0.9.59.tar.bz2 b/wine-0.9.59.tar.bz2
new file mode 100644
index 0000000..0534b0b
--- /dev/null
+++ b/wine-0.9.59.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7e18cc28e1acf71cfbc336d37a4aaf957cdee7eccc5544cea582fee132f50ce
+size 13625708
diff --git a/wine.changes b/wine.changes
index d6d60a4..ed44768 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Apr 4 17:41:23 CEST 2008 - meissner@suse.de
+
+- Upgraded to upstream 0.9.59
+ - Improved support for the .NET framework.
+ - Better services handling through a separate services.exe process.
+ - Support for ATI fragment shader.
+ - Better support for http proxies.
+ - Window management fixes.
+ - Pre-compiled fonts are now available in the source tree.
+ - Lots of bug fixes.
+- winetricks updated
+ - msls31, dotnet20, vcrun2003 downloaders added
+ - bugfixes
+
-------------------------------------------------------------------
Fri Mar 21 17:32:55 CET 2008 - meissner@suse.de
diff --git a/wine.spec b/wine.spec
index 397d0da..a831a82 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,5 +1,5 @@
#
-# spec file for package wine (Version 0.9.58)
+# spec file for package wine (Version 0.9.59)
#
# 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 audiofile bison capi4linux-devel cups-devel desktop-f
License: LGPL v2.1 or later
Group: System/Emulators/PC
AutoReqProv: on
-Version: 0.9.58
+Version: 0.9.59
Release: 1
Summary: An MS Windows Emulator
Url: http://www.winehq.com
@@ -44,6 +44,7 @@ running 'winecfg'.
%package devel
+License: LGPL v2.1 or later
Summary: files for wine development
Group: System/Emulators/PC
@@ -119,6 +120,18 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/aclocal/wine.m4
%changelog
+* Fri Apr 04 2008 meissner@suse.de
+- Upgraded to upstream 0.9.59
+ - Improved support for the .NET framework.
+ - Better services handling through a separate services.exe process.
+ - Support for ATI fragment shader.
+ - Better support for http proxies.
+ - Window management fixes.
+ - Pre-compiled fonts are now available in the source tree.
+ - Lots of bug fixes.
+- winetricks updated
+ - msls31, dotnet20, vcrun2003 downloaders added
+ - bugfixes
* Fri Mar 21 2008 meissner@suse.de
- Upgraded to upstream 0.9.58
- The default version is now Windows XP.
@@ -184,7 +197,7 @@ rm -rf $RPM_BUILD_ROOT
- Fixes for some longstanding screen depth issues.
- Implementation of "My Network Places" shell folder.
- Lots of bug fixes.
-* Fri Dec 14 2007 meissner@suse.de
+* Sat Dec 15 2007 meissner@suse.de
- Upgraded to upstream 0.9.51
- A bunch of WinHelp improvements.
- Better Japanese font support.
@@ -295,7 +308,7 @@ rm -rf $RPM_BUILD_ROOT
- A number of OLE fixes.
- Lots of bug fixes.
- Added "winetricks" script from Dan Kegel.
-* Fri May 11 2007 meissner@suse.de
+* Sat May 12 2007 meissner@suse.de
- Upgraded to upstream 0.9.37:
- MSI automation with JScript/VBScript support.
- Various MSHTML improvements.
@@ -402,7 +415,7 @@ rm -rf $RPM_BUILD_ROOT
- Dynamic drive support on MacOSX.
- Still more MSI fixes and improvements.
- Lots of bug fixes.
-* Thu Sep 28 2006 meissner@suse.de
+* Fri Sep 29 2006 meissner@suse.de
- Upstream 0.9.22:
- The usual assortment of MSI improvements.
- Several bug fixes to the various common controls.
@@ -483,7 +496,7 @@ rm -rf $RPM_BUILD_ROOT
- Lots of bug fixes.
- Added libgphoto2 and hal development libs to BuildRequires.
- personality hack to avoid virtual ram ulimits now seperate.
-* Mon Apr 17 2006 meissner@suse.de
+* Tue Apr 18 2006 meissner@suse.de
- Upstream 0.9.12:
- New Winelib Internet Explorer application (all 5 lines of it).
- Several improvements to the font support.
@@ -1043,7 +1056,7 @@ rm -rf $RPM_BUILD_ROOT
instead of it was used old Makefile and old launcher
* Mon Dec 03 2001 ro@suse.de
- fixed neededforbuild <docbktls> to <docbook-toys>
-* Thu Nov 01 2001 bjacke@suse.de
+* Fri Nov 02 2001 bjacke@suse.de
- make sub package -devel
- add "cups-devel cups-libs libpng jpeg openssl libtiff" to
neededforbuild for CUPS support
diff --git a/winetricks b/winetricks
index cdf417d..ac60585 100644
--- a/winetricks
+++ b/winetricks
@@ -20,7 +20,7 @@ WINETRICKS_TMP=$WINEPREFIX/drive_c/winetrickstmp
case "$1" in
-V|--version)
- echo "Winetricks version 20080309. (C) Dan Kegel. LGPL."
+ echo "Winetricks version 20080402. (C) Dan Kegel. LGPL."
exit 0
;;
esac
@@ -59,8 +59,10 @@ usage() {
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 " dotnet11 Install native .NET 1.1"
+ 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 " gdiplus Install gdiplus.dll from pp viewer (got a better idea?)"
echo " gecko Install the HTML rendering Engine (Mozilla)"
echo " icodecs Intel Codecs"
@@ -73,6 +75,7 @@ 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 " 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"
@@ -85,6 +88,7 @@ usage() {
echo " vb5run Visual Basic 5 runtime"
echo " vb6run Visual Basic 6 runtime"
echo " vcrun6 vc6redist from VS6sp4, including mfc42"
+ echo " vcrun2003 Visual C++ 2003 redistributables (mfc71,msvcp71,msvcr71)"
echo " vcrun2005 Visual C++ 2005 redistributable libraries"
echo " vcrun2005sp1 Visual C++ 2005sp1 redistributable libraries"
echo " vcrun2008 Visual C++ 2008 redistributable libraries"
@@ -99,9 +103,10 @@ usage() {
echo " fakeie6 Set registry to claim IE6sp1 is installed"
echo " native_mdac Override odbc32 and odbccp32"
echo " winver=nt40 Set windows version to nt40"
- 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 " winver=win98 Set windows version to Windows 98"
+ echo " winver=win2k Set windows version to Windows 2000"
+ echo " winver=winxp Set windows version to Windows XP"
+ echo " winver= Set windows version to default (winxp)"
echo " volnum Rename drive_c to harddiskvolume0 (was needed by some installers before 0.9.54)"
}
@@ -197,7 +202,7 @@ showmenu()
dogui()
{
packages=`usage | awk '/^ [a-z]/ {print $1}'`
- export todo=`showmenu "winetricks" "Select a package to install" "Install?" "Package" $packages`
+ export todo="`showmenu "winetricks" "Select a package to install" "Install?" "Package" $packages`"
if test "$todo"x = x
then
exit 0
@@ -284,7 +289,9 @@ _EOF_
}
override_dlls() {
- echo Overriding following DLLs: $@
+ mode=$1
+ shift
+ echo Using $mode override for following DLLs: $@
cat > $WINETRICKS_TMP/override-dll.reg <<_EOF_
REGEDIT4
@@ -297,7 +304,7 @@ _EOF_
rm -rf $WINEPREFIX/drive_c/windows/winsxs/manifests/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest
;;
esac
- echo "\"$1\"=\"native,builtin\"" >> $WINETRICKS_TMP/override-dll.reg
+ echo "\"$1\"=\"$mode\"" >> $WINETRICKS_TMP/override-dll.reg
shift
done
@@ -326,7 +333,7 @@ load_cc580() {
try $WINE $WINEPREFIX/drive_c/windows/temp/x86/50ComUpd.Exe "/T:`$WINE winepath -w $WINETRICKS_TMP`" /c $WINETRICKS_QUIET
cp $WINETRICKS_TMP/comcnt.dll $WINEPREFIX/drive_c/windows/system32/comctl32.dll
- override_dlls comctl32
+ override_dlls native,builtin comctl32
}
#----------------------------------------------------------------
@@ -375,7 +382,7 @@ load_dcom98() {
WINEDLLOVERRIDES="ole32,advpack=n" try $WINE $WINETRICKS_CACHE/DCOM98.EXE $WINETRICKS_QUIET
# Set native DCOM by default for all apps (ok, this might be overkill)
- override_dlls ole32 oleaut32 rpcrt4
+ override_dlls native,builtin ole32 oleaut32 rpcrt4
# and undo version win98
unset_winver
@@ -384,10 +391,59 @@ load_dcom98() {
#----------------------------------------------------------------
load_dotnet11() {
+ DOTNET_INSTALL_DIR="$WINEPREFIX/drive_c/windows/Microsoft.NET/Framework/v1.1.4322"
+
+ # Set win2k so .net installs gdiplus
+ set_winver win2k
+
# http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589-4842-8157-034D1E7CF3A3
download dotnet11 http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe 16a354a2207c4c8846b617cbc78f7b7c1856340e
try $WINE $WINETRICKS_CACHE/dotnet11/dotnetfx.exe $WINETRICKS_QUIET
-}
+
+ # It installs ok, but doesn't work yet without the following two kludges:
+
+ # Need to preload the Global Assembly Cache until Wine implements MsiPublishAssemblies()
+ # see http://bugs.winehq.org/show_bug.cgi?id=11742
+ # Get .NET 1.1 SP1 (which contains the GAC tool)
+ download dotnet11 http://download.microsoft.com/download/8/b/4/8b4addd8-e957-4dea-bdb8-c4e00af5b94b/NDP1.1sp1-KB867460-X86.exe 74a5b25d65a70b8ecd6a9c301a0aea10d8483a23
+ try cabextract --directory=$WINETRICKS_TMP $WINETRICKS_CACHE/dotnet11/NDP1.1sp1-KB867460-X86.exe
+ # "DDPatch.UpdateGacFile" -> "gacutil.exe"
+ try cp -f $WINETRICKS_TMP/DDPatch.UpdateGacFile "$DOTNET_INSTALL_DIR/gacutil.exe"
+ # install all .NET 1.1 assemblies into GAC (-f = force reinstall of assembly)
+ cd $DOTNET_INSTALL_DIR
+ for assembly in ./GAC/*
+ do
+ $WINE gacutil.exe -i $assembly -f
+ done
+ cd "$olddir"
+
+ # Need native gdiplus until wine implements gdiplus.GdipGetFamily
+ #load_gdiplus
+ cp -f "$DOTNET_INSTALL_DIR/gdiplus.dll" "$WINEPREFIX/drive_c/windows/system32/"
+ override_dlls native gdiplus
+
+ unset_winver
+}
+
+#----------------------------------------------------------------
+
+load_dotnet20() {
+ # Recipe from http://bugs.winehq.org/show_bug.cgi?id=10467#c57
+ test -d "$WINEPREFIX/drive_c/windows/gecko" || load_gecko
+ set_winver win2k
+ # See http://kegel.com/wine/l_intl-sh.txt for how l_intl.nls was generated
+ download dotnet20 http://kegel.com/wine/l_intl.nls
+ try cp -f $WINETRICKS_CACHE/dotnet20/l_intl.nls "$WINEPREFIX/drive_c/windows/system32/"
+
+ # http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5
+ download dotnet20 http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a
+ if [ "$WINETRICKS_QUIET"x = ""x ]
+ then
+ try $WINE $WINETRICKS_CACHE/dotnet20/dotnetfx.exe
+ else
+ try $WINE $WINETRICKS_CACHE/dotnet20/dotnetfx.exe /q /c:"install.exe /q"
+ fi
+}
#----------------------------------------------------------------
@@ -437,6 +493,14 @@ load_ffdshow() {
#----------------------------------------------------------------
+load_flash() {
+ # www.adobe.com/products/flashplayer/
+ download . http://fpdownload.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_active_x.msi f4dd1c0c715b791db2c972aeba90d3b78372996a
+ try $WINE msiexec /i $WINETRICKS_CACHE/install_flash_player_active_x.msi $WINETRICKS_QUIET
+}
+
+#----------------------------------------------------------------
+
load_gecko() {
# Load the HTML rendering Engine (Gecko)
# FIXME: shouldn't this code be in some script installed
@@ -485,6 +549,9 @@ load_gdiplus() {
try $WINE $WINETRICKS_CACHE/ppviewer.exe $WINETRICKS_QUIET
# And then make it globally available.
try cp "$programfilesdir_unix/Microsoft Office/PowerPoint Viewer/GDIPLUS.DLL" $WINEPREFIX/drive_c/windows/system32/
+
+ # For some reason, native,builtin isn't good enough...?
+ override_dlls native gdiplus
}
#----------------------------------------------------------------
@@ -507,9 +574,9 @@ load_jet40() {
#----------------------------------------------------------------
load_liberation() {
- # http://www.redhat.com/promo/fonts/
- 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'
+ # http://www.redhat.com/promo/fonts/
+ download . http://www.redhat.com/f/fonts/liberation-fonts.tar.gz 38276ab5e4322e131217d26f193bfce396195c0a
+ tar --wildcards -C $WINEPREFIX/drive_c/windows/fonts -xvzf $WINETRICKS_CACHE/liberation-fonts.tar.gz '*.ttf'
}
#----------------------------------------------------------------
@@ -517,7 +584,7 @@ load_liberation() {
set_native_mdac() {
# Set those overrides globally so user programs get MDAC's odbc
# instead of wine's unixodbc
- override_dlls odbc32 odbccp32
+ override_dlls native,builtin odbc32 odbccp32
}
#----------------------------------------------------------------
@@ -587,9 +654,9 @@ _EOF_
load_mono12() {
# Load Mono, have it handle all .net requests
- download . ftp://www.go-mono.com/archive/1.2.6/windows-installer/5/mono-1.2.6-gtksharp-2.10.2-win32-5.exe 71248e9dd4c96b63878a54ef21f71cdc9a77083d
+ download . ftp://www.go-mono.com/archive/1.9/windows-installer/4/mono-1.9-gtksharp-2.10.4-win32-4.exe 52c79aa8a4fcb29570ecf8e3cfcc417317852c16
# Anyone know how to get it to do a silent install?
- try $WINE $WINETRICKS_CACHE/mono-1.2.6-gtksharp-2.10.2-win32-5.exe
+ try $WINE $WINETRICKS_CACHE/mono-1.9-gtksharp-2.10.4-win32-4.exe
cat > $WINETRICKS_TMP/mono_1.2.reg <<_EOF_
REGEDIT4
@@ -621,7 +688,7 @@ load_msi2() {
WINEDLLOVERRIDES="msi,msiexec.exe=n" try $WINE $WINETRICKS_CACHE/InstMSIA.exe $WINETRICKS_QUIET
- override_dlls msi msiexec.exe
+ override_dlls native,builtin msi msiexec.exe
# and undo version win98
unset_winver
@@ -629,13 +696,28 @@ load_msi2() {
#----------------------------------------------------------------
+load_msls31() {
+ # Install native Microsoft Line Services (needed by e-Sword, possibly only when using native riched20)
+ # http://www.microsoft.com/reader/downloads/pc.mspx
+ if ! test -f "$programfilesdir_unix/Microsoft Reader"/msls31.dll
+ then
+ echo "Installing Microsoft Reader (which includes a copy of msls31.dll)"
+ download . http://download.microsoft.com/download/d/0/9/d099ad62-41d1-4e92-9935-67955a437460/MSReaderSetupUSA.exe 055af1f589e2ae9896f17dbf33d8a3f156d10282
+ try $WINE $WINETRICKS_CACHE/MSReaderSetupUSA.exe
+ fi
+
+ cp "$programfilesdir_unix/Microsoft Reader"/msls31.dll $WINEPREFIX/drive_c/windows/system32
+}
+
+#----------------------------------------------------------------
+
load_msxml3() {
# Service Pack 5
#download http://download.microsoft.com/download/a/5/e/a5e03798-2454-4d4b-89a3-4a47579891d8/msxml3.msi
# Service Pack 7
download . http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi d4c2178dfb807e1a0267fce0fd06b8d51106d913
# http://bugs.winehq.org/show_bug.cgi?id=7849 fixed since 0.9.37
- override_dlls msxml3
+ override_dlls native,builtin msxml3
try $WINE msiexec /i $WINETRICKS_CACHE/msxml3.msi $WINETRICKS_QUIET
}
@@ -708,7 +790,7 @@ load_riched20() {
download . http://download.microsoft.com/download/winntsp/Patch/RTF/NT4/EN-US/Q249973i.EXE f0b7663f15dbd31410435483ba832318c7a70470
try cabextract --directory=$WINETRICKS_TMP $WINETRICKS_CACHE/Q249973i.EXE
try cp -f $WINETRICKS_TMP/riched??.dll $WINEPREFIX/drive_c/windows/system32
- override_dlls riched20 riched32
+ override_dlls native,builtin riched20 riched32
rm -rf $WINETRICKS_TMP/*
}
@@ -725,7 +807,7 @@ load_riched30() {
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
+ override_dlls native,builtin riched20
rm -rf $WINETRICKS_TMP/*
}
@@ -813,6 +895,17 @@ load_vcrun6() {
#----------------------------------------------------------------
+load_vcrun2003() {
+ # Load the Visual C++ 2003 runtime libraries
+ # Sadly, I know of no Microsoft URL for these
+ echo "Installing BZFlag (which comes with the Visual C++ 2003 runtimes)"
+ download . http://dl.sourceforge.net/bzflag/BZEditW32_1.6.5_Installer.exe bdd1b32c4202fd77e6513fd507c8236888b09121
+ try $WINE $WINETRICKS_CACHE/BZEditW32_1.6.5_Installer.exe $WINETRICKS_S
+ cp "$programfilesdir_unix/BZEdit1.6.5"/m*71* $WINEPREFIX/drive_c/windows/system32/
+}
+
+#----------------------------------------------------------------
+
load_vcrun2005() {
# Load the Visual C++ 2005 runtime libraries
# See http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE
@@ -902,6 +995,7 @@ do
-q) WINETRICKS_QUIET="/q"
WINETRICKS_UNIXQUIET="-q"
WINETRICKS_SILENT="/silent"
+ WINETRICKS_S="/S" # for NSIS installers
WINEDEBUG=${WINEDEBUG:-"fixme-all"}
export WINEDEBUG
;;
@@ -912,7 +1006,9 @@ do
corefonts) load_corefonts;;
dcom98) load_dcom98;;
dotnet11) load_dotnet11;;
+ dotnet20) load_dotnet20;;
ffdshow) load_ffdshow;;
+ flash) load_flash;;
gdiplus) load_gdiplus;;
gecko) load_gecko;;
icodecs) load_icodecs;;
@@ -925,6 +1021,7 @@ do
mono11) load_mono11;;
mono12) load_mono12;;
msi2) load_msi2;;
+ msls31) load_msls31;;
msxml3) load_msxml3;;
msxml4) load_msxml4;;
msxml6) load_msxml6;;
@@ -937,6 +1034,7 @@ do
vbvm50|vb5run) load_vbvm50;;
vbrun60|vb6run) load_vbrun60;;
vcrun6) load_vcrun6;;
+ vcrun2003) load_vcrun2003;;
vcrun2005) load_vcrun2005;;
vcrun2005sp1) load_vcrun2005sp1;;
vcrun2008) load_vcrun2008;;
@@ -949,9 +1047,10 @@ do
fakeie6) set_fakeie6;;
allfonts) load_corefonts; load_tahoma; load_liberation;;
allvcodecs|allcodecs) load_vcrun6; load_ffdshow; load_xvid; load_icodecs;;
- winver=nt40) set_winver nt40;;
- winver=win98) set_winver win98;;
- winver=winxp) set_winver winxp;;
+ nt40|winver=nt40) set_winver nt40;;
+ win98|winver=win98) set_winver win98;;
+ win2k|winver=win2k) set_winver win2k;;
+ winxp|winver=winxp) set_winver winxp;;
winver=) unset_winver;;
native_mdac) set_native_mdac;;
volnum) volnum;;