Hello community,
here is the log from the commit of package wine for openSUSE:Factory checked in
at 2017-01-23 11:40:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-01-15
11:20:52.550627411 +0100
+++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2017-01-23
11:40:46.097128464 +0100
@@ -1,0 +2,7 @@
+Sat Jan 21 11:23:10 UTC 2017 - meiss...@suse.com
+
+- Updated to 2.0-rc6 development snapshot
+ - Bug fixes only, we are in code freeze.
+- updated winetricks
+
+-------------------------------------------------------------------
Old:
----
wine-2.0-rc5.tar.bz2
wine-2.0-rc5.tar.bz2.sign
New:
----
wine-2.0-rc6.tar.bz2
wine-2.0-rc6.tar.bz2.sign
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wine.spec ++++++
--- /var/tmp/diff_new_pack.3QGN5n/_old 2017-01-23 11:40:47.532924813 +0100
+++ /var/tmp/diff_new_pack.3QGN5n/_new 2017-01-23 11:40:47.540923679 +0100
@@ -54,8 +54,8 @@
BuildRequires: valgrind-devel
BuildRequires: xorg-x11-devel
BuildRequires: pkgconfig(libudev)
-%define realver 2.0-rc5
-Version: 2.0~rc5
+%define realver 2.0-rc6
+Version: 2.0~rc6
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+
++++++ wine-2.0-rc5.tar.bz2 -> wine-2.0-rc6.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/wine/wine-2.0-rc5.tar.bz2
/work/SRC/openSUSE:Factory/.wine.new/wine-2.0-rc6.tar.bz2 differ: char 11, line
1
++++++ winetricks ++++++
--- /var/tmp/diff_new_pack.3QGN5n/_old 2017-01-23 11:40:47.680903824 +0100
+++ /var/tmp/diff_new_pack.3QGN5n/_new 2017-01-23 11:40:47.684903256 +0100
@@ -2183,7 +2183,9 @@
# fi
w_wine_version()
{
- # Parse major/minor/micro/nano fields of VALUE. Ignore nano. Abort if
major is not 1.
+ # Note, there are also hacks for major releases (1.6/1.8/2.0/etc. and RCs)
in winetricks_init()
+ #
+ # Parse major/minor/micro/nano fields of VALUE. Ignore nano.
case $2 in
0*|1.0|1.0.*) w_die "bug: $2 is before 1.1, we don't bother with bugs
fixed that long ago" ;;
1.1.*) _W_minor=1; _W_micro=$(echo "$2" | sed 's/.*\.//');;
@@ -2198,6 +2200,13 @@
1.7.*) _W_minor=7; _W_micro=$(echo "$2" | sed 's/.*\.//');;
1.8.*) _W_minor=8; _W_micro=$(echo "$2" | sed 's/.*\.//');;
1.9.*) _W_minor=9; _W_micro=$(echo "$2" | sed 's/.*\.//');;
+
+ # Rather than rework numbering system to handle both, just consider 2.x+
as 1.10, 1.11, etc.
+ 2.0|2.0-rc*) _W_minor=10; _W_micro=0;;
+ 2.0.*|2.*) _W_minor=10; _W_micro=$(echo "$2" | sed 's/.*\.//');;
+ 3.0|3.0-rc*) _W_minor=11; _W_micro=0;;
+ 3.0.*|3.*) _W_minor=11; _W_micro=$(echo "$2" | sed 's/.*\.//');;
+
*) w_die "bug: unrecognized version $2";;
esac
@@ -2217,6 +2226,7 @@
#WINETRICKS_WINE_MINOR=3 WINETRICKS_WINE_MICRO=4 w_wine_version -gt 1.2 ||
w_die "fail test case wine-1.3.4 > wine-1.2"
#echo Verify that version 1.6 is greater than 1.2
#WINETRICKS_WINE_MINOR=6 WINETRICKS_WINE_MICRO=0 w_wine_version -gt 1.2 ||
w_die "fail test case wine-1.6 > wine-1.2"
+# FIXME: 2.x tests
# Usage: w_wine_version_in range ...
# True if wine version in any of the given ranges
@@ -2931,7 +2941,7 @@
else
_W_msg_name="$p"
fi
- case $LANG in
+ case $LANG in
zh_CN*) printf %s " FALSE prefix='$p' '选择管理 $_W_msg_name' " ;;
zh_TW*|zh_HK*) printf %s " FALSE prefix='$p' '選擇管理 $_W_msg_name' "
;;
de*) printf %s " FALSE prefix='$p' '$_W_msg_name auswählen' " ;;
@@ -4603,6 +4613,7 @@
W_ISO_MOUNT_LETTER=i
WINETRICKS_WINE_VERSION=$(winetricks_early_wine --version | sed
's/.*wine/wine/')
+ # See also w_wine_version()
# A small hack...
case "$WINETRICKS_WINE_VERSION" in
wine-1.4-*) WINETRICKS_WINE_VERSION="wine-1.4.40"; export
WINETRICKS_WINE_VERSION;;
@@ -4611,6 +4622,10 @@
wine-1.6) WINETRICKS_WINE_VERSION="wine-1.6.0"; export
WINETRICKS_WINE_VERSION;;
wine-1.8-*) WINETRICKS_WINE_VERSION="wine-1.8.0"; export
WINETRICKS_WINE_VERSION;;
wine-1.8) WINETRICKS_WINE_VERSION="wine-1.8.0"; export
WINETRICKS_WINE_VERSION;;
+ wine-2.0-*) WINETRICKS_WINE_VERSION="wine-1.10.0"; export
WINETRICKS_WINE_VERSION;;
+ wine-2.0) WINETRICKS_WINE_VERSION="wine-1.10.0"; export
WINETRICKS_WINE_VERSION;;
+ wine-3.0-*) WINETRICKS_WINE_VERSION="wine-1.11.0"; export
WINETRICKS_WINE_VERSION;;
+ wine-3.0) WINETRICKS_WINE_VERSION="wine-1.11.0"; export
WINETRICKS_WINE_VERSION;;
esac
WINETRICKS_WINE_MINOR=$(echo $WINETRICKS_WINE_VERSION | sed
's/wine-1\.\([0-9]*\)\..*/\1/')
WINETRICKS_WINE_MICRO=$(echo $WINETRICKS_WINE_VERSION | sed
's/wine-1.[0-9][0-9]*\.\([0-9]*\).*/\1/')
@@ -8810,7 +8825,7 @@
w_warn "This may fail in non-XP mode, see
https://bugs.winehq.org/show_bug.cgi?id=37781";
fi
- 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 atl140 msvcp140 msvcr140 ucrtbase vcomp140
vcruntime140
+ 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_try_cd "$W_CACHE"/"$W_PACKAGE"
w_try "$WINE" vc_redist.x86.exe $W_UNATTENDED_SLASH_Q
@@ -10450,15 +10465,15 @@
w_metadata irfanview apps \
title="Irfanview" \
publisher="Irfan Skiljan" \
- year="2014" \
+ year="2016" \
media="download" \
- file1="iview438_setup.exe" \
+ file1="iview444_setup.exe" \
installed_file1="$W_PROGRAMS_X86_WIN/IrfanView/i_view32.exe" \
homepage="http://www.irfanview.com/";
load_irfanview()
{
- w_download http://fossies.org/windows/misc/iview438_setup.exe
c55c2fd91ac1af03e8063442b110ba771357d42e
+ w_download
http://download.betanews.com/download/967963863-1/iview444_setup.exe
d9675c2c4fce810134718b74b0c598957c8ebcf4
if w_workaround_wine_bug 657 "Installing mfc42"
then
w_call mfc42
@@ -10487,16 +10502,10 @@
ControlClick, Button1 ; Images Only associations
Sleep 900
ControlClick, Button16 ; Next
- Sleep 900
- winwait, Setup, Search
- Sleep 900
- ControlClick, Button1 ; deselect chrome googsrch
- Sleep 900
- ControlClick, Button18 ; Next
Sleep 1000
winwait, Setup, INI
Sleep 1000
- ControlClick, Button23 ; Next
+ ControlClick, Button21 ; Next
Sleep 1000
winwait, Setup, You want to change
winactivate, Setup, really
@@ -10506,9 +10515,11 @@
winwait, Setup, successful
winactivate, Setup, successful
Sleep 900
+ ControlClick, Button1 ; no load webpage
+ Sleep 900
ControlClick, Button2 ; no start irfanview
Sleep 900
- ControlClick, Button27 ; done
+ ControlClick, Button25 ; done
Sleep 900
winwaitclose
"
@@ -11325,11 +11336,6 @@
w_download http://www.python.org/ftp/python/2.6.2/python-2.6.2.msi
2d1503b0e8b7e4c72a276d4d9027cf4856b208b8
w_download
$WINETRICKS_SOURCEFORGE/project/pywin32/pywin32/Build%20214/pywin32-214.win32-py2.6.exe
eca58f29b810d8e3e7951277ebb3e35ac35794a3
- if [ "$WINETRICKS_WINE_VERSION" = "wine-1.4.1" ]
- then
- w_die "This installer is broken under $WINETRICKS_WINE_VERSION. Please
upgrade Wine. See https://code.google.com/p/winetricks/issues/detail?id=347 for
more info."
- fi
-
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec /i python-2.6.2.msi ALLUSERS=1 $W_UNATTENDED_SLASH_Q
@@ -11687,7 +11693,7 @@
load_vc2005trial()
{
w_call dotnet20
-
+
# Without mfc42.dll, pidgen.dll won't load, and the app claims "A trial
edition is already installed..."
w_call mfc42
@@ -18207,6 +18213,21 @@
}
#----------------------------------------------------------------
+# CheckFloatConstants settings
+
+w_metadata cfc=enabled settings \
+ title_uk="Включити CheckFloatConstants" \
+ title="Enable CheckFloatConstants"
+w_metadata cfc=disable settings \
+ title_uk="Вимкнути CheckFloatConstants (за замовчуванням)" \
+ title="Disable CheckFloatConstants (default)"
+
+load_cfc()
+{
+ winetricks_set_wined3d_var CheckFloatConstants "$1"
+}
+
+#----------------------------------------------------------------
# DirectDraw settings
w_metadata ddr=gdi settings \
