Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2017-05-06 18:29:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine" Sat May 6 18:29:45 2017 rev:225 rq:491754 version:2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2017-04-11 09:39:16.422998919 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2017-05-06 18:29:50.997546724 +0200 @@ -1,0 +2,16 @@ +Wed Apr 19 07:55:57 UTC 2017 - [email protected] + +- Enable mp3 support (buildrequire mpg123-devel) + +------------------------------------------------------------------- +Fri Apr 14 10:50:04 UTC 2017 - [email protected] + +- Update to 2.6 development snapshot + - Multi-threaded command stream in Direct3D. + - More Shader Model 5 instructions. + - More support for 3D textures. + - Better font transformations in DirectWrite. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- Old: ---- wine-2.5.tar.xz wine-2.5.tar.xz.sign New: ---- wine-2.6.tar.xz wine-2.6.tar.xz.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.UpwlHA/_old 2017-05-06 18:29:53.049257218 +0200 +++ /var/tmp/diff_new_pack.UpwlHA/_new 2017-05-06 18:29:53.053256653 +0200 @@ -44,6 +44,9 @@ BuildRequires: libv4l-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: mpg123-devel +%endif BuildRequires: ncurses-devel BuildRequires: openal-soft-devel BuildRequires: openldap2-devel @@ -54,8 +57,8 @@ BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(libudev) -%define realver 2.5 -Version: 2.5 +%define realver 2.6 +Version: 2.6 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ ++++++ wine-2.5.tar.xz -> wine-2.6.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-2.5.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-2.6.tar.xz differ: char 26, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.UpwlHA/_old 2017-05-06 18:29:53.253228437 +0200 +++ /var/tmp/diff_new_pack.UpwlHA/_new 2017-05-06 18:29:53.261227308 +0200 @@ -1515,7 +1515,7 @@ # other_files # Extra installer files, in one string, space-separated. # reader_control -# If set, the control id of the configuration panel checkbox controling +# If set, the control id of the configuration panel checkbox controlling # Adobe Reader installation. # Some games don't have it, some games do with different ids. # run_command @@ -3032,9 +3032,9 @@ ;; de*) _W_msg_title="Winetricks - wineprefix auswählen" _W_msg_body='Was möchten Sie tun?' - _W_msg_apps='Eine Programm installieren' + _W_msg_apps='Ein Programm installieren' _W_msg_games='Ein Spiel installieren' - _W_msg_benchmarks='Ein Benchmark installieren' + _W_msg_benchmarks='Einen Benchmark-Test installieren' _W_msg_default="Standard wineprefix auswählen" _W_msg_unattended0="Automatische Installation deaktivieren" _W_msg_unattended1="Automatische Installation aktivieren" @@ -3716,7 +3716,7 @@ unset _W_msg_body _W_msg_title } -# Converts a metadata abolute path to its app code +# Converts a metadata absolute path to its app code winetricks_metadata_basename() { # Classic, but too slow on cygwin @@ -4524,9 +4524,12 @@ ;; esac - # FIXME: wrong on 64-bit Windows for now W_COMMONFILES_X86_WIN="$(w_expand_env CommonProgramFiles)" + # CommonProgramW6432 is only defined on win64, not win32 arches + W_COMMONFILES_WIN="$(w_expand_env CommonProgramW6432)" + W_COMMONFILES_WIN="${W_COMMONFILES_WIN:-$W_COMMONFILES_X86_WIN}" + W_WINDIR_UNIX="$W_DRIVE_C/windows" # FIXME: move that tr into w_pathconv, if it's still needed? @@ -4573,7 +4576,7 @@ # shellcheck disable=SC2034 W_SYSTEM64_DLLS_WIN64="C:\\windows\\system32" # path to access 64-bit dlls from 64-bit apps # 64-bit prefixes still have plenty of issues: - w_warn "You are using a 64-bit WINEPREFIX. If you encounter problems, please retest in a clean 32-bit WINEPREFIX before reporting a bug." + w_warn "You are using a 64-bit WINEPREFIX. Note that many verbs only install 32-bit versions of packages. If you encounter problems, please retest in a clean 32-bit WINEPREFIX before reporting a bug." else W_ARCH=win32 W_SYSTEM32_DLLS="$W_WINDIR_UNIX/system32" @@ -4975,7 +4978,9 @@ #---------------------------------------------------------------- #----- common download for several verbs +# Note: please put a file list $(cabextract -l $foo) / $(unzip -l $foo) at ./misc/filelists/${helper}.txt +# Filelist at ./misc/filelists/directx-feb2010.txt helper_directx_dl() { # February 2010 DirectX 9c User Redistributable @@ -4987,6 +4992,7 @@ DIRECTX_NAME=directx_feb2010_redist.exe } +# Filelist at ./misc/filelists/directx-jun2010.txt helper_directx_Jun2010() { # June 2010 DirectX 9c User Redistributable @@ -4996,6 +5002,7 @@ DIRECTX_NAME=directx_Jun2010_redist.exe } +# Filelist at ./misc/filelists/directx-feb2010.txt helper_d3dx9_xx() { dllname=d3dx9_$1 @@ -5020,6 +5027,7 @@ w_override_dlls native "$dllname" } +# Filelist at ./misc/filelists/win2ksp4.txt helper_win2ksp4() { filename=$1 @@ -5029,6 +5037,7 @@ w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/win2ksp4/W2KSP4_EN.EXE } +# Filelist at ./misc/filelists/winxpsp3.txt helper_winxpsp3() { filename=$1 @@ -5046,6 +5055,7 @@ w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe } +# Filelist at ./misc/filelists/win7sp1.txt helper_win7sp1() { filename=$1 @@ -5056,6 +5066,17 @@ w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/win7sp1/windows6.1-KB976932-X86.exe } +# Filelist at ./misc/filelists/win7sp1_x64.txt +helper_win7sp1_x64() +{ + filename=$1 + + # https://www.microsoft.com/en-us/download/details.aspx?id=5842 + w_download_to win7sp1 https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X64.exe f4d1d418d91b1619688a482680ee032ffd2b65e420c6d2eaecf8aa3762aa64c8 + + w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/win7sp1/windows6.1-KB976932-X64.exe +} + #--------------------------------------------------------- w_metadata adobeair dlls \ @@ -6998,6 +7019,12 @@ helper_win7sp1 x86_microsoft-windows-e..estorageengine-isam_31bf3856ad364e35_6.1.7601.17514_none_f3ebb0cc8a4dd814/esent.dll w_try cp "$W_TMP/x86_microsoft-windows-e..estorageengine-isam_31bf3856ad364e35_6.1.7601.17514_none_f3ebb0cc8a4dd814/esent.dll" "$W_SYSTEM32_DLLS/esent.dll" + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-e..estorageengine-isam_31bf3856ad364e35_6.1.7601.17514_none_500a4c5042ab494a/esent.dll + w_try cp "$W_TMP/amd64_microsoft-windows-e..estorageengine-isam_31bf3856ad364e35_6.1.7601.17514_none_500a4c5042ab494a/esent.dll" "$W_SYSTEM64_DLLS/esent.dll" + fi + w_override_dlls native,builtin esent } @@ -7086,6 +7113,12 @@ helper_win7sp1 x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll w_try cp "$W_TMP/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll" "$W_SYSTEM32_DLLS/gdiplus.dll" + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_2b24536c71ed437a/gdiplus.dll + w_try cp "$W_TMP/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_2b24536c71ed437a/gdiplus.dll" "$W_SYSTEM64_DLLS/gdiplus.dll" + fi + # For some reason, native, builtin isn't good enough...? w_override_dlls native gdiplus } @@ -7370,20 +7403,27 @@ year="2003" \ media="download" \ file1="jet40sp8_9xnt.exe" \ - installed_file1="$W_COMMONFILES_X86_WIN/Microsoft Shared/dao/dao360.dll" + installed_file1="$W_COMMONFILES_WIN/Microsoft Shared/dao/dao360.dll" load_jet40() { w_call mdac27 w_call wsh57 + # https://support.microsoft.com/kb/239114 # See also https://bugs.winehq.org/show_bug.cgi?id=6085 # FIXME: "failed with error 2" w_download https://download.microsoft.com/download/4/3/9/4393c9ac-e69e-458d-9f6d-2fe191c51469/jet40sp8_9xnt.exe b060246cd499085a31f15873689d5fa7df817e407c8261a5c71fa6b9f7042560 + w_try_cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" jet40sp8_9xnt.exe $W_UNATTENDED_SLASH_Q } +# FIXME: verify_jet40() +# See https://github.com/Winetricks/winetricks/issues/327, +# https://en.wikibooks.org/wiki/JET_Database/Creating_and_connecting, and +# https://msdn.microsoft.com/en-us/library/ms677200%28v=vs.85%29.aspx + #---------------------------------------------------------------- w_metadata ie8_kb2936068 dlls \ @@ -7629,6 +7669,12 @@ helper_win7sp1 x86_microsoft-windows-mediafoundation_31bf3856ad364e35_6.1.7601.17514_none_9e6699276b03c38e/mf.dll w_try cp "$W_TMP/x86_microsoft-windows-mediafoundation_31bf3856ad364e35_6.1.7601.17514_none_9e6699276b03c38e/mf.dll" "$W_SYSTEM32_DLLS/mf.dll" + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-mediafoundation_31bf3856ad364e35_6.1.7601.17514_none_fa8534ab236134c4/mf.dll + w_try cp "$W_TMP/amd64_microsoft-windows-mediafoundation_31bf3856ad364e35_6.1.7601.17514_none_fa8534ab236134c4/mf.dll" "$W_SYSTEM64_DLLS/mf.dll" + fi + w_override_dlls native,builtin mf } @@ -7884,6 +7930,12 @@ helper_win7sp1 x86_microsoft-windows-msftedit_31bf3856ad364e35_6.1.7601.17514_none_d7d862f19573a5ff/msftedit.dll w_try cp "$W_TMP/x86_microsoft-windows-msftedit_31bf3856ad364e35_6.1.7601.17514_none_d7d862f19573a5ff/msftedit.dll" "$W_SYSTEM32_DLLS/msftedit.dll" + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-msftedit_31bf3856ad364e35_6.1.7601.17514_none_33f6fe754dd11735/msftedit.dll + w_try cp "$W_TMP/amd64_microsoft-windows-msftedit_31bf3856ad364e35_6.1.7601.17514_none_33f6fe754dd11735/msftedit.dll" "$W_SYSTEM64_DLLS/msftedit.dll" + fi + w_override_dlls native,builtin mstfedit } @@ -8157,8 +8209,7 @@ load_physx() { - # Has a minor issue, see bug report https://bugs.winehq.org/show_bug.cgi?id=34167 - w_download https://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi 0a022e28accf5851be9d6577487cdcd3d3a3e2a8a21a64456b72b415c217f03c + w_download http://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi 0a022e28accf5851be9d6577487cdcd3d3a3e2a8a21a64456b72b415c217f03c w_try_cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" msiexec /i PhysX-9.14.0702-SystemSoftware.msi $W_UNATTENDED_SLASH_Q } @@ -9412,6 +9463,12 @@ helper_win7sp1 x86_microsoft-windows-servicingstack_31bf3856ad364e35_6.1.7601.17514_none_0b66cb34258c936f/xmllite.dll w_try cp "$W_TMP/x86_microsoft-windows-servicingstack_31bf3856ad364e35_6.1.7601.17514_none_0b66cb34258c936f/xmllite.dll" "$W_SYSTEM32_DLLS/xmllite.dll" + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-servicingstack_31bf3856ad364e35_6.1.7601.17514_none_678566b7ddea04a5/xmllite.dll "$W_SYSTEM64_DLLS/xmllite.dll" + w_try cp "$W_TMP/amd64_microsoft-windows-servicingstack_31bf3856ad364e35_6.1.7601.17514_none_678566b7ddea04a5/xmllite.dll" "$W_SYSTEM64_DLLS/xmllite.dll" + fi + w_override_dlls native,builtin xmllite }
