rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

- Updated to 1.9.7 development snapshot

Browse Source 
- More work towards the WineD3D command stream.
  - More support for Shader Model 5 shaders.
  - C++ exception handling on x86-64.
  - Support for Windows-style static import libraries.
  - Performance fixes in the XML writer.
  - Various bug fixes.
- updated winetricks

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=347
This commit is contained in:
Marcus Meissner 2016-04-01 17:41:02 +00:00 committed by Git OBS Bridge
parent de4aef7802
commit 00f74adcc3
7 changed files with 153 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wine-1.9.6.tar.bz2
View File

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

17
wine-1.9.6.tar.bz2.sign
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJW7AM5AAoJEM76yOqvF1Gdlz0QAJUhnnayLxEMh3zmdBksOxro
dnhgPzUyFwNt420vkFVMoiBoxB9w68A8/NG8Xph4NQ4s3m9X6TOnD8X0ZAy2OE5s
naoj3lLsVpWQxPRlaBhK32jIWxICoDHgdS43tB8IUNxOoR5Kvr0YLpSaao849gAi
tsMORt5VndtkFCxLTcCjBhQ3Ucjxw+NZYscqtCz3HjUmaskjDaKzn+sAOrTnvRYk
Wv+es/+ae5RaVF2kKCSQxElJ4YVwcX6k4wmtRsnlcoqMZlk/Lota3g9LyqAW0od0
K5wfG1JYT7v9XKToC3clK5y42zh8Zca6agVV6hqZiC0AtgBW+xL2zKTR41eoMf+s
5DLB5WSVR5hVEWf8FFci0f8pt62zMycUNV+te1xX12ywZ6IorcmJL0BI80ixv/dN
amClUa9tyVdzyFwj+q7hhgwEeO9f8boPK7NeM0ghH+uY5EbYwITA/tyq6XLwypoQ
T+D65UiJA36G1fSm9+RhBMjSdQP9TYG/4SWdoMHs5N1w8OxL1F98RJKATBsStYWG
+8Qn1LkmXc7BMOfcTdZu7ndVh2CQYwq9K2itwnF+Tl39B9KD1Wf4MSwqzdsHFrq6
3srDtU3vsgXE/RpG44Gb67aIAIr6yJGGJ+IlKgTJta+aJYmOmL+Q7xm6PbMPhHKG
8qiacCEii3IIYhVC44/x
=FpIi
-----END PGP SIGNATURE-----

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

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

17
wine-1.9.7.tar.bz2.sign Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJW/o20AAoJEM76yOqvF1GdYgQP+wR68qqXdb3uTsVoQ5zyD+8P
7Y6HYp+xiNjwK0vFc3jZROMrJpSuSE641q2FF7CTvcyjkSty8T5hpVik7H9V4IjQ
6KRR86RDBtVktJ5eXu6Ij+b3aK1T5QTktstqtrGtth158GtOn3REopx33c8Anfd9
w9JAvqLWhhsAkWTQQvhg2CBtLEFAgV7f4d/0SkhrDM7xbbSuvJstRzqYzD5e6Gbf
csnqzm8IHzpbynkkDVCoIaDlMXwGVv82PSPsqfIUEg78OhuP2kIW0vGmE43Z1wdC
MMdWq0/W+HMY84JNLxk91Ld44rkV6A42oUFpaQguKCuJnxmAZh8wC0nHs4EcU/+k
xBlc9btmKcTWqAUUaogaZ96ldTCEfEB3RQbxFkMhRPlndoSxyq2JPgr+8W66j7gl
JeiBAQpfeghT60bY2rGidNtrK/WbAmc/nDkN2vzX+PrTJ1kfgIxRMeJPiumtFnu6
i7FmYoVPCFiZekpSp7v9lwq7+uUsvaAIVT0GZ6btROM1+FsYKy8DHt0hOSXd9Ne2
E9rBHUyZC3h5CyViyjazqo60pGTJlSlH5Lr1lZuyKAh2dejcCfQr0e+sNS5DmbaN
SHTWKqrxWumiRWgVa8YHR2LM2Y3pAgvfCH6ullnEpvjhYUKgEacxZLk4ferUtaQ5
vfLsv45Vrvve4u0JxIA1
=SJZ0
-----END PGP SIGNATURE-----

12
wine.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Apr 1 17:24:29 UTC 2016 - meissner@suse.com
- Updated to 1.9.7 development snapshot
- More work towards the WineD3D command stream.
- More support for Shader Model 5 shaders.
- C++ exception handling on x86-64.
- Support for Windows-style static import libraries.
- Performance fixes in the XML writer.
- Various bug fixes.
- updated winetricks
-------------------------------------------------------------------
Fri Mar 18 14:24:51 UTC 2016 - meissner@suse.com

4
wine.spec
View File

@ -53,8 +53,8 @@ BuildRequires: sane-backends-devel
BuildRequires: update-desktop-files
BuildRequires: valgrind-devel
BuildRequires: xorg-x11-devel
%define realver 1.9.6
Version: 1.9.6
%define realver 1.9.7
Version: 1.9.7
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+

142
winetricks
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=20160311
WINETRICKS_VERSION=20160329
# This is a utf-8 file
# You should see an o with two dots over it here [ö]
@ -539,7 +539,7 @@ winetricks_wget_progress()
# Usa a subshell so if the user clicks 'Cancel',
# the --auto-kill kills the subshell, not the current shell
(
wget "$@" 2>&1 |
${torify} wget "$@" 2>&1 |
winetricks_parse_wget_progress | \
$WINETRICKS_GUI --progress --width 400 --title="$_W_file" --auto-kill --auto-close
)
@ -559,7 +559,7 @@ winetricks_wget_progress()
fi
return $err
;;
*) wget "$@" ;;
*) ${torify} wget "$@" ;;
esac
}
@ -703,10 +703,26 @@ w_download_to()
*) _W_agent= ;;
esac
if [ -x "`which aria2c 2>/dev/null`" ]
case "$WINETRICKS_OPT_TORIFY" in
1) torify=torify ; if [ ! -x "$(which torify 2>/dev/null)" ] ; then
w_die "--torify was used, but torify is not installed, please install it." ; exit 1 ; fi ;;
*) torify= ;;
esac
if [ -x "$(which aria2c 2>/dev/null)" ] && [ ! "$WINETRICKS_OPT_TORIFY" ]
then
# Basic aria2c support.
aria2c -c -d "$_W_cache" -o "$_W_file" "$_W_url"
# (Slightly fancy) aria2c support
# See https://github.com/Winetricks/winetricks/issues/612
# --daemon=false --enable-rpc=false to ensure aria2c doesnt go into the background after starting
# and prevent any attempts to rebind on the RPC interface specified in someone's config.
# --input-file='' if the user config has a input-file specified then aria2 will read it and
# attempt to download everything in that input file again.
# --save-session='' if the user has specified save-session in their config, their session will be
# ovewritten by the new aria2 process
# http-accept-gzip=true (still needed) ?
# Note: torify is broken with aria2c, see https://github.com/tatsuhiro-t/aria2/issues/153
aria2c --continue --daemon=false --dir "$_W_cache" --enable-rpc=false --input-file='' \
--max-connection-per-server=5 --out "$_W_file" --save-session='' --stream-piece-selector=geom "$_W_url"
elif [ -x "`which wget 2>/dev/null`" ]
then
# Use -nd to insulate ourselves from people who set -x in WGETRC
@ -726,7 +742,7 @@ w_download_to()
then
# curl doesn't get filename from the location given by the server!
# fortunately, we know it
curl -L -o "$_W_file" -C - \
$torify curl -L -o "$_W_file" -C - \
--header "Accept-Encoding: gzip,deflate" \
${_W_cookiejar:+--cookie "$_W_cookiejar"} \
${_W_agent:+--user-agent "$_W_agent"} \
@ -3870,6 +3886,7 @@ winetricks_set_unattended()
# Might want to trim our stable of variables here a bit...
W_UNATTENDED_DASH_Q="-q"
W_UNATTENDED_SLASH_Q="/q"
W_UNATTENDED_SLASH_QB="/qb"
W_UNATTENDED_SLASH_QN="/qn"
W_UNATTENDED_SLASH_QNT="/qnt"
W_UNATTENDED_SLASH_QT="/qt"
@ -3882,6 +3899,7 @@ winetricks_set_unattended()
W_OPT_UNATTENDED=""
W_UNATTENDED_DASH_Q=""
W_UNATTENDED_SLASH_Q=""
W_UNATTENDED_SLASH_QB=""
W_UNATTENDED_SLASH_QN=""
W_UNATTENDED_SLASH_QNT=""
W_UNATTENDED_SLASH_QT=""
@ -4219,6 +4237,7 @@ Tilvalg:
-k|--keep_isos: lagr iso'er lokalt (muliggør senere installation uden disk)
-q|--unattended: stil ingen spørgsmål, installér bare automatisk
-r|--ddrescue: brug alternativ disk-tilgangsmetode (hjælper i tilfælde af en ridset disk)
-t|--torify: Run downloads under torify, if available
-v|--verbose: vis alle kommandoer som de bliver udført
-V|--version: vis programversionen og afslut
-h|--help: vis denne besked og afslut
@ -4245,6 +4264,7 @@ Optionen:
-q, --unattended Keine Fragen stellen, alles automatisch installieren
-r, --ddrescue Alternativer Zugriffsmodus (hilft bei zerkratzten Disks)
--showbroken Auch Verben anzeigen die momentan in Wine nicht funktionieren
-t --torify Run downloads under torify, if available
--verify Wenn Möglisch automatische GUI Tests für Verben starten
-v, --verbose Alle ausgeführten Kommandos anzeigen
-h, --help Diese Hilfemeldung anzeigen
@ -4279,6 +4299,7 @@ Options:
-q, --unattended Don't ask any questions, just install automatically
-r, --ddrescue Retry hard when caching scratched discs
--showbroken Even show verbs that are currently broken in wine
-t --torify Run downloads under torify, if available
--verify Run (automated) GUI tests for verbs, if available
-v, --verbose Echo all commands as they are executed
-h, --help Display this message and exit
@ -4308,6 +4329,7 @@ winetricks_handle_option()
-r|--ddrescue) WINETRICKS_OPT_DD=ddrescue ;;
-k|--keep_isos) WINETRICKS_OPT_KEEPISOS=1 ;;
-q|--unattended) winetricks_set_unattended 1 ;;
-t|--torify) WINETRICKS_OPT_TORIFY=1 ;;
-v|--verbose) WINETRICKS_OPT_VERBOSE=1 ; set -x;;
-vv|--really-verbose) WINETRICKS_OPT_VERBOSE=2 ; set -x ;;
-V|--version) winetricks_print_version ; exit 0;;
@ -5851,7 +5873,7 @@ load_dotnet30sp1()
"$WINE" reg add "HKLM\\Software\\Microsoft\\Net Framework Setup\\NDP\\v3.0" /v Version /t REG_SZ /d "3.0" /f
"$WINE" reg add "HKLM\\Software\\Microsoft-\\Net Framework Setup\\NDP\\v3.0" /v SP /t REG_DWORD /d 0001 /f
w_try "$WINE" msiexec /i "XPSEP XP and Server 2003 32 bit.msi" ${W_OPT_UNATTENDED:+/qb}
w_try "$WINE" msiexec /i "XPSEP XP and Server 2003 32 bit.msi" ${W_UNATTENDED_SLASH_QB}
"$WINE" sc delete FontCache3.0.0.0
"$WINE" $file1 ${W_OPT_UNATTENDED:+/q}
@ -8043,7 +8065,7 @@ load_vcrun2003()
# Sadly, I know of no Microsoft URL for these
echo "Installing BZFlag (which comes with the Visual C++ 2003 runtimes)"
# winetricks-test can't handle ${file1} in url since it does a raw parsing :/
w_download $WINETRICKS_SOURCEFORGE/bzflag/BZEditW32_1.6.5.exe bdd1b32c4202fd77e6513fd507c8236888b09121
w_download https://sourceforge.net/projects/bzflag/files/bzedit%20win32/1.6.5/BZEditW32_1.6.5.exe bdd1b32c4202fd77e6513fd507c8236888b09121
w_try "$WINE" "$W_CACHE"/vcrun2003/${file1} $W_UNATTENDED_SLASH_S
w_try cp "$W_PROGRAMS_X86_UNIX/BZEdit1.6.5"/m*71* "$W_SYSTEM32_DLLS"
}
@ -8242,6 +8264,11 @@ load_vcrun2015()
# 2015/10/12: bfb74e498c44d3a103ca3aa2831763fb417134d1
w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe bfb74e498c44d3a103ca3aa2831763fb417134d1
if w_workaround_wine_bug 37781
then
w_warn "This may fail in non-XP mode, see https://bugs.winehq.org/show_bug.cgi?id=37781"
fi
w_override_dlls native,builtin atl140 msvcp140 msvcr140 vcomp140
cd "$W_CACHE"/"$W_PACKAGE"
w_try "$WINE" vc_redist.x86.exe $W_UNATTENDED_SLASH_Q
@ -8268,7 +8295,8 @@ load_vcrun2015()
cp "$W_TMP"/vcomp140.dll "$W_SYSTEM64_DLLS"/vcomp140.dll
cp "$W_TMP"/vcruntime140.dll "$W_SYSTEM64_DLLS"/vcruntime140.dll
w_override_dlls native,builtin api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0.dll api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 ucrtbase vcruntime140
w_override_dlls native,builtin api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0.dll api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 ucrtbase vcruntime140
cp "$W_TMP"/api_ms_win_crt_conio_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-conio-l1-1-0.dll
cp "$W_TMP"/api_ms_win_crt_heap_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-heap-l1-1-0.dll
cp "$W_TMP"/api_ms_win_crt_locale_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-locale-l1-1-0.dll
cp "$W_TMP"/api_ms_win_crt_math_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-math-l1-1-0.dll
@ -8311,6 +8339,8 @@ load_vjrun20()
#----------------------------------------------------------------
# FIXME: two exe's, one for win64, one for win32..
w_metadata windowscodecs dlls \
title="MS Windows Imaging Component" \
publisher="Microsoft" \
@ -8321,10 +8351,25 @@ w_metadata windowscodecs dlls \
load_windowscodecs()
{
w_download http://download.microsoft.com/download/f/f/1/ff178bb1-da91-48ed-89e5-478a99387d4f/wic_x86_enu.exe 53c18652ac2f8a51303deb48a1b7abbdb1db427f
# separate 32/64 bit installers:
if [ "$W_ARCH" = "win32" ] ; then
# https://www.microsoft.com/en-us/download/details.aspx?id=32
w_download http://download.microsoft.com/download/f/f/1/ff178bb1-da91-48ed-89e5-478a99387d4f/wic_x86_enu.exe 53c18652ac2f8a51303deb48a1b7abbdb1db427f
EXE="wic_x86_enu.exe"
else
# https://www.microsoft.com/en-us/download/details.aspx?id=1385
w_download https://download.microsoft.com/download/6/4/5/645FED5F-A6E7-44D9-9D10-FE83348796B0/wic_x64_enu.exe 4bdbf76a7bc96453306c893b4a7b2b8ae6127f67
EXE="wic_x64_enu.exe"
fi
# Avoid a file existence check.
rm -f "$W_SYSTEM32_DLLS"/windowscodecs.dll "$W_SYSTEM32_DLLS"/windowscodecsext.dll "$W_SYSTEM32_DLLS"/photometadatahandler.dll
w_try rm -f "$W_SYSTEM32_DLLS"/windowscodecs.dll "$W_SYSTEM32_DLLS"/windowscodecsext.dll "$W_SYSTEM32_DLLS"/photometadatahandler.dll
if [ "$W_ARCH" = "win64" ]
then
w_try rm -f "$W_SYSTEM64_DLLS"/windowscodecs.dll "$W_SYSTEM64_DLLS"/windowscodecsext.dll "$W_SYSTEM64_DLLS"/photometadatahandler.dll
fi
# AF says in appdb entry for .net 3.0 that windowscodecs has to be native only
w_override_dlls native windowscodecs windowscodecsext
@ -8339,7 +8384,7 @@ load_windowscodecs()
else
TASKSET=""
fi
w_try $TASKSET "$WINE" wic_x86_enu.exe /passive
w_try $TASKSET "$WINE" "$EXE" /passive
}
#----------------------------------------------------------------
@ -8675,8 +8720,13 @@ w_metadata xna40 dlls \
load_xna40()
{
w_warn "xna40 does not install properly in wine yet"
w_call dotnet40
if w_workaround_bug 30718
then
w_warn "$W_PACKAGE may not install properly in wine yet"
fi
w_call dotnet45
# http://www.microsoft.com/en-us/download/details.aspx?id=20914
w_download http://download.microsoft.com/download/A/C/2/AC2C903B-E6E8-42C2-9FD7-BEBAC362A930/xnafx40_redist.msi 49efdc29f65fc8263c196338552c7009fc96c5de
cd "$W_CACHE/$W_PACKAGE"
@ -9649,7 +9699,7 @@ load_controlspy()
{
w_download http://download.microsoft.com/download/a/3/1/a315b133-03a8-4845-b428-ec585369b285/ControlSpy.msi efe33701f78b5853ba73353f028b777b4c849e77
cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec /i ControlSpy.msi ${W_OPT_UNATTENDED:+/qb}
w_try "$WINE" msiexec /i ControlSpy.msi ${W_UNATTENDED_SLASH_QB}
}
#----------------------------------------------------------------
@ -9691,14 +9741,14 @@ load_dxdiag()
w_metadata emu8086 apps \
title="emu8086" \
publisher="emu8086.com" \
year="2013" \
year="2015" \
media="download" \
file1="emu8086.zip" \
file1="emu8086v408r11.zip" \
installed_exe1="c:/emu8086/emu8086.exe"
load_emu8086()
{
w_download http://emu8086.com/emu8086.zip fa3b2451cbc46fd2e3aa2670fa4d81ae8e75c7db
w_download http://www.emu8086.com/files/emu8086v408r11.zip aa71b46ee9259e5b31a300c820277e551969da7b
w_try_unzip "$W_TMP" "$W_CACHE/$W_PACKAGE"/$file1
w_try "$WINE" "$W_TMP/Setup.exe" $W_UNATTENDED_SLASH_SILENT
}
@ -9710,7 +9760,7 @@ w_metadata ev3 apps \
publisher="Lego" \
year="2014" \
media="download" \
file1="LMS-EV3-WIN32-ENUS-01-01-01-full-setup.exe" \
file1="LMS-EV3-WIN32-ENUS-01-02-01-full-setup.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/LEGO Software/LEGO MINDSTORMS EV3 Home Edition/MindstormsEV3.exe"
load_ev3()
@ -9727,10 +9777,20 @@ load_ev3()
w_call dotnet40
w_download http://esd.lego.com.edgesuite.net/digitaldelivery/mindstorms/6ecda7c2-1189-4816-b2dd-440e22d65814/public/LMS-EV3-WIN32-ENUS-01-01-01-full-setup.exe 855c914d9a3cf0f4793a046872658fd661389671
# 2016-02-18: LMS-EV3-WIN32-ENUS-01-01-01-full-setup.exe 855c914d9a3cf0f4793a046872658fd661389671
# 2016-03-22: LMS-EV3-WIN32-ENUS-01-02-01-full-setup.exe f4f077befd837e8f5716dbd134dc6828d6c4cc77
w_download http://esd.lego.com.edgesuite.net/digitaldelivery/mindstorms/6ecda7c2-1189-4816-b2dd-440e22d65814/public/LMS-EV3-WIN32-ENUS-01-02-01-full-setup.exe f4f077befd837e8f5716dbd134dc6828d6c4cc77
if [ $W_UNATTENDED_SLASH_Q ]
then
quiet="$W_UNATTENDED_SLASH_QB /AcceptLicenses yes"
else
quiet=""
fi
cd "$W_CACHE"/"$W_PACKAGE"
w_try "$WINE" LMS-EV3-WIN32-ENUS-01-01-01-full-setup.exe
w_try "$WINE" "$file1" ${quiet}
if w_workaround_wine_bug 40174 "Setting override for urlmon.dll to native to avoid crash"
then
@ -10284,6 +10344,42 @@ load_mspaint()
#----------------------------------------------------------------
w_metadata mt4 apps \
title="Meta Trader 4" \
year="2005" \
media="download" \
file1="mt4setup.exe"
load_mt4()
{
w_download https://download.mql5.com/cdn/web/metaquotes.software.corp/mt4/mt4setup.exe 07c094fc95916ba2b8d0282795717db3f4a5a9ba
if w_workaround_wine_bug 7156 "${title} needs wingdings.ttf, installing opensymbol"
then
w_call opensymbol
fi
# Opens a webpage
WINEDLLOVERRIDES="winebrowser.exe="
export WINEDLLOVERRIDES
# No documented silent install option, unfortunately..
cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
Run, ${file1}
WinWait, MetaTrader 4 Setup, license agreement
ControlClick, Button1
Sleep 100
ControlClick, Button3
WinWait, MetaTrader 4 Setup, Installation successfully completed
ControlClick, Button4
Process, Wait, terminal.exe
Process, Close, terminal.exe
"
}
#----------------------------------------------------------------
w_metadata nook apps \
title="Nook for PC (e-book reader)" \
publisher="Barnes & Noble" \
@ -10544,7 +10640,7 @@ load_psdk2003()
# Sanity check...
w_verify_sha1sum 6376ab5394226f426366d0646bf244d26156697b PSDK-x86.msi
w_try "$WINE" msiexec /i PSDK-x86.msi ${W_OPT_UNATTENDED:+/qb}
w_try "$WINE" msiexec /i PSDK-x86.msi ${W_UNATTENDED_SLASH_QB}
}
#----------------------------------------------------------------