SHA256
1
0
forked from pool/wine

Accepting request 344254 from Emulators

- Updated to 1.7.55 development snapshot
  - Pulse audio driver
  - Various fixes for Microsoft Office 2013 support
  - Some more implementation of the Web Services DLL
  - More fixes for the latest C runtime version
  - Improvements to the Makefile generation
  - Various bug fixes
- buildrequire libpulse-devel for pulseaudio support
- updated winetricks

OBS-URL: https://build.opensuse.org/request/show/344254
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=187
This commit is contained in:
Dominique Leuenberger 2015-11-15 11:46:42 +00:00 committed by Git OBS Bridge
commit b52324b18b
7 changed files with 121 additions and 95 deletions

View File

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

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlYzbtAACgkQ9ebp7rlGHdentwCfY93eywie52ua631Fqzv3Ze7l
1VwAoKPkKxZlxWNRdXMmr+a50PlO+Ycr
=Y3a6
-----END PGP SIGNATURE-----

3
wine-1.7.55.tar.bz2 Normal file
View File

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

7
wine-1.7.55.tar.bz2.sign Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlZF9LkACgkQ9ebp7rlGHdeovACfdaLFrZ8Rt6ogJ8XI2wo+FsgE
eVMAoKsdoenGyQ+m3TboXJX5+5KlajRg
=DBO8
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Nov 13 14:50:20 UTC 2015 - meissner@suse.com
- Updated to 1.7.55 development snapshot
- Pulse audio driver
- Various fixes for Microsoft Office 2013 support
- Some more implementation of the Web Services DLL
- More fixes for the latest C runtime version
- Improvements to the Makefile generation
- Various bug fixes
- buildrequire libpulse-devel for pulseaudio support
- updated winetricks
-------------------------------------------------------------------
Fri Oct 30 13:46:11 UTC 2015 - meissner@suse.com

View File

@ -39,6 +39,7 @@ BuildRequires: libjpeg-devel
BuildRequires: liblcms2-devel
BuildRequires: libpcap-devel
BuildRequires: libpng-devel
BuildRequires: libpulse-devel
BuildRequires: libtiff-devel
BuildRequires: libv4l-devel
BuildRequires: libxml2-devel
@ -52,7 +53,7 @@ BuildRequires: sane-backends-devel
BuildRequires: update-desktop-files
BuildRequires: valgrind-devel
BuildRequires: xorg-x11-devel
Version: 1.7.54
Version: 1.7.55
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+

View File

@ -2,7 +2,7 @@
# Name of this version of winetricks (YYYYMMDD)
# (This doesn't change often, use the sha1sum of the file when reporting problems)
WINETRICKS_VERSION=20150826
WINETRICKS_VERSION=20151110
# This is a utf-8 file
# You should see an o with two dots over it here [ö]
@ -4130,6 +4130,8 @@ winetricks_init()
wine-1.4) WINETRICKS_WINE_VERSION="wine-1.4.0"; export WINETRICKS_WINE_VERSION;;
wine-1.6-*) WINETRICKS_WINE_VERSION="wine-1.6.0"; export WINETRICKS_WINE_VERSION;;
wine-1.6) WINETRICKS_WINE_VERSION="wine-1.6.0"; export WINETRICKS_WINE_VERSION;;
wine-1.8-*) WINETRICKS_WINE_VERSION="wine-1.8.0"; export WINETRICKS_WINE_VERSION;;
wine-1.8) WINETRICKS_WINE_VERSION="wine-1.8.0"; export WINETRICKS_WINE_VERSION;;
esac
WINETRICKS_WINE_MINOR=`echo $WINETRICKS_WINE_VERSION | sed 's/wine-1\.\([0-9]*\)\..*/\1/'`
WINETRICKS_WINE_MICRO=`echo $WINETRICKS_WINE_VERSION | sed 's/wine-1.[0-9][0-9]*\.\([0-9]*\).*/\1/'`
@ -4364,9 +4366,9 @@ helper_win7sp1()
#---------------------------------------------------------
w_metadata adobeair dlls \
title="Adobe AIR 15.0" \
title="Adobe AIR 19.0" \
publisher="Adobe" \
year="2014" \
year="2015" \
media="download" \
file1="AdobeAIRInstaller.exe" \
installed_file1="$W_COMMONFILES_X86_WIN/Adobe AIR/Versions/1.0/Adobe AIR.dll" \
@ -4384,7 +4386,8 @@ load_adobeair()
# http://helpx.adobe.com/en/flash-player/release-note/fp_12_air_4_release_notes.html
# 2014-09-30: 15.0 sha1sum 46341f1358bc6e0b9ddeae3591662a2ac68dc360
# 2014-11-24: i15.0.0.356 sha1sum c0e6b8b1ed5ffa282945d21b21f8a5e03febc904
w_download http://airdownload.adobe.com/air/win/download/15.0/AdobeAIRInstaller.exe c0e6b8b1ed5ffa282945d21b21f8a5e03febc904
# 2015-11-06: 19.x sha1sum 3bc2a568204a3a9b59ca347ab49585f0c5fab279
w_download http://airdownload.adobe.com/air/win/download/19.0/AdobeAIRInstaller.exe 3bc2a568204a3a9b59ca347ab49585f0c5fab279
cd "$W_CACHE"/adobeair
w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT
}
@ -4546,7 +4549,7 @@ load_comctl32ocx()
# http://www.microsoft.com/downloads/details.aspx?FamilyID=25437D98-51D0-41C1-BB14-64662F5F62FE
w_download http://download.microsoft.com/download/3/a/5/3a5925ac-e779-4b1c-bb01-af67dc2f96fc/VisualBasic6-KB896559-v1-ENU.exe f52cf2034488235b37a1da837d1c40eb2a1bad84
# More ActiveX controls. See https://support.microsoft.com/kb/297381
w_download http://activex.microsoft.com/controls/vb6/mscomct2.cab 766f9ccf8849a04d757faee379da54d635c8ac71
w_download https://web.archive.org/web/20141012205821/http://activex.microsoft.com/controls/vb6/mscomct2.cab 766f9ccf8849a04d757faee379da54d635c8ac71
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/comctl32ocx/VisualBasic6-KB896559-v1-ENU.exe
w_try cp "$W_TMP"/mscomctl.ocx "$W_SYSTEM32_DLLS"/mscomctl.ocx
@ -4566,14 +4569,14 @@ w_metadata comdlg32ocx dlls \
publisher="Microsoft" \
year="2009" \
media="download" \
file1="comdlg32.cab" \
file1="ComDlg32.cab" \
installed_file1="$W_SYSTEM32_DLLS_WIN/comdlg32.ocx"
load_comdlg32ocx()
{
# By analogy with vb5 version in http://support.microsoft.com/kb/168917
w_download http://activex.microsoft.com/controls/vb6/comdlg32.cab d4f3e193c6180eccd73bad53a8500beb5b279cbf
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/comdlg32ocx/comdlg32.cab
w_download https://web.archive.org/web/20141227220748/http://activex.microsoft.com/controls/vb6/ComDlg32.cab d4f3e193c6180eccd73bad53a8500beb5b279cbf
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/comdlg32ocx/${file1}
w_try cp "$W_TMP"/comdlg32.ocx "$W_SYSTEM32_DLLS"/comdlg32.ocx
w_try_regsvr comdlg32.ocx
}
@ -6264,8 +6267,29 @@ load_glidewrapper()
{
w_download http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe 7a9d60a18b660473742b476465e9aea7bd5ab6f8
cd "$W_CACHE/$W_PACKAGE"
# The installer opens its README in a web-browser, really annoying when doing make check/test:
# FIXME: maybe we should back up this key first?
if test ${W_OPT_UNATTENDED}
then
cat > "$W_TMP"/disable-browser.reg <<_EOF_
REGEDIT4
[HKEY_CURRENT_USER\Software\Wine\WineBrowser]
"Browsers"=""
_EOF_
w_try_regedit "$W_TMP_WIN"\\disable-browser.reg
fi
# NSIS installer
w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
if test ${W_OPT_UNATTENDED}
then
"$WINE" reg delete "HKEY_CURRENT_USER\Software\Wine\WineBrowser" /v Browsers /f || true
fi
}
#----------------------------------------------------------------
@ -6526,13 +6550,13 @@ w_metadata kindle apps \
publisher="Amazon" \
year="2015" \
media="download" \
file1="KindleForPC-installer-1.12.40996.exe" \
file1="KindleForPC-installer-1.13.42039.exe" \
installed_exe1="$W_PROGRAMS_WIN/Amazon/Kindle/Kindle.exe" \
homepage="http://www.amazon.com/gp/feature.html/?docId=1000426311"
load_kindle()
{
w_download http://kindleforpc.amazon.com/40996/KindleForPC-installer-1.12.40996.exe bda4bcbcf905da2f900a99e09fffe44dec060131
w_download http://kindleforpc.amazon.com/42039/KindleForPC-installer-1.13.42039.exe 2316102823d295fb346062e03a8bb594b93cb536
cd "$W_CACHE"/kindle
w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
w_declare_exe "$W_PROGRAMS_WIN\\Amazon\\Kindle" Kindle.exe
@ -6723,7 +6747,7 @@ w_metadata mfc40 dlls \
load_mfc40()
{
w_download http://activex.microsoft.com/controls/vc/mfc40.cab 53c570e2c811674d6e4fa46cff5a3a04cd0ffc24
w_download https://web.archive.org/web/20070316220826/http://activex.microsoft.com/controls/vc/mfc40.cab 53c570e2c811674d6e4fa46cff5a3a04cd0ffc24
w_try_cabextract -d "$W_TMP" "$W_CACHE"/mfc40/mfc40.cab
w_try_cabextract -d "$W_SYSTEM32_DLLS" -F *40.dll "$W_TMP"/mfc40.exe
}
@ -6803,18 +6827,20 @@ w_metadata msflxgrd dlls \
publisher="Microsoft" \
year="2009" \
media="download" \
file1="msflxgrd.cab" \
installed_file1="$W_SYSTEM32_DLLS_WIN/MSFlxGrd.Ocx"
file1="MsFlxGrd.cab" \
installed_file1="$W_SYSTEM32_DLLS_WIN/MSFLXGRD.OCX"
load_msflxgrd()
{
# http://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
# may 2011: f497c3b390cd80d5bcd1f13d5c0c68b206369aa7
w_download http://activex.microsoft.com/controls/vb6/msflxgrd.cab f497c3b390cd80d5bcd1f13d5c0c68b206369aa7
# 2015/11/09: Removed from Microsoft.com, archive.org has an older copy:
# 2015/11/09: 3d6c04e923781d4ce0d3ab62189b8de352ab25d5
w_download https://web.archive.org/web/20070127040448/http://activex.microsoft.com/controls/vb6/MsFlxGrd.cab 3d6c04e923781d4ce0d3ab62189b8de352ab25d5
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msflxgrd/msflxgrd.cab
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msflxgrd/${file1}
w_try cp -f "$W_TMP"/[Mm][Ss][Ff][Ll][Xx][Gg][Rr][Dd].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"
w_try_regsvr MSFlxGrd.Ocx
w_try_regsvr MSFLXGRD.OCX
}
#----------------------------------------------------------------
@ -6825,7 +6851,7 @@ w_metadata mshflxgd dlls \
year="2009" \
media="download" \
file1="MSHFLXGD.CAB" \
installed_file1="$W_SYSTEM32_DLLS_WIN/mshflxgd.ocx"
installed_file1="$W_SYSTEM32_DLLS_WIN/MSHFLXGD.OCX"
load_mshflxgd()
{
@ -6833,11 +6859,13 @@ load_mshflxgd()
# orig: 5f9c7a81022949bfe39b50f2bbd799c448bb7377
# Jan 2009: 7ad74e589d5eefcee67fa14e65417281d237a6b6
# May 2009: bd8aa796e16e5f213414af78931e0379d9cbe292
w_download http://activex.microsoft.com/controls/vb6/MSHFLXGD.CAB bd8aa796e16e5f213414af78931e0379d9cbe292
# 2015/11/09: Removed from Microsoft.com, archive.org has the original copy:
# 2015/11/09: 5f9c7a81022949bfe39b50f2bbd799c448bb7377
w_download https://web.archive.org/web/20061011041549/http://activex.microsoft.com/controls/vb6/MSHFLXGD.CAB 5f9c7a81022949bfe39b50f2bbd799c448bb7377
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/mshflxgd/MSHFLXGD.CAB
w_try cp -f "$W_TMP"/[Mm][Ss][Hh][Ff][Ll][Xx][Gg][Dd].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"
w_try_regsvr mshflxgd.ocx
w_try_regsvr MSHFLXGD.OCX
}
#----------------------------------------------------------------
@ -6912,7 +6940,9 @@ load_msmask()
# http://bugs.winehq.org/show_bug.cgi?id=2934
# old: 3c6b26f68053364ea2e09414b615dbebafb9d5c3
# May 2009: 30e55679e4a13fe4d9620404476f215f93239292
w_download http://activex.microsoft.com/controls/vb6/MSMASK32.CAB 30e55679e4a13fe4d9620404476f215f93239292
# 2015/11/09: Removed from Microsoft.com, archive.org has an older copy:
# 2015/11/09: bdd2bb3a32d18926a048f302aff18b1e6d250d9d
w_download https://web.archive.org/web/20061011040848/http://activex.microsoft.com/controls/vb6/MSMASK32.CAB bdd2bb3a32d18926a048f302aff18b1e6d250d9d
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msmask/MSMASK32.CAB
w_try cp -f "$W_TMP"/[Mm][Ss][Mm][Aa][Ss][Kk]32.[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"/msmask32.ocx
w_try_regsvr msmask32.ocx
@ -7449,7 +7479,7 @@ w_metadata richtx32 dlls \
load_richtx32()
{
w_download http://activex.microsoft.com/controls/vb6/richtx32.cab da404b566df3ad74fe687c39404a36c3e7cadc07
w_download https://web.archive.org/web/20150815181727/http://activex.microsoft.com/controls/vb6/richtx32.cab da404b566df3ad74fe687c39404a36c3e7cadc07
w_try_cabextract "$W_CACHE"/richtx32/richtx32.cab -d "$W_SYSTEM32_DLLS" -F RichTx32.ocx
w_try_regsvr RichTx32.ocx
}
@ -7543,8 +7573,9 @@ load_shockwave() {
# 2015-03-30 sha1sum: 9f2d4d929e7210ae9fb633881127b21586ffd8ce
# 2015-04-27 sha1sum: 244e6a5c5fa2dd26c136bc5b402f6cad588763d7
# 2015-08-02 sha1sum: e2efa2eb7db0a6de08905cd61bb3efcf58fda994
# 2015-11-09 sha1sum: d13420a6fdc4f8d9c45c5ee6767974f0f0054cdc
w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi e2efa2eb7db0a6de08905cd61bb3efcf58fda994
w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi d13420a6fdc4f8d9c45c5ee6767974f0f0054cdc
cd "$W_CACHE"/shockwave
w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
}
@ -7582,16 +7613,16 @@ w_metadata tabctl32 dlls \
publisher="Microsoft" \
year="2009" \
media="download" \
file1="tabctl32.cab" \
file1="TABCTL32.CAB" \
installed_file1="$W_SYSTEM32_DLLS_WIN/tabctl32.ocx"
load_tabctl32()
{
# http://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
# Nov 2012: tabctl32
w_download http://activex.microsoft.com/controls/vb6/tabctl32.cab beca51d05924a5466ab80eb0f8d0cdf8bc1ac697
w_download https://web.archive.org/web/20110818064708/http://activex.microsoft.com/controls/vb6/TABCTL32.CAB beca51d05924a5466ab80eb0f8d0cdf8bc1ac697
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/tabctl32/tabctl32.cab
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/tabctl32/${file1}
w_try cp -f "$W_TMP"/[Tt][Aa][Bb][Cc][Tt][Ll][3][2].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"
w_try_regsvr tabctl32.ocx
}
@ -8493,10 +8524,6 @@ load_xinput()
w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xinput*.dll' "$x"
done
fi
w_try_regsvr xinput1_1.dll
w_try_regsvr xinput1_2.dll
w_try_regsvr xinput1_3.dll
w_try_regsvr xinput9_1_0.dll
w_override_dlls native xinput1_1
w_override_dlls native xinput1_2
w_override_dlls native xinput1_3
@ -9282,7 +9309,7 @@ load_abiword()
#----------------------------------------------------------------
w_metadata adobe_diged apps \
title="Adobe Digital Editions" \
title="Adobe Digital Editions 1.7" \
publisher="Adobe" \
year="2011" \
media="download" \
@ -9301,6 +9328,43 @@ load_adobe_diged()
#----------------------------------------------------------------
w_metadata adobe_diged4 apps \
title="Adobe Digital Editions 4.5" \
publisher="Adobe" \
year="2015" \
media="download" \
file1="ADE_4.5_Installer.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/Adobe/Adobe Digital Editions 4.5/DigitalEditions.exe" \
homepage="http://www.adobe.com/products/digitaleditions/"
load_adobe_diged4()
{
w_download http://download.adobe.com/pub/adobe/digitaleditions/ADE_4.5_Installer.exe
if w_workaround_wine_bug 32323
then
w_call corefonts
fi
if [ ! -x "`which winbindd 2>/dev/null`" ]
then
w_warn "Adobe Digital Editions 4.5 requires winbind (part of samba) to be installed, but winbind was not detected."
fi
w_call dotnet40
#w_call win7
cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
SetTitleMatchMode, 2
run, ${file1} ${W_OPT_UNATTENDED:+ /S}
winwait, Installing Adobe Digital Editions
ControlClick, Button1 ; Don't install Norton Internet Security
ControlClick, Static19 ; Next
"
}
#----------------------------------------------------------------
w_metadata audible apps \
title="Audible.com Manager / Player" \
publisher="Audible" \
@ -10547,7 +10611,8 @@ load_python26_setuptools()
{
w_call python26
w_download https://bootstrap.pypa.io/ez_setup.py 90b05e9298b7963eaec6de050c8fc751ce6a2a29
# Not checking sha1sum, script frequently updates and there aren't stable versions
w_download https://bootstrap.pypa.io/ez_setup.py
cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "C:\Python26\python.exe" ${file1}
@ -16244,59 +16309,6 @@ load_popfs()
#----------------------------------------------------------------
w_metadata puzzleagent_demo games \
title="Puzzle Agent Demo" \
publisher="Telltale Games" \
year="2010" \
media="download" \
file1="PuzzleAgent_PC_Setup.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/Telltale Games/Puzzle Agent/Puzzle Agent/Grickle101.exe"
load_puzzleagent_demo()
{
w_download http://telltale.vo.llnwd.net/o15/games/puzzleagent/100/PuzzleAgent_PC_Setup.exe ac0012889fd80237928207c9d19b02f5968761a4
cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
Run, PuzzleAgent_PC_Setup.exe
SetTitleMatchMode, 2
WinWait,Puzzle Agent Setup, Welcome
if ( w_opt_unattended > 0 ) {
Sleep 500
ControlClick Button2 ; Next
WinWait,Puzzle Agent Setup, properly
Sleep 500
ControlClick Button5 ;DirectX
Sleep 500
ControlClick Button2 ; Next
WinWait,Puzzle Agent Setup, before
Sleep 500
ControlClick Button2 ; Agree
WinWait,Puzzle Agent Setup, different
Sleep 500
ControlClick Button2 ; Install
WinWait,Puzzle Agent Setup, your
Sleep 500
ControlClick Button4 ; Play
Sleep 500
ControlClick Button5 ; will
Sleep 500
ControlClick Button2 ; Finish
}
WinWaitClose, Puzzle Agent
"
if w_workaround_wine_bug 25210 "" 1.3.8,
then
w_call vcrun2008
fi
w_declare_exe "$W_PROGRAMS_X86_WIN\\Telltale Games\\Puzzle Agent\\Puzzle Agent" "Grickle101.exe"
}
#----------------------------------------------------------------
w_metadata qq apps \
title="QQ 7.1 (Chinese chat app)" \
publisher="Tencent" \