Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2018-04-01 17:27:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine" Sun Apr 1 17:27:58 2018 rev:249 rq:592845 version:3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2018-03-20 22:02:07.725861205 +0100 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2018-04-01 17:28:06.484084949 +0200 @@ -1,0 +2,12 @@ +Fri Mar 30 19:31:00 UTC 2018 - meissner@suse.com + +- Update to 3.5 development release + - More Vulkan support, including the vulkan-1 loader. + - Support for RSA and ECDSA cryptographic keys. + - Improved manifest file parser. + - Support for the Places toolbar in file dialogs. + - Various bug fixes. +- updated winetricks +- updated staging to 3.5 + +------------------------------------------------------------------- Old: ---- wine-3.4.tar.xz wine-3.4.tar.xz.sign wine-d3d9-patches-3.4.tar.xz wine-staging-3.4.tar.xz New: ---- wine-3.5.tar.xz wine-3.5.tar.xz.sign wine-d3d9-patches-3.5.tar.xz wine-staging-3.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.EUjj8v/_old 2018-04-01 17:28:08.420014881 +0200 +++ /var/tmp/diff_new_pack.EUjj8v/_new 2018-04-01 17:28:08.424014736 +0200 @@ -101,8 +101,8 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%define realver 3.4 -Version: 3.4 +%define realver 3.5 +Version: 3.5 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1-or-later @@ -140,7 +140,7 @@ ExclusiveArch: %{ix86} x86_64 ppc %arm %if %{staging} # upstream patch target version -%define staging_version 3.4 +%define staging_version 3.5 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel @@ -148,7 +148,7 @@ %endif %if %{nine} # upstream patch target version -%define nine_version 3.4 +%define nine_version 3.5 BuildRequires: Mesa-libd3d-devel BuildRequires: dri2proto-devel BuildRequires: libOSMesa-devel ++++++ _service ++++++ --- /var/tmp/diff_new_pack.EUjj8v/_old 2018-04-01 17:28:08.472012999 +0200 +++ /var/tmp/diff_new_pack.EUjj8v/_new 2018-04-01 17:28:08.472012999 +0200 @@ -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.4</param> + <param name="revision">refs/tags/v3.5</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.4</param> + <param name="revision">refs/tags/wine-d3d9-3.5</param> <param name="scm">git</param> </service> <service name="recompress" mode="disabled"> ++++++ wine-3.4.tar.xz -> wine-3.5.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-3.4.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-3.5.tar.xz differ: char 26, line 1 ++++++ wine-d3d9-patches-3.4.tar.xz -> wine-d3d9-patches-3.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.4/d3d9-helper.patch new/wine-d3d9-patches-3.5/d3d9-helper.patch --- old/wine-d3d9-patches-3.4/d3d9-helper.patch 2018-03-18 00:30:18.000000000 +0100 +++ new/wine-d3d9-patches-3.5/d3d9-helper.patch 2018-03-31 16:06:36.000000000 +0200 @@ -1,6 +1,6 @@ -From 5ddf2f0c5e72b819bdc45cc64096fec81d9503ee Mon Sep 17 00:00:00 2001 +From 763e579985e27ab80f276e93a3e2f609c3e02d83 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <commendsarnex@gmail.com> -Date: Sat, 17 Mar 2018 19:16:55 -0400 +Date: Sat, 31 Mar 2018 10:05:28 -0400 Subject: [PATCH] D3D9 Helper Signed-off-by: Nick Sarnie <commendsarnex@gmail.com> @@ -1025,5 +1025,5 @@ /* @makedep: winecfg.ico */ -- -2.16.2 +2.16.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.4/staging-helper.patch new/wine-d3d9-patches-3.5/staging-helper.patch --- old/wine-d3d9-patches-3.4/staging-helper.patch 2018-03-18 00:30:18.000000000 +0100 +++ new/wine-d3d9-patches-3.5/staging-helper.patch 2018-03-31 16:06:36.000000000 +0200 @@ -1,6 +1,6 @@ -From ff5f6994f364f59320ac6fb146238cc6ed6f744d Mon Sep 17 00:00:00 2001 +From 390a5a66bb1fd749885fbea3d3b6ab2cd9ed69f6 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <commendsarnex@gmail.com> -Date: Sat, 17 Mar 2018 19:08:26 -0400 +Date: Sat, 31 Mar 2018 10:03:56 -0400 Subject: [PATCH] Staging Helper Signed-off-by: Nick Sarnie <commendsarnex@gmail.com> @@ -119,5 +119,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.16.2 +2.16.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.4/wine-d3d9.patch new/wine-d3d9-patches-3.5/wine-d3d9.patch --- old/wine-d3d9-patches-3.4/wine-d3d9.patch 2018-03-18 00:30:18.000000000 +0100 +++ new/wine-d3d9-patches-3.5/wine-d3d9.patch 2018-03-31 16:06:36.000000000 +0200 @@ -1,6 +1,6 @@ -From aa019ab10a175cbbaacf00bd43270b79122685e6 Mon Sep 17 00:00:00 2001 +From 6f18703feb2f89042a25fb09e7d07d48a8f9c125 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <commendsarnex@gmail.com> -Date: Sat, 17 Mar 2018 19:14:34 -0400 +Date: Sat, 31 Mar 2018 10:04:12 -0400 Subject: [PATCH] Wine D3D9 Signed-off-by: Nick Sarnie <commendsarnex@gmail.com> @@ -41,7 +41,7 @@ create mode 100644 dlls/d3d9-nine/wndproc.h diff --git a/configure.ac b/configure.ac -index 04b79d2876..595b17f210 100644 +index 0a365d9c43..93c9d823fd 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -5781,5 +5781,5 @@ + +#endif -- -2.16.2 +2.16.3 ++++++ wine-staging-3.4.tar.xz -> wine-staging-3.5.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-staging-3.4.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-staging-3.5.tar.xz differ: char 26, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.EUjj8v/_old 2018-04-01 17:28:08.640006919 +0200 +++ /var/tmp/diff_new_pack.EUjj8v/_new 2018-04-01 17:28:08.644006774 +0200 @@ -4951,6 +4951,11 @@ WINETRICKS_CONFIG="${XDG_CONFIG_HOME}/winetricks" #test -d "$WINETRICKS_CONFIG" || mkdir -p "$WINETRICKS_CONFIG" + # Load country code from config file only when "--country=" option is not specified + if test -z "$W_COUNTRY" -a -f "${WINETRICKS_CONFIG}"/country; then + W_COUNTRY="$(cat "${WINETRICKS_CONFIG}"/country)" + fi + # Pin a task to a single cpu. Helps prevent race conditions. # # Linux/FreeBSD: supported @@ -5129,6 +5134,7 @@ Executes given verbs. Each verb installs an application or changes a setting. Options: + --country=CC Set country code to CC and don't detect your IP address --force Don't check whether packages were already installed --gui Show gui diagnostics even when driven by commandline --isolate Install each app or game in its own bottle (WINEPREFIX) @@ -5166,6 +5172,7 @@ winetricks_handle_option() { case "$1" in + --country=*) W_COUNTRY="${1##--country=}" ;; --force) WINETRICKS_FORCE=1;; --gui) winetricks_detect_gui;; -h|--help) winetricks_usage ; exit 0 ;; @@ -8212,13 +8219,17 @@ publisher="Amazon" \ year="2017" \ media="download" \ - file1="KindleForPC-installer-1.20.47037.exe" \ + file1="KindleForPC-installer-1.16.44025.exe" \ installed_exe1="$W_PROGRAMS_WIN/Amazon/Kindle/Kindle.exe" \ homepage="https://www.amazon.com/kindle-dbs/fd/kcp" load_kindle() { - w_download https://s3.amazonaws.com/kindleforpc/47037/KindleForPC-installer-1.20.47037.... cb20581d3455d458c7ac4bafa5c67dcfc5186c7b35951168efcf5a8263706b47 + if w_workaround_wine_bug 43508; then + w_warn "Using an older version of Kindle (1.16.44025) to work around https://bugs.winehq.org/show_bug.cgi?id=43508" + fi + + w_download https://s3.amazonaws.com/kindleforpc/44025/KindleForPC-installer-1.16.44025.... w_try_cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /S} @@ -10089,10 +10100,10 @@ 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 + w_try rm -f "$W_SYSTEM32_DLLS"/windowscodecs.dll "$W_SYSTEM32_DLLS"/windowscodecsext.dll "$W_SYSTEM32_DLLS"/wmphoto.dll "$W_SYSTEM32_DLLS"/photometadatahandler.dll if [ "$W_ARCH" = "win64" ]; then - w_try rm -f "$W_SYSTEM64_DLLS"/windowscodecs.dll "$W_SYSTEM64_DLLS"/windowscodecsext.dll "$W_SYSTEM64_DLLS"/photometadatahandler.dll + w_try rm -f "$W_SYSTEM64_DLLS"/windowscodecs.dll "$W_SYSTEM64_DLLS"/windowscodecsext.dll "$W_SYSTEM64_DLLS"/wmphoto.dll "$W_SYSTEM64_DLLS"/photometadatahandler.dll fi # AF says in AppDB entry for .NET 3.0 that windowscodecs has to be native only @@ -10256,17 +10267,12 @@ w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xapofx*.dll' "$x" done - if test "$W_ARCH" = "win64" ; then - w_try_cabextract -d "$W_TMP" -L -F '*_xact_*x64*' "$W_CACHE/directx9/$DIRECTX_NAME" - w_try_cabextract -d "$W_TMP" -L -F '*_x3daudio_*x64*' "$W_CACHE/directx9/$DIRECTX_NAME" - w_try_cabextract -d "$W_TMP" -L -F '*_xaudio_*x64*' "$W_CACHE/directx9/$DIRECTX_NAME" - for x in "$W_TMP"/*x64.cab ; do - w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xactengine*.dll' "$x" - w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xaudio*.dll' "$x" - w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'x3daudio*.dll' "$x" - w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xapofx*.dll' "$x" - done - fi + # Don't install 64-bit xact DLLs. They are broken in Wine, see: + # https://bugs.winehq.org/show_bug.cgi?id=41618#c5 + + w_override_dlls native,builtin xaudio2_0 xaudio2_1 xaudio2_2 xaudio2_3 xaudio2_4 xaudio2_5 xaudio2_6 xaudio2_7 + w_override_dlls native,builtin x3daudio1_0 x3daudio1_1 x3daudio1_2 x3daudio1_3 x3daudio1_4 x3daudio1_5 x3daudio1_6 x3daudio1_7 + w_override_dlls native,builtin xapofx1_1 xapofx1_2 xapofx1_3 xapofx1_4 xapofx1_5 # Register xactengine?_?.dll for x in "$W_SYSTEM32_DLLS"/xactengine* ; do @@ -12250,6 +12256,69 @@ #---------------------------------------------------------------- +w_metadata office2013pro apps \ + title="Microsoft Office 2013 Professional" \ + publisher="Microsoft" \ + year="2013" \ + media="download" \ + file1="setup.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Microsoft Office/Office15/WINWORD.EXE" + +load_office2013pro() +{ + w_package_unsupported_win64 + + if [ ! -x "$(which ntlm_auth 2>/dev/null)" ]; then + w_die "winbind (part of samba) is required for the installation" + fi + + # link from https://www.askvg.com/direct-download-link-microsoft-office-2013-professiona... + w_download http://care.dlservice.microsoft.com/dl/download/2/9/C/29CC45EF-4CDA-4710-9FB... 236f8faae3f979ec72592a63784bba2f0d614916350c44631221b88ae9dae206 "OFFICE15.iso" + + w_set_winver win7 + + w_call corefonts + w_call tahoma + + w_call riched20 + + + if w_workaround_wine_bug 43581 "Wine has problems parsing some regex strings during installation"; then + w_call msxml6 + fi + + if w_workaround_wine_bug 38648 "DirectX < 11 has problems with black window after installation" ,3.0; then + cat > "$W_TMP"/MaxVersionGL.reg <<_EOF_ +REGEDIT4 + +[HKEY_CURRENT_USER\\Software\\Wine\\Direct3D] +"MaxVersionGL"=dword:00030002 + +_EOF_ + w_try_regedit "$W_TMP_WIN"\\MaxVersionGL.reg + fi + + w_mount OFFICE15 + + if test $W_OPT_UNATTENDED; then + cat > "$W_TMP"/config.xml <<_EOF_ +<Configuration Product="ProPlus"> +<Display Level="none" CompletionNotice="no" SuppressModal="yes" AcceptEula="yes" /> +</Configuration> +_EOF_ + w_try "$WINE" "${W_ISO_MOUNT_LETTER}:${file1}" /config "$W_TMP_WIN"\\config.xml + else + w_try "$WINE" "${W_ISO_MOUNT_LETTER}:${file1}" + fi + + w_wineserver -w + w_umount + + w_warn "Microsoft Office 2013 is far away from running stable under wine 3.3. It should not be used in a productive environment." +} + +#---------------------------------------------------------------- + w_metadata picasa39 apps \ title="Picasa 3.9" \ publisher="Google" \ @@ -18546,11 +18615,11 @@ # CSMT settings w_metadata csmt=on settings \ - title_uk="Увімкнути Command Stream Multithreading" \ - title="Enable Command Stream Multithreading" + title_uk="Увімкнути Command Stream Multithreading (за замовчуванням)" \ + title="Enable Command Stream Multithreading (default)" w_metadata csmt=off settings \ - title_uk="Вимкнути Command Stream Multithreading (за замовчуванням)" \ - title="Disable Command Stream Multithreading (default)" + title_uk="Вимкнути Command Stream Multithreading"\ + title="Disable Command Stream Multithreading" load_csmt() { ++++++ winetricks.1 ++++++ --- /var/tmp/diff_new_pack.EUjj8v/_old 2018-04-01 17:28:08.668005905 +0200 +++ /var/tmp/diff_new_pack.EUjj8v/_new 2018-04-01 17:28:08.668005905 +0200 @@ -22,6 +22,11 @@ .SH OPTIONS .TP .B +\-\-country=CC +Set country code to CC and don't detect your IP address +when retrying downloads +.TP +.B \-\-force Don't check whether packages were already installed .TP