Hello community,
here is the log from the commit of package wine for openSUSE:Factory checked in at 2017-02-19 01:04:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wine (Old)
and /work/SRC/openSUSE:Factory/.wine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wine/wine.changes 2017-02-06 15:23:00.108958971 +0100
+++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2017-02-19 01:04:16.280278349 +0100
@@ -1,0 +2,11 @@
+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
+
+-------------------------------------------------------------------
Old:
----
wine-2.1.tar.xz
wine-2.1.tar.xz.sign
New:
----
wine-2.2.tar.xz
wine-2.2.tar.xz.sign
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wine.spec ++++++
--- /var/tmp/diff_new_pack.X9pyzM/_old 2017-02-19 01:04:17.564097961 +0100
+++ /var/tmp/diff_new_pack.X9pyzM/_new 2017-02-19 01:04:17.568097398 +0100
@@ -54,8 +54,8 @@
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+
++++++ wine-2.1.tar.xz -> wine-2.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/wine/wine-2.1.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-2.2.tar.xz differ: char 26, line 1
++++++ winetricks ++++++
--- /var/tmp/diff_new_pack.X9pyzM/_old 2017-02-19 01:04:17.680081664 +0100
+++ /var/tmp/diff_new_pack.X9pyzM/_new 2017-02-19 01:04:17.680081664 +0100
@@ -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 @@
#
# 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 @@
# 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
# Copyright (C) 2008-2016 Austin English
# Copyright (C) 2010-2011 Phil Blankenship
@@ -68,18 +68,21 @@
# Copyright (C) 2013-2015 Hillwood Yang
# Copyright (C) 2013,2016 André Hentschel
#
-# 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 @@
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 @@
# 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 @@
_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 @@
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 @@
--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 @@
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_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 @@
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-...
w_download http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e... 16a354a2207c4c8846b617cbc78f7b7c1856340e
@@ -5951,6 +5965,8 @@
load_dotnet11sp1()
{
+ w_package_unsupported_win64
+
w_download http://download.microsoft.com/download/8/b/4/8b4addd8-e957-4dea-bdb8-c4e00af... 74a5b25d65a70b8ecd6a9c301a0aea10d8483a23
w_call remove_mono
@@ -6005,6 +6021,8 @@
load_dotnet20()
{
+ w_package_unsupported_win64
+
# http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-...
w_download http://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a
@@ -6048,6 +6066,8 @@
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-8f07e7d... 4e4b1072b5e65e855358e2028403f2dc52a62ab4
@@ -6117,6 +6137,8 @@
load_dotnet20sp1()
{
+ w_package_unsupported_win64
+
# FIXME: URL?
w_download http://download.microsoft.com/download/0/8/c/08c19fa4-4c4f-4ffb-9d6c-1509065... eef5a36924cdf0c02598ccf96aa4f60887a49840
@@ -6181,6 +6203,8 @@
load_dotnet20sp2()
{
+ w_package_unsupported_win64
+
# http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B-4EB5-...
w_download http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77... 22d776d4d204863105a5db99e8b8888be23c61a7
@@ -6242,6 +6266,8 @@
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-DF53621... f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039
@@ -6310,6 +6336,8 @@
load_dotnet30sp1()
{
+ w_package_unsupported_win64
+
# FIXME: URL?
w_download http://download.microsoft.com/download/8/F/E/8FEEE89D-9E4F-4BA3-993E-0FFEA8E... 8d779e337920b097aa0c01859912950606e9fc12
# Recipe from http://bugs.winehq.org/show_bug.cgi?id=25060#c10
@@ -6355,6 +6383,8 @@
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 @@
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 @@
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 @@
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 @@
w_override_dlls native mscoree
}
+verify_dotnet46()
+{
+ w_dotnet_verify dotnet46
+}
+
#----------------------------------------------------------------
w_metadata dotnet461 dlls \
@@ -6667,7 +6701,7 @@
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 @@
w_override_dlls native mscoree
}
+verify_dotnet461()
+{
+ w_dotnet_verify dotnet461
+}
+
#----------------------------------------------------------------
w_metadata dotnet462 dlls \
@@ -6751,6 +6790,11 @@
w_override_dlls native mscoree
}
+verify_dotnet462()
+{
+ w_dotnet_verify dotnet462
+}
+
#----------------------------------------------------------------
w_metadata dotnet_verifier dlls \
@@ -8910,6 +8954,8 @@
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 @@
#----------------------------------------------------------------
-# 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 @@
# 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-478a993... 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-FE8334... 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 @@
# 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 @@
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 @@
w_download http://download.microsoft.com/download/3/8/8/38889DC1-848C-4BF2-8335-86C573A... 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 @@
# http://www.microsoft.com/downloads/en/details.aspx?FamilyID=b446ae53-3759-40...
w_download http://download.microsoft.com/download/1/2/a/12a31f29-2fa9-4f50-b95d-e45ef70... 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
++++++ winetricks.1 ++++++
--- /var/tmp/diff_new_pack.X9pyzM/_old 2017-02-19 01:04:17.712077168 +0100
+++ /var/tmp/diff_new_pack.X9pyzM/_new 2017-02-19 01:04:17.712077168 +0100
@@ -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