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

Accepting request 458830 from Emulators

Browse Source 
- Update to 2.2 development snapshot 
  - Windows version set to Windows 7 for new prefixes.
  - More steps towards the Direct3D command stream.
  - Still more Shader Model 5 instructions.
  - Initial support for double-buffered theme painting.
  - Various bug fixes.
- updated winetricks

OBS-URL: https://build.opensuse.org/request/show/458830
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=220
This commit is contained in:
Dominique Leuenberger 2017-02-19 00:04:14 +00:00 committed by Git OBS Bridge
commit aa7b7f6ad1
8 changed files with 119 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wine-2.1.tar.xz
View File

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAliU2mkACgkQzvrI6q8X
UZ1J4Q//ZAOxc5/l0dLTGL+T5vCCt5MA3karsVXMeLex6LhJ5ZA9vQX7TzMHISWO
WrE6MsZEECYzqkxOcy3dqdX2FTSvEnAHu22MkVoP3rwXqBTcvtYA53wlAiiBEvrG
QPADJTDnukesG0f7+KCSjQ//JA1szLaPW1XQCgcucOj32ssJcIxtTgOPDXGcLpHF
i4BiVKJog3duHpBdcrrljJuTm7ewSIaHar7Ea00FyxwK24dsVJDw6HvFON3fui5m
yRyEbmqchlxnv/vusyWjfEjyEqiBUO9f53yV7AjuqJw3I4H6hktw70Rx37usgzAF
xL/Ft1hLIxXF6FqNuBOR6H2NhutiitYA5hDJ8jjtwNfuCHFmCCvM+xPlDa4V3D9V
rBO4t0hhqEXFHlqIZCmYdxQAFZXaDIVJ09boP8pLyGU7qMFBPaMcTCCd+LpTLJ/V
TPIM5USygJRc0lG9TrCGhDZdrtzDRXjwTIUvNwEDJQknu9PWl7Qh9l7GXgbevXR6
BJtXatApuhP75PqcMApV6PONtag1OZo9fOuGd8w1cZ6r8D3oWya940HRtgrKJe6X
yClVX3ufi6j8849HHMZrPsYhT8H0u31hMsWO84VpdG0W3/ttIOvFnBoKSGibm+z3
KCB5F4PTY6CVkDatGNeImPwZC0CQVbVEG54y2s90ClVysmqqokw=
=nCXc
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlinXs4ACgkQzvrI6q8X
UZ3M2xAAjTQfjjqvg/0SFlqVN4dVBJww8rdfGAplfFx5u+eLzDuwpPar6fWP1avM
fFT0dz88K2ygsZZD33xgLi9uuujY9y1sj6ZS9kx1z4Lc8+a/bo3XIXaC/Ehb3HSC
bSPp4y8fRHWL6Ca+q+S5hm5TvtyIq0ey/wtLTUsLPotb0F60wKMncpU3suOmqsUV
Wz137MJpQqNXcDceco4tL5nN96Fa6iVW9+xXymsQH+iGPfpu4pnQtJPtq5cCWu5M
7ZpDrDWTwaxMYYwmvVy2kUpYIw8Rb/KWnq3IxDV2LP1nnogziBOh6/hoAsNerMPk
4eEAlr5Sy6V8ZRCK0Hpb3xgvp9oJtdlmGzCds/Qm1IKvjL+ln4fGfn1a7GPcoLcn
M9Wv0xyugVjwUZSyHvHLmRudi1nT7nvmLyvL6wccXSmjOnatS/oPKafi6qLMaVgb
OCQj4G72yXwsr54gmzvpYNdBCuFiUFlZVcs4CVtFQLNJ1hKv1Hti8XnnUfUXOhSn
LFKx2ry2kFfQjxMdAlibR2DKL/GtvReC6yV6HOhu16nQsMeo4Ylem7nn0igo1MpR
C9lTp9IDOGP00DIXOcu32yUD1bCnfnfUr5do/MYNcxPBrCVhlnDyiRxu5FsOHz7C
TIUmu5Y7Wd2BQE/0l7KfvkVyasLGIaGTB5dJXQ4AiOtn7hM0fwQ=
=UeLb
-----END PGP SIGNATURE-----

11
wine.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Feb 17 21:04:31 UTC 2017 - meissner@suse.com
- Update to 2.2 development snapshot
- Windows version set to Windows 7 for new prefixes.
- More steps towards the Direct3D command stream.
- Still more Shader Model 5 instructions.
- Initial support for double-buffered theme painting.
- Various bug fixes.
- updated winetricks
-------------------------------------------------------------------
Sat Feb 4 20:57:03 UTC 2017 - meissner@suse.com

4
wine.spec
View File

@ -54,8 +54,8 @@ BuildRequires: update-desktop-files
BuildRequires: valgrind-devel
BuildRequires: xorg-x11-devel
BuildRequires: pkgconfig(libudev)
%define realver 2.1
Version: 2.1
%define realver 2.2
Version: 2.2
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+

122
winetricks
View File

@ -6,7 +6,7 @@
# Name of this version of winetricks (YYYYMMDD)
# (This doesn't change often, use the sha1sum of the file when reporting problems)
WINETRICKS_VERSION=20170101
WINETRICKS_VERSION=20170207
# This is a UTF-8 file
# You should see an o with two dots over it here [ö]
@ -26,7 +26,7 @@ WINETRICKS_VERSION=20170101
#
# Uses the following non-POSIX system tools:
# - wine is used to execute Win32 apps except on Cygwin.
# - cabextract, unrar, unzip, and 7z are needed by some verbs.
# - ar, cabextract, unrar, unzip, and 7z are needed by some verbs.
# - aria2c, wget, or curl is needed for downloading.
# - sha1sum or openssl is needed for verifying downloads.
# - zenity is needed by the GUI, though it can limp along somewhat with kdialog.
@ -37,14 +37,14 @@ WINETRICKS_VERSION=20170101
# On Ubuntu, the following lines can be used to install all the prerequisites:
# sudo add-apt-repository ppa:ubuntu-wine/ppa
# sudo apt-get update
# sudo apt-get install cabextract p7zip unrar unzip wget wine1.7 zenity
# sudo apt-get install binutils cabextract p7zip unrar unzip wget wine zenity
#
# See http://winetricks.org for documentation and tutorials, including
# how to contribute changes to winetricks.
#
#--------------------------------------------------------------------
#
# Copyright
# Copyright:
# Copyright (C) 2007-2014 Dan Kegel <dank!kegel.com>
# Copyright (C) 2008-2016 Austin English <austinenglish!gmail.com>
# Copyright (C) 2010-2011 Phil Blankenship <phillip.e.blankenship!gmail.com>
@ -68,18 +68,21 @@ WINETRICKS_VERSION=20170101
# Copyright (C) 2013-2015 Hillwood Yang <hillwood!opensuse.org>
# Copyright (C) 2013,2016 André Hentschel <nerv!dawncrow.de>
#
# License
# License:
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later
# version 2.1 of the License, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# License along with this program. If not, see
# <http://www.gnu.org/licenses/>.
#
#--------------------------------------------------------------------
# Coding standards:
@ -287,6 +290,16 @@ w_killall()
kill -s KILL $(pgrep $1)
}
# Some packages don't support win64, die with an appropriate message
# Note: this is for packages that natively don't support win64, not packages that are broken on wine64
w_package_unsupported_win64()
{
if [ "$W_ARCH" = "win64" ]
then
w_die "This package does not work on a 64-bit installation. You must use a prefix made with WINEARCH=win32."
fi
}
# Execute with error checking
# Put this in front of any command that might fail
w_try()
@ -1196,7 +1209,7 @@ sub disable_notifications{
# Read the file
my(%top);
open FILE, $ARGV[0] || w_die "can't open ".$ARGV[0];
open FILE, $ARGV[0] || w_die "cannot open ".$ARGV[0];
my($line);
$line = <FILE> || w_die "Could not read first line from ".$ARGV[0];
$line =~ /"UserLocalConfigStore"/ || w_die "this is not a localconfig.vdf file";
@ -2115,6 +2128,9 @@ REGEDIT4
_EOF_
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
# Prevent a race when calling from another verb
"$WINESERVER" -w
}
w_unset_winver()
@ -2656,7 +2672,7 @@ winetricks_dl_url_to_stdout()
stdout_tmpfile="${W_TMP_EARLY}/stdout.tmp"
if [ -e "${stdout_tmpfile}" ] ; then
w_try rm "${stdout_tmpfile}"
rm "${stdout_tmpfile}"
fi
$torify aria2c \
$aria2c_torify_opts \
@ -2672,8 +2688,8 @@ winetricks_dl_url_to_stdout()
--connect-timeout="${WINETRICKS_DOWNLOADER_TIMEOUT}" \
--max-tries="$WINETRICKS_DOWNLOADER_RETRIES" \
"$1" > /dev/null
w_try cat "${stdout_tmpfile}"
w_try rm "${stdout_tmpfile}"
cat "${stdout_tmpfile}"
rm "${stdout_tmpfile}"
else
w_die "Please install aria2c, curl, or wget"
fi
@ -4629,6 +4645,7 @@ winetricks_init()
W_ISO_MOUNT_LETTER=i
WINETRICKS_WINE_VERSION=$(winetricks_early_wine --version | sed 's/.*wine/wine/')
WINETRICKS_ORIG_WINE_VERSION="${WINETRICKS_WINE_VERSION}"
# See also w_wine_version()
# A small hack...
case "$WINETRICKS_WINE_VERSION" in
@ -4647,7 +4664,7 @@ winetricks_init()
WINETRICKS_WINE_MICRO=$(echo $WINETRICKS_WINE_VERSION | sed 's/wine-1.[0-9][0-9]*\.\([0-9]*\).*/\1/')
if [ ! "$WINETRICKS_SUPER_QUIET" ] ; then
echo "Using winetricks $(winetricks_print_version) with ${WINETRICKS_WINE_VERSION} and WINEARCH=${W_ARCH}"
echo "Using winetricks $(winetricks_print_version) with ${WINETRICKS_ORIG_WINE_VERSION} and WINEARCH=${W_ARCH}"
fi
winetricks_latest_version_check
@ -5891,10 +5908,7 @@ w_metadata dotnet11 dlls \
load_dotnet11()
{
if [ $W_ARCH = win64 ]
then
w_die "This package does not work on a 64-bit installation"
fi
w_package_unsupported_win64
# http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589-4842-8157-034D1E7CF3A3
w_download http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe 16a354a2207c4c8846b617cbc78f7b7c1856340e
@ -5951,6 +5965,8 @@ w_metadata dotnet11sp1 dlls \
load_dotnet11sp1()
{
w_package_unsupported_win64
w_download http://download.microsoft.com/download/8/b/4/8b4addd8-e957-4dea-bdb8-c4e00af5b94b/NDP1.1sp1-KB867460-X86.exe 74a5b25d65a70b8ecd6a9c301a0aea10d8483a23
w_call remove_mono
@ -6005,6 +6021,8 @@ w_metadata dotnet20 dlls \
load_dotnet20()
{
w_package_unsupported_win64
# http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5
w_download http://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a
@ -6048,6 +6066,8 @@ w_metadata dotnet20sdk dlls \
load_dotnet20sdk()
{
w_package_unsupported_win64
# http://www.microsoft.com/en-us/download/details.aspx?id=19988
w_download http://download.microsoft.com/download/c/4/b/c4b15d7d-6f37-4d5a-b9c6-8f07e7d46635/setup.exe 4e4b1072b5e65e855358e2028403f2dc52a62ab4
@ -6117,6 +6137,8 @@ w_metadata dotnet20sp1 dlls \
load_dotnet20sp1()
{
w_package_unsupported_win64
# FIXME: URL?
w_download http://download.microsoft.com/download/0/8/c/08c19fa4-4c4f-4ffb-9d6c-150906578c9e/NetFx20SP1_x86.exe eef5a36924cdf0c02598ccf96aa4f60887a49840
@ -6181,6 +6203,8 @@ w_metadata dotnet20sp2 dlls \
load_dotnet20sp2()
{
w_package_unsupported_win64
# http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B-4EB5-9B1D-10E506DA9D0F
w_download http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe 22d776d4d204863105a5db99e8b8888be23c61a7
@ -6242,6 +6266,8 @@ w_metadata dotnet30 dlls \
load_dotnet30()
{
w_package_unsupported_win64
# http://msdn.microsoft.com/en-us/netframework/bb264589.aspx
w_download http://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039
@ -6310,6 +6336,8 @@ w_metadata dotnet30sp1 dlls \
load_dotnet30sp1()
{
w_package_unsupported_win64
# FIXME: URL?
w_download http://download.microsoft.com/download/8/F/E/8FEEE89D-9E4F-4BA3-993E-0FFEA8E21E1B/NetFx30SP1_x86.exe 8d779e337920b097aa0c01859912950606e9fc12
# Recipe from http://bugs.winehq.org/show_bug.cgi?id=25060#c10
@ -6355,6 +6383,8 @@ w_metadata dotnet35 dlls \
load_dotnet35()
{
w_package_unsupported_win64
case "$W_PLATFORM" in
windows_cmd) ;;
*) w_warn "dotnet35 does not yet fully work or install on wine. Caveat emptor." ;;
@ -6404,6 +6434,8 @@ w_metadata dotnet35sp1 dlls \
load_dotnet35sp1()
{
w_package_unsupported_win64
case "$W_PLATFORM" in
windows_cmd) ;;
*) w_warn "dotnet35sp1 does not yet fully work or install on wine. Caveat emptor." ;;
@ -6470,10 +6502,7 @@ w_metadata dotnet40 dlls \
load_dotnet40()
{
if [ $W_ARCH = win64 ]
then
w_die "This package does not work on a 64-bit installation"
fi
w_package_unsupported_win64
case "$W_PLATFORM" in
windows_cmd) ;;
@ -6619,7 +6648,7 @@ w_metadata dotnet46 dlls \
media="download" \
file1="NDP46-KB3045557-x86-x64-AllOS-ENU.exe" \
conflicts="dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2 dotnet35sp1 dotnet40 vjrun20" \
installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/SetupCache/v4.6.00081/1041/SetupResources.dll"
installed_file1="c:/windows/Migration/WTR/netfx45_upgradecleanup.inf"
load_dotnet46()
{
@ -6658,6 +6687,11 @@ load_dotnet46()
w_override_dlls native mscoree
}
verify_dotnet46()
{
w_dotnet_verify dotnet46
}
#----------------------------------------------------------------
w_metadata dotnet461 dlls \
@ -6667,7 +6701,7 @@ w_metadata dotnet461 dlls \
media="download" \
file1="NDP461-KB3102436-x86-x64-AllOS-ENU.exe" \
conflicts="dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2 dotnet35sp1 dotnet40 dotnet46 vjrun20" \
installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/SetupCache/v4.6.01055/1041/SetupResources.dll"
installed_file1="c:/users/$LOGNAME/Temp/dd_NDP461-KB3102436-x86-x64-AllOS-ENU_decompression_log.txt"
load_dotnet461()
{
@ -6701,6 +6735,11 @@ load_dotnet461()
w_override_dlls native mscoree
}
verify_dotnet461()
{
w_dotnet_verify dotnet461
}
#----------------------------------------------------------------
w_metadata dotnet462 dlls \
@ -6751,6 +6790,11 @@ load_dotnet462()
w_override_dlls native mscoree
}
verify_dotnet462()
{
w_dotnet_verify dotnet462
}
#----------------------------------------------------------------
w_metadata dotnet_verifier dlls \
@ -8910,6 +8954,8 @@ load_vcrun2015()
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 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcr140 ucrtbase vcomp140 vcruntime140
w_set_winver winxp
w_try_cd "$W_CACHE"/"$W_PACKAGE"
w_try "$WINE" vc_redist.x86.exe $W_UNATTENDED_SLASH_Q
@ -8978,8 +9024,6 @@ load_vjrun20()
#----------------------------------------------------------------
# FIXME: two exe's, one for win64, one for win32..
w_metadata windowscodecs dlls \
title="MS Windows Imaging Component" \
publisher="Microsoft" \
@ -8995,11 +9039,13 @@ load_windowscodecs()
# 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
elif [ "$W_ARCH" = "win64" ] ; then
# 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
else
w_die "Invalid W_ARCH value, $W_ARCH"
fi
# Avoid a file existence check.
w_try rm -f "$W_SYSTEM32_DLLS"/windowscodecs.dll "$W_SYSTEM32_DLLS"/windowscodecsext.dll "$W_SYSTEM32_DLLS"/photometadatahandler.dll
@ -9012,17 +9058,20 @@ load_windowscodecs()
# AF says in AppDB entry for .NET 3.0 that windowscodecs has to be native only
w_override_dlls native windowscodecs windowscodecsext
# Always run the WIC installer in passive mode.
# See http://bugs.winehq.org/show_bug.cgi?id=16876 and
# http://bugs.winehq.org/show_bug.cgi?id=23232
w_try_cd "$W_CACHE/$W_PACKAGE"
if test -x /usr/bin/taskset && w_workaround_wine_bug 32859 "Working around possibly broken libX11"
then
TASKSET="taskset -c 0"
else
TASKSET=""
fi
w_set_winver winxp
# Always run the WIC installer in passive mode.
# See http://bugs.winehq.org/show_bug.cgi?id=16876 and
# http://bugs.winehq.org/show_bug.cgi?id=23232
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try $TASKSET "$WINE" "$EXE" /passive
}
@ -10625,11 +10674,7 @@ w_metadata ie6 dlls \
load_ie6()
{
# Installer doesn't support Win64, and I can't find a x64 version on microsoft.com
if [ $W_ARCH = win64 ]
then
w_die "This package does not work on a 64-bit installation"
fi
w_package_unsupported_win64
w_download http://download.oldapps.com/Internet_Explorer/ie60.exe 8e483db28ff01a7cabd39147ab6c59753ea1f533
@ -10770,6 +10815,9 @@ load_ie7()
w_download http://download.microsoft.com/download/3/8/8/38889DC1-848C-4BF2-8335-86C573AD86D9/IE7-WindowsXP-x86-enu.exe d39b89c360fbaa9706b5181ae4718100687a5326
w_try_cd "$W_CACHE/$W_PACKAGE"
# IE7 requies winxp to install:
w_set_winver winxp
"$WINE" IE7-WindowsXP-x86-enu.exe $W_UNATTENDED_SLASH_QUIET
# IE7 exits with 194 to signal a reboot
@ -12068,6 +12116,8 @@ load_wmp10()
# http://www.microsoft.com/downloads/en/details.aspx?FamilyID=b446ae53-3759-40cf-80d5-cde4bbe07999
w_download http://download.microsoft.com/download/1/2/a/12a31f29-2fa9-4f50-b95d-e45ef7013f87/MP10Setup.exe 69862273a5d9d97b4a2e5a3bd93898d259e86657
w_set_winver winxp
# Crashes on exit, but otherwise ok; see http://bugs.winehq.org/show_bug.cgi?id=12633
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" MP10Setup.exe $W_UNATTENDED_SLASH_Q

2
winetricks.1
View File

@ -1,5 +1,5 @@
.\" -*- nroff -*-
.TH WINETRICKS 1 "January 2017" "Winetricks 20170101" "Wine Package Manager"
.TH WINETRICKS 1 "February 2017" "Winetricks 20170207" "Wine Package Manager"
.SH NAME
winetricks \- manage virtual Windows environments using Wine
.SH SYNOPSIS