SHA256
1
0
forked from pool/wine

Accepting request 42209 from Emulators

Copy from Emulators/wine based on submit request 42209 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/42209
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=79
This commit is contained in:
OBS User autobuild 2010-06-29 15:32:51 +00:00 committed by Git OBS Bridge
commit e5354339d6
6 changed files with 1035 additions and 57 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f6b322619710f0f4af693db7cdec222dcd08e6a27dc1857c6822dcf38d73ff88
size 17617080

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c3e4ce01c1d9de96bbe556b0fd812bfbcaf241448150096964c56ed95e6e6c2f
size 17678041

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jun 25 22:31:16 CEST 2010 - meissner@suse.de
- updated to 1.2 rc5
- Many translation updates.
- A lot of bug fixes.
- updated winetricks to current state (minor bugfixes)
- updated wisotools to current state
-------------------------------------------------------------------
Tue Jun 22 11:06:18 CEST 2010 - meissner@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package wine (Version 1.1.47_1.2rc4)
# spec file for package wine (Version 1.1.48_1.2rc5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -22,8 +22,8 @@ BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils
License: LGPLv2.1+
Group: System/Emulators/PC
AutoReqProv: on
Version: 1.1.47_1.2rc4
Release: 2
Version: 1.1.48_1.2rc5
Release: 1
Summary: An MS Windows Emulator
Url: http://www.winehq.com
Source0: wine-%version.tar.bz2
@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/applications/*.desktop
%dir /usr/share/desktop-directories/
/usr/share/desktop-directories/*.directory
%dir /usr/share/icons/hicolor
%dir /usr/share/icons/hicolor/scalable
%dir /usr/share/icons/hicolor/scalable/apps
/usr/share/icons/hicolor/scalable/apps/*.svg
%ifarch %ix86

View File

@ -20,7 +20,7 @@
#---- Constants -------------------------------------------------
# Name of this version of winetricks (YYYYMMDD)
VERSION=20100526
VERSION=20100618
early_wine()
{
@ -205,6 +205,7 @@ usage() {
echo " dotnet20sp2 MS .NET 2.0 sp2 (requires Windows license, but does not check for one)"
echo " dotnet30 MS .NET 3.0 (requires Windows license, but does not check for one, might not work yet)"
echo " droid Droid fonts (on LCD, looks better with fontsmooth-rgb)"
echo " dxsdk_nov2006 DirectX Software Development Kit, November 2006 version"
echo " ffdshow ffdshow video codecs"
echo " firefox Firefox web browser"
echo " flash Adobe Flash Player ActiveX and firefox plugins"
@ -284,6 +285,7 @@ usage() {
echo " vjrun20 MS Visual J# 2.0 SE libraries (requires dotnet20)"
echo " vlc VLC media player"
echo " wenquanyi WenQuanYi CJK font (on LCD looks better with fontsmooth-rgb)"
echo " windowscodecs MS Windows Imaging Component"
echo " wininet MS wininet.dll (requires Windows license, but does not check for one)"
echo " wme9 MS Windows Media Encoder 9 (requires Windows license, but does not check for one)"
echo " wmp10 MS Windows Media Player 10 (requires Windows license, but does not check for one)"
@ -1324,6 +1326,7 @@ load_directx9() {
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 native dxdiag.exe
override_dlls builtin d3d8 d3d9 dinput dinput8 dsound
# Should be below, but fails on Wine when used silently.
@ -1353,8 +1356,9 @@ load_divx() {
# 7.0.? 786aef0f421df5e7358d2d740d9911f9afd055de as of 24 June 2009 as http://download.divx.com/divx/DivXInstaller.exe
# 7.0.? ad420bf8bf72e924e658c9c6ad6bba76b848fb79 as of 23 Sep 2009 as http://download.divx.com/divx/DivXInstaller.exe
# 7.0.? 3385aa8f6ba64ae32e06f651bbbea247bcc1a44d as of 12 Dec 2009 as http://download.divx.com/divx/DivXInstaller.exe
# d59422969a72790e92b6795e24e332f91ffacf94 as of 26 May 2010 as http://download.divx.com/divx/DivXInstaller.exe
download divx-7 http://download.divx.com/divx/DivXInstaller.exe 3385aa8f6ba64ae32e06f651bbbea247bcc1a44d
download divx-7 http://download.divx.com/divx/DivXInstaller.exe d59422969a72790e92b6795e24e332f91ffacf94
try $WINE "$WINETRICKS_CACHE"/divx-7/DivXInstaller
}
@ -1574,6 +1578,15 @@ load_droid() {
#----------------------------------------------------------------
load_dxsdk_nov2006() {
download . http://download.microsoft.com/download/9/e/5/9e5bfc66-a621-4e0d-8bfe-6688058c3f00/dxsdk_aug2006.exe
load_vcrun6 # for mfc42u
echo "Be patient, the 'installing new services' step at the end takes about five minutes"
try $WINE "$WINETRICKS_CACHE"/dxsdk_aug2006.exe
}
#----------------------------------------------------------------
load_dsoundbug9612() {
echo "Enabling DirectSound workaround for bug #9612"
cat > "$WINETRICKS_TMP"/dsoundmaxshadow.reg <<_EOF_
@ -2602,21 +2615,21 @@ load_ole2() {
load_openwatcom() {
# http://www.openwatcom.org
download . "http://ftp.openwatcom.org/ftp/open-watcom-c-win32-1.8.exe" 44afd1fabfdf0374f614f054824e60ac560f9dc0
download . "http://ftp.openwatcom.org/ftp/open-watcom-c-win32-1.9.exe" 236ac33ebd463006be4ecd83d7ebea1c026eb55a
if [ $WINETRICKS_QUIET ]
then
# Options documented at http://bugzilla.openwatcom.org/show_bug.cgi?id=898
# But they don't seem to work on wine, so jam them into setup.inf
# Pick smallest installation that supports 16 bit C and C++
cd "$WINETRICKS_TMP"
cp "$WINETRICKS_CACHE"/open-watcom-c-win32-1.8.exe .
try_unzip open-watcom-c-win32-1.8.exe setup.inf
cp "$WINETRICKS_CACHE"/open-watcom-c-win32-1.9.exe .
try_unzip open-watcom-c-win32-1.9.exe setup.inf
sed -i 's/tools16=.*/tools16=true/' setup.inf
try zip -f open-watcom-c-win32-1.8.exe
try $WINE open-watcom-c-win32-1.8.exe -s
try zip -f open-watcom-c-win32-1.9.exe
try $WINE open-watcom-c-win32-1.9.exe -s
cd "$olddir"
else
try $WINE "$WINETRICKS_CACHE"/open-watcom-c-win32-1.8.exe
try $WINE "$WINETRICKS_CACHE"/open-watcom-c-win32-1.9.exe
fi
if test ! -f "$DRIVE_C"/WATCOM/binnt/wcc.exe
then
@ -3151,7 +3164,7 @@ load_vjrun20() {
then
try $WINE "$WINETRICKS_CACHE"/vjrun20/vjredist.exe /q /C:"install /QNT"
else
try $WINE vjrun20/vjredist.exe
try $WINE "$WINETRICKS_CACHE"/vjrun20/vjredist.exe
fi
}
@ -3574,6 +3587,21 @@ load_vlc() {
#----------------------------------------------------------------
load_windowscodecs() {
download . http://download.microsoft.com/download/f/f/1/ff178bb1-da91-48ed-89e5-478a99387d4f/wic_x86_enu.exe 53c18652ac2f8a51303deb48a1b7abbdb1db427f
# Avoid a file existence check.
rm -f "$WINDIR"/system32/windowscodecs.dll
override_dlls native,builtin windowscodecs
# Always run the WIC installer in passive mode.
# See http://bugs.winehq.org/show_bug.cgi?id=16876 and
# http://bugs.winehq.org/show_bug.cgi?id=23232
try $WINE "$WINETRICKS_CACHE"/wic_x86_enu.exe /passive
}
#----------------------------------------------------------------
load_wininet() {
# This is an updated wininet from IE 5.0.1.
# (Good enough for Active Worlds browser. Also helps "Avatar - Legends of the Arena" get to login screen.)
@ -3826,6 +3854,7 @@ then
else
winefontsdir="$WINDIR"/Fonts
fi
mkdir -p "${winefontsdir}"
# Mac folks tend to not have sha1sum, but we can make do with openssl
if [ -x "`which sha1sum 2>/dev/null`" ]
@ -3885,6 +3914,7 @@ do
dotnet3|dotnet30) load_dotnet30; load_fontfix;;
dotnet35) load_dotnet35; load_fontfix;;
droid) load_droid;;
dxsdk_nov2006) load_dxsdk_nov2006;;
ffdshow) load_ffdshow;;
firefox|firefox3) load_firefox;;
flash) load_flash;;
@ -3969,6 +3999,7 @@ do
vjrun20) load_vjrun20;;
vlc) load_vlc;;
wenquanyi) load_wenquanyi;;
windowscodecs|wic) load_windowscodecs;;
wininet) load_wininet;;
wme9) load_wme9;;
wmp9) load_wmp9;;

1019
wisotool

File diff suppressed because it is too large Load Diff