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

Accepting request 622081 from Emulators

Browse Source 
- Update to 3.12 development release
  - Unicode data updated to Unicode 11.0.0.
  - Proxy configuration dialog in the Internet control panel.
  - Syntax fixes in the Cmd.exe command intepreter.
  - Some more glyphs in the Wingdings font.
  - Various bug fixes.
- updated staging to 3.12
- updated winetricks

OBS-URL: https://build.opensuse.org/request/show/622081
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=257
This commit is contained in:
Dominique Leuenberger 2018-07-12 07:20:30 +00:00 committed by Git OBS Bridge
commit 11d7f78688
12 changed files with 72 additions and 36 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.11</param>
<param name="revision">refs/tags/v3.12</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.10</param>
<param name="revision">refs/tags/wine-d3d9-3.11</param>
<param name="scm">git</param>
</service>
<service name="recompress" mode="disabled">

3
wine-3.11.tar.xz
View File

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlsthusACgkQzvrI6q8X
UZ1Wyw/9FHikjy3zx31jMwV0qRDVtDpFh9BojfI8D/z1XWXmhJaWSbzE5RZ1VYQi
mkxdyeMKDP3p8ZJt/oc1oINAsXcPb6ifvZ03DjSPdRIpnFOzM9X67JSpBqwNXuTH
6Nb2FQaCorlQI/IbnoBHHVYln+ZizSPWAdz+Fn8ez4zLjHFTV+zP7xAMBBKhm5VZ
f2wm9MoPmI6L/XQcwfY0CuETbfE/cSlS4o2cKUvLNDWY2FHPVEfhb+RuMu7EQSR9
JAEic8f3oZFJ5pTFjApIWdHfCxKsQFAlJRJ6bHQAy5c5VNx7q+sNieJ2l3hpU6GF
8v8/fEEJNwfGHA6FRfrUPb4rUmXctdw9x6MdshtBnh3yxB4TYa/ZErFcgfhxOwiH
8OHZNow9CKz0dIMBvCaGTfU/TkV5yI9AjjVU6ltIKfFGXo77oWm0PGJzPKSdI1vN
J7ahIZ2J2t1aWNU82ODWJZDPcqrtIynZCYLPU7jUJOHxSwM4aYG81Gwf2WVFtLfz
Eqfv3m5I6bYeXb4RnexJtd51mmRbZgMhQMjfiWssg+1dZDzyO7n4XgSeXR2hxTvE
aX9ZmGKmOl8WHuc7QIUOS05DFN5F9yv/WbM+J6o9zUsXeaJiopKtZA3QHvuBjAaw
EEgAnLwSb1izJ2KDRb7SS7IkOqM57Tca35InFDP8O0XkQZ9LbSc=
=WMjv
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAltDzL8ACgkQzvrI6q8X
UZ3OhQ//Q4tZlSb+8PwcefJWtNozbzBbwqyGBUHrozPR3gKIAygm7t5pNfUh7STX
jopImFNcEn5XKTn/IRWLDIf4OLp2j3HwbIAO32YBjce5Z5BEL6avVoPgyLRD1XCp
YZ1RTYBTXl4Y1bW1nuy5KoTLicypSRpOeVAyZ+XwHg8dq/SuJIJ4yP89VdllGdsQ
8rQshr236p0I7wInSM2Vkz095ITsovsyxdts+YUAQ7LQ4mAJ900KbFScZ8LMCiBz
/vzTqi8EJ6c+ncagL1rNNUfimkQbFRurSZz7JJQvD4dD18ZxFdyfIUTsU5mZr1dZ
pa6T3xHogISaIgBpO2DGaDnX3oxqoezKlKBTLh+nSw7u//+KH7bKfou65yTRnLjX
MXO3D+A9s8nyqJjVW0WjsVN5s+RCipa/x08yPy7hBZ7Hbxx/L2vrtVIwvQcqww1c
BPlhgZpZwQu1fJcbVhf/mIhqbRw0Kqq9jKWZeKHMzOB51lgroGiguGdnPd/qeaHH
2JGN6sYjMD1Ii2cCv5oyq/r72Qcmt1qcBZDRHTGoJr8yAj7ynEzoggwKVjbyFOcd
MGff5GnZiytt9SAIjFIxRYq+tc24qRcbWrsHDRq3hHCuB/+4xqvHllDDQUDIalLZ
VU1g4Glqg48to8crGHZiVmpT2cexrc7ROZEIDnD6/5u0Fa67+W4=
=CPGI
-----END PGP SIGNATURE-----

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

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

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

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

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

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

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

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

12
wine.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Jul 10 06:07:29 UTC 2018 - meissner@suse.com
- Update to 3.12 development release
- Unicode data updated to Unicode 11.0.0.
- Proxy configuration dialog in the Internet control panel.
- Syntax fixes in the Cmd.exe command intepreter.
- Some more glyphs in the Wingdings font.
- Various bug fixes.
- updated staging to 3.12
- updated winetricks
-------------------------------------------------------------------
Sat Jun 23 06:30:49 UTC 2018 - meissner@suse.com

8
wine.spec
View File

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

34
winetricks
View File

@ -6670,10 +6670,29 @@ w_metadata dxvk60 dlls \
load_dxvk60()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.60/dxvk-0.60.tar.gz" ece9286ebe75aab4c585b8aeb5040b36982db3c54f5d59be76b2e89e8edde10e
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.60/dxvk-0.60.tar.gz" 27d6f700241d3ec3b6c002c3d739bb0e3f210ec916ecb5a62d9204e9e50f2c4a
helper_dxvk "$file1" "3.10" "1.0.76"
}
#----------------------------------------------------------------
w_metadata dxvk61 dlls \
title="Vulkan-based D3D11 implementation for Linux / Wine (0.61)" \
publisher="Philip Rebohle" \
year="2018" \
media="download" \
file1="dxvk-0.61.tar.gz" \
installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
load_dxvk61()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v0.61/dxvk-0.61.tar.gz" d04388f026dc0d8b276b08f7db74fb3556cbbc8f762401eb5ef52629ee39ded1
helper_dxvk "$file1" "3.10" "1.0.76"
}
#----------------------------------------------------------------
w_metadata dxvk dlls \
@ -6681,13 +6700,18 @@ w_metadata dxvk dlls \
publisher="Philip Rebohle" \
year="2018" \
media="download" \
file1="dxvk-0.60.tar.gz" \
installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
load_dxvk()
{
w_call dxvk60
# https://github.com/doitsujin/dxvk
# There's no stable exe URL, but they do provide a RELEASE file that lets us build one:
w_download_to "$W_TMP" "https://raw.githubusercontent.com/doitsujin/dxvk/master/RELEASE"
dxvk_version="$(cat "${W_TMP}/RELEASE")"
w_linkcheck=1_ignore w_download "https://github.com/doitsujin/dxvk/releases/download/v${dxvk_version}/dxvk-${dxvk_version}.tar.gz"
helper_dxvk "dxvk-${dxvk_version}.tar.gz" "3.10" "1.0.76"
unset dxvk_version
}
#----------------------------------------------------------------
@ -12299,7 +12323,7 @@ w_metadata mt4 apps \
load_mt4()
{
w_download https://download.mql5.com/cdn/web/metaquotes.software.corp/mt4/mt4setup.exe
w_download https://web.archive.org/web/20160112133258/https://download.mql5.com/cdn/web/metaquotes.software.corp/mt4/mt4setup.exe?utm_campaign=www.metatrader4.com 96c82266e18cc4ada1bbc0cd0ada74c3a31d18914fb1a36626f4596c8bacb6f0 mt4setup.exe
if w_workaround_wine_bug 7156 "${title} needs wingdings.ttf, installing opensymbol"; then
w_call opensymbol
@ -19490,7 +19514,7 @@ w_metadata remove_mono settings \
load_remove_mono()
{
mono_uuid="$("${WINE_ARCH}" uninstaller --list | grep Mono | cut -f1 -d\|)"
mono_uuid="$("${WINE_ARCH}" uninstaller --list | grep 'Wine Mono' | cut -f1 -d\|)"
if test "$mono_uuid"; then
"${WINE_ARCH}" uninstaller --remove "$mono_uuid"
else