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

Accepting request 589093 from Emulators

Browse Source 
- Update to 3.4 development release
  - More Vulkan support, including integration with the X11 driver.
  - Better handling of privileged instructions on x86-64.
  - Hex edit dialog improvements in RegEdit.
  - Assortment of patches merged from wine-staging.
  - Various bug fixes.
- updated winetricks
- updated staging to 3.4

OBS-URL: https://build.opensuse.org/request/show/589093
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=248
This commit is contained in:
Dominique Leuenberger 2018-03-20 21:01:18 +00:00 committed by Git OBS Bridge
commit 71da2cfc13
12 changed files with 95 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -3,7 +3,7 @@
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="url">https://github.com/wine-staging/wine-staging.git</param>
<param name="revision">refs/tags/v3.3</param>
<param name="revision">refs/tags/v3.4</param>
<param name="match-tag">v*.*</param>
<param name="scm">git</param>
</service>
@ -11,7 +11,7 @@
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">wined3d9(.*)</param>
<param name="url">https://github.com/sarnex/wine-d3d9-patches.git</param>
<param name="revision">refs/tags/wine-d3d9-3.3</param>
<param name="revision">refs/tags/wine-d3d9-3.4</param>
<param name="scm">git</param>
</service>
<service name="recompress" mode="disabled">

3
wine-3.3.tar.xz
View File

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

16
wine-3.3.tar.xz.sign
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlqZlHQACgkQzvrI6q8X
UZ3gDA//RoTF/7Lz7jOKLLKClhxHI+5m4c7wXXSctGFgKaVVw9Furwp0GkCmcKYo
ztCAJaBpHUGLpmm6TYERs5zPW6QqtFbspz89oKngnT/ESNDPcrhWAaSwTwqXrvxj
RUKN99mVIpdU1IM+5PFwsgAxAThMtMVa2A2cbsBdBUys1ujYsKKjGGYrSLtv0fSn
s+csTsRb6SdgyF+seSrbXISBlxSoMuQt/n6od9G39iY55FqqXdZ3sChUMHTtKg6t
3huW0BBgeFjN8CtAjF0Atu+qYbVxhiyNR6NuebUSExiUA8OM05ObKrruk2dI8I7T
qCJEXOzSoCNwOe+OqsILp4+gaoOKm/8pV5wmO3a1aV0ulVPxC7+07So0rwnmLSqz
yECqM8tb11jOB0ib+ag+1rqsam/0GfMiHXgYis9zkcG/vvgdcCmVWAfD7dUNYLR9
fuGwT8tEPJ5+f9H7Kj8nDAj5jdI4u7Jj5tvL9ombFvmWU9Ki0PuKhjPb31D2r0pd
psfBsx+k5V/GFCYpXq9shDN18IKFpkeyQ20GNRVVHj9e9UUowcXYlGYpDDgVOTez
7bRM20hizTGLp8tviatnnhtjhe9bqDrxY9PaxE1jagCM6ZaWwUwHgiIWqohuMJ2n
OjKSCWqHOQho7uLRIbtTtqAUovUC6aK6g/ICMFy2jVI+khNvmWA=
=Fdvl
-----END PGP SIGNATURE-----

3
wine-3.4.tar.xz Normal file
View File

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

16
wine-3.4.tar.xz.sign Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlqsEkoACgkQzvrI6q8X
UZ3g8RAAsRhpDRPP9/U3VyV3d3dvrOgQEbA5tE6N5c0t59EzA8JBSv+U3j2YTQLF
WWTeMjYzG5lfr6mdLnrHb8UjHGJWVOZiByTlXAPqvxeZ2HtqJKl6uBul51A9fMp7
FHhf7N9EFW4ANwRR8mtnsLAvIfpV9q4beBivbr4sRucn+b+cES7LHXgHVqOGkBnJ
wa6Nqvnzrs2KhAYM4ipRrw+Vl7EGfICuIkDXksCLFZE9D4ku4DUuraT8C+hfb6Fs
WpVHQ71pOZfhOfymYlrFzR8QhfytX7KwQi8PGwLXHFXKS3LiXvUbJduMz1SdEIkk
2dc46nC1IPcy3jkmrsFNyhyeo/NS5EErO9QwS5xkwMQNcjmf9WWJml64DS9HEkRv
kZNNlQyT47jYn34hp1A2rCMcC+/kVm6bw83kQtkxZcXHLij6VLJyT97t+6jceh9B
15vdAAisYZyGymXBryI+1LJDaRkLtQBkU4TlI1UBnEgkrNsNcLi1wb9M4qlL0yLo
ej50ozXSD5YOP857vWdQBQRLtrdaE9pgLH9pSen2wXuXotwiuTlVdu6CQwbB6+g7
UI3tFpizYwLkGLOmhIzlpA0+3G8TiJHryVPR8Zq0o0jLspT28Gfjxlxy4yLPegJz
1rdG5QUmvqYt+Q6MycVWvGvitslo+6JAivR1D0YSsq+FPD38U/A=
=Sesu
-----END PGP SIGNATURE-----

3
wine-d3d9-patches-3.3.tar.xz
View File

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

3
wine-d3d9-patches-3.4.tar.xz Normal file
View File

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

3
wine-staging-3.3.tar.xz
View File

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

3
wine-staging-3.4.tar.xz Normal file
View File

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

12
wine.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Mar 16 19:28:06 UTC 2018 - meissner@suse.com
- Update to 3.4 development release
- More Vulkan support, including integration with the X11 driver.
- Better handling of privileged instructions on x86-64.
- Hex edit dialog improvements in RegEdit.
- Assortment of patches merged from wine-staging.
- Various bug fixes.
- updated winetricks
- updated staging to 3.4
-------------------------------------------------------------------
Wed Mar 14 14:54:42 UTC 2018 - crrodriguez@opensuse.org

8
wine.spec
View File

@ -101,8 +101,8 @@ BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xxf86vm)
BuildRequires: pkgconfig(zlib)
%define realver 3.3
Version: 3.3
%define realver 3.4
Version: 3.4
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1-or-later
@ -140,7 +140,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64 ppc %arm
%if %{staging}
# upstream patch target version
%define staging_version 3.3
%define staging_version 3.4
Source100: wine-staging-%{staging_version}.tar.xz
BuildRequires: gtk3-devel
BuildRequires: libOSMesa-devel
@ -148,7 +148,7 @@ BuildRequires: libva-devel
%endif
%if %{nine}
# upstream patch target version
%define nine_version 3.3
%define nine_version 3.4
BuildRequires: Mesa-libd3d-devel
BuildRequires: dri2proto-devel
BuildRequires: libOSMesa-devel

59
winetricks
View File

@ -5367,7 +5367,7 @@ helper_win7sp1_x64()
w_metadata adobeair dlls \
title="Adobe AIR" \
publisher="Adobe" \
year="2017" \
year="2018" \
media="download" \
file1="AdobeAIRInstaller.exe" \
installed_file1="$W_COMMONFILES_X86_WIN/Adobe AIR/Versions/1.0/Adobe AIR.dll" \
@ -5377,7 +5377,8 @@ load_adobeair()
{
# 2017/03/14: 20.0.0.260 (strings 'Adobe AIR.dll' | grep 20\\. ) sha256sum 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45
# 2018/01/30: 28.0.0.127 (strings 'Adobe AIR.dll' | grep 28\\. ) sha256sum 9076489e273652089a4a53a1d38c6631e8b7477e39426a843e0273f25bfb109f
w_download https://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe 9076489e273652089a4a53a1d38c6631e8b7477e39426a843e0273f25bfb109f
# 2018/03/16: 29.0.0.112 (strings 'Adobe AIR.dll' | grep -E "^29\..+\..+" ) sha256sum 5186b54682644a30f2be61c9b510de9a9a76e301bc1b42f0f1bc50bd809a3625
w_download https://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe 5186b54682644a30f2be61c9b510de9a9a76e301bc1b42f0f1bc50bd809a3625
w_try_cd "$W_CACHE/$W_PACKAGE"
# See https://bugs.winehq.org/show_bug.cgi?id=43506
@ -7588,6 +7589,7 @@ w_metadata dxdiagn dlls \
publisher="Microsoft" \
year="2011" \
media="download" \
conflicts="dxdiagn_feb2010" \
file1="../win7sp1/windows6.1-KB976932-X86.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll"
@ -7606,6 +7608,26 @@ load_dxdiagn()
#----------------------------------------------------------------
w_metadata dxdiagn_feb2010 dlls \
title="DirectX Diagnostic Library (February 2010)" \
publisher="Microsoft" \
year="2010" \
media="download" \
conflicts="dxdiagn" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll"
load_dxdiagn_feb2010()
{
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dxdiagn.dll' "$W_TMP/dxnt.cab"
w_override_dlls native dxdiagn
}
#----------------------------------------------------------------
w_metadata dsound dlls \
title="MS DirectSound from DirectX user redistributable" \
publisher="Microsoft" \
@ -9237,7 +9259,7 @@ load_setupapi()
w_metadata shockwave dlls \
title="Shockwave" \
publisher="Adobe" \
year="2017" \
year="2018" \
media="download" \
file1="sw_lic_full_installer.msi" \
installed_file1="$W_SYSTEM32_DLLS_WIN/Adobe/Shockwave 12/shockwave_Projector_Loader.dcr"
@ -9247,7 +9269,8 @@ load_shockwave() {
# 2017/03/15: 58f2152bf726d52f08fb41f904c62ff00fdf748c8ce413e8c8547da3a21922ba
# 2017/08/03: bebebaef1644a994179a2e491ce3f55599d768f7c6019729f21e7029b1845b9c
# 2017/12/12: 0a9813ac55a8718440518dc2f5f410a3a065b422fe0618c073bfc631b9abf12c
w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 0a9813ac55a8718440518dc2f5f410a3a065b422fe0618c073bfc631b9abf12c
# 2018/03/16: 4d7b408cf5b65a522b071d7d9ddbc5f6964911a7d55c418e31f393e6055cf796
w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 4d7b408cf5b65a522b071d7d9ddbc5f6964911a7d55c418e31f393e6055cf796
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
@ -10000,6 +10023,24 @@ load_vjrun20()
#----------------------------------------------------------------
w_metadata vulkansdk dlls \
title="Vulkan SDK 1.0.68 (developers only)" \
publisher="LunarG" \
year="2018" \
media="download" \
file1="VulkanSDK-1.0.68.0-Installer.exe" \
installed_file1="C:/VulkanSDK/1.0.68.0/Vulkan.ico"
load_vulkansdk()
{
# https://vulkan.lunarg.com/sdk/home
w_download "https://sdk.lunarg.com/sdk/download/1.0.68.0/windows/VulkanSDK-1.0.68.0-Installer.exe" 8e6401d4f90af1ab384f76cb59f1b7fe9bcd717c92b2080089f893f2de4b33bb
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
}
#----------------------------------------------------------------
w_metadata webio dlls \
title="MS Windows Web I/O" \
publisher="Microsoft" \
@ -11415,10 +11456,14 @@ load_dxdiag()
w_override_dlls native dxdiag.exe
if w_workaround_wine_bug 1429; then
w_call dxdiagn
w_call dxdiagn_feb2010
fi
if w_workaround_wine_bug 9027; then
w_call directmusic
w_call dmband
w_call dmime
w_call dmstyle
w_call dmsynth
w_call dmusic
fi
}
@ -12791,7 +12836,7 @@ load_vc2010express()
# Originally at: https://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso
# Mirror list at: http://www.filewatcher.com/_/?q=VS2010Express1.iso
# Formerly at: ftp://www.daba.lv/pub/Programmeeshana/VisualStudio/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
w_download https://web.archive.org/web/20140227220734/download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
w_download https://debian.fmi.uni-sofia.bg/~aangelov/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
# Unpack ISO
w_try_7z "$W_TMP" "$W_CACHE"/vc2010express/VS2010Express1.iso