Merge branch 'master' into rosa2016.1

.abf.yml

@@ -1,8 +1,8 @@
 sources:
   icons-4.0.tar.xz: 3063b6fcf8d9aeedcb9ecaab9c522bed88a21c0a
   rosa-wine-desktop-4.4.1.tar.xz: 299d6a589af1e4db705f0e09190a8b388bb74b95
-  wine-4.0.2.tar.xz: af82cb438cc892273bedda5ae6166510fc8fe902
+  wine-4.0.3.tar.xz: c8d19a0ee0cb7b5f9b45ef4b8441990b8976dcf8
-  wine-4.18.tar.xz: 87eed9c362324efbb6a299abcd03ef06292d578c
+  wine-4.21.tar.xz: 903d4929d5fa5a7b3a4fe33d56b02002f8666764
   wine-nine-standalone-0.5.tar.gz: 7d24bac66d34493a725b1c47d7570daf60788532
-  wine-staging-4.18.tar.gz: fdf9ae70d3c0d45f89a337a46bb522dc06e22147
+  wine-staging-4.21.tar.gz: a289297bd5f0a56136c5e3bf9bb87f171c3393a6
   winetricks-20190912.tar.gz: a0c16b95757bbe67c23ddcf5cb22b1ada69ac914

README.install.urpmi.x86_64.stable

@@ -1,5 +1,5 @@
-This is Wine for running Win64 applications. This version can only be used for
+This is Wine for running Win64 applications. This version can only be used to
-running 64-bit Windows applications as is. For running 32-bit Windows applications,
+run 64-bit Windows applications as is. For running 32-bit Windows applications,
 you need to also install the 'wine32-stable' package from the 32-bit repository.
 
 === Russian ===

README.install.urpmi.x86_64.staging

@@ -1,5 +1,5 @@
 This is Wine with Staging patches for running Win64 applications.
-This version can only be used for running 64-bit Windows applications as is.
+This version can only be used to run 64-bit Windows applications as is.
 For running 32-bit Windows applications, you need to also install
 the 'wine32' package from the 32-bit repository.
 

crossover_hack.patch

@@ -1,39 +0,0 @@
-diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 0883da5..99e3149 100644
---- a/dlls/kernel32/process.c
-+++ b/dlls/kernel32/process.c
-@@ -2651,6 +2651,33 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A
-         return FALSE;
-     if (hFile == INVALID_HANDLE_VALUE) goto done;
- 
-+    /* CROSSOVER HACK: bug 13322 (winehq bug 39403)
-+     * Insert --no-sandbox in command line of Steam's web helper process to
-+     * work around problems hooking our ntdll exports. */
-+    {
-+        static const WCHAR steamwebhelperexeW[] = {'s','t','e','a','m','w','e','b','h','e','l','p','e','r','.','e','x','e',0};
-+        static const WCHAR nosandboxW[] = {' ','-','-','n','o','-','s','a','n','d','b','o','x',0};
-+
-+        if (strstrW(name, steamwebhelperexeW))
-+        {
-+            LPWSTR new_command_line;
-+
-+            new_command_line = HeapAlloc(GetProcessHeap(), 0,
-+                sizeof(WCHAR) * (strlenW(tidy_cmdline) + strlenW(nosandboxW) + 1));
-+
-+            if (!new_command_line) return FALSE;
-+
-+            strcpyW(new_command_line, tidy_cmdline);
-+            strcatW(new_command_line, nosandboxW);
-+
-+            TRACE("CrossOver hack changing command line to %s\n", debugstr_w(new_command_line));
-+
-+            if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, tidy_cmdline );
-+            tidy_cmdline = new_command_line;
-+        }
-+    }
-+    /* end CROSSOVER HACK */
-+
-     /* Warn if unsupported features are used */
- 
-     if (flags & (IDLE_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | REALTIME_PRIORITY_CLASS |
- 

wine-4.0-fix-openal-opencl-headers-detection.patch

@@ -1,14 +0,0 @@
-diff -rupN wine-4.0.old/configure.ac wine-4.0/configure.ac
---- wine-4.0.old/configure.ac	2019-01-22 22:25:59.000000000 +0100
-+++ wine-4.0/configure.ac	2019-01-25 12:21:44.941850122 +0100
-@@ -421,8 +421,8 @@ AC_CHECK_HEADERS(\
- 	EGL/egl.h \
- 	IOKit/IOKitLib.h \
- 	IOKit/hid/IOHIDLib.h \
--	OpenAL/al.h \
--	OpenCL/opencl.h \
-+	AL/al.h \
-+	CL/opencl.h \
- 	QuickTime/ImageCompression.h \
- 	Security/Security.h \
- 	alias.h \

wine.spec

@@ -8,11 +8,11 @@
 %bcond_without	systemd
 
 # wine and staging tarballs version
-%define stagver		4.18
+%define stagver		4.21
 %define stagpver	4.x
 
 # wine-stable tarball version
-%define	stabver		4.0.2
+%define	stabver		4.0.3
 %define stabpver	4.0
 
 %define	winetricks_ver	20190912
@@ -45,7 +45,7 @@
 Summary:	WINE Is Not An Emulator - runs MS Windows programs
 Name:		%{wine}
 Version:	%{version}
-Release:	3
+Release:	1
 Epoch:		2
 License:	LGPLv2+
 Group:		Emulators
@@ -75,7 +75,6 @@ Source22:	README.install.urpmi.i586.staging
 Source24:	README.install.urpmi.x86_64.stable
 Source25:	README.install.urpmi.i586.stable
 
-
 # (Anssi 05/2008) Adds:
 # a: => /media/floppy (/mnt/floppy on 2007.1 and older)
 # d: => $HOME (at config_dir creation time, not refreshed if $HOME changes;
@@ -85,19 +84,10 @@ Source25:	README.install.urpmi.i586.stable
 Patch0:		wine-3.16-mdkconf.patch
 # Russian localization
 Patch1:		wine-3.6-staging-ru-localization.patch
-# Working workaround for Steam troubles
-# Also fixed by passing -no-cef-sandbox to the cmd line
-Patch2:		crossover_hack.patch
-# Configure searches for %%{_includedir}/OpenAL/al.h and %%{_includedir}/OpenCL/opencl.h,
-# while we have them in %%{_includedir}/AL/ and %%{_includedir}/CL/
-Patch3:		wine-4.0-fix-openal-opencl-headers-detection.patch
 # For build in mock-urpm only
 Patch4:		wine-staging-4.5-mock-urpm-broken-pipe.patch
 Patch5:		wine-nine-standalone-0.3-ru-localization.patch
 
-%if %{with unstable}
-BuildRequires:	faudio-devel
-%endif
 # This is needed to build wine-nine-standalone
 %ifarch x86_64
 BuildRequires:	%{wine64}-devel
@@ -118,6 +108,7 @@ BuildRequires:	prelink
 BuildRequires:	sgml-tools
 BuildRequires:	valgrind
 BuildRequires:	cups-devel
+BuildRequires:	faudio-devel
 BuildRequires:	gettext-devel
 BuildRequires:	glibc-static-devel
 BuildRequires:	gpm-devel
@@ -273,9 +264,6 @@ native Unix executables.
 %package -n %{wine32}
 Summary:	32-bit support for %{wine} and %{wine64} packages
 Group:		Emulators
-%if %{with unstable}
-Requires:	libfaudio0
-%endif
 # This is not an EVR-specific requirement, as otherwise on x86_64 urpmi could
 # resolve the dependency to wine64 even on upgrades, and therefore replace
 # wine+wine32 installation with a wine32+wine64 installation. - Anssi
@@ -284,6 +272,7 @@ Requires:	%{wine}-bin
 Requires:	alsa-plugins-pulseaudio
 Requires:	libasound2
 Requires:	libd3dtracker1
+Requires:	libfaudio0
 Requires:	libfreetype6
 Requires:	libpng16
 Requires:	libudev1
@@ -299,7 +288,7 @@ Suggests:	libncursesw5
 Suggests:	libncursesw6
 Suggests:	libsane1
 # This one is now integrated in Mesa
-Suggests:	libtxc_dxtn.so
+Suggests:	libtxc-dxtn
 Suggests:	libv4l0
 Suggests:	libvulkan1
 Suggests:	libxslt1
@@ -398,12 +387,10 @@ to develop programs running on Wine.
 %package -n %{wine64}
 Summary:	WINE Is Not An Emulator - runs MS Windows programs
 Group:		Emulators
-%if %{with unstable}
-Requires:	lib64faudio0
-%endif
 # wine dlopen's these, so let's add the dependencies ourself
 Requires:	lib64asound2
 Requires:	lib64d3dtracker1
+Requires:	lib64faudio0
 Requires:	lib64freetype6
 Requires:	lib64png16
 Requires:	lib64xi6
@@ -427,7 +414,7 @@ Suggests:	webcore-fonts
 Suggests:	%{wine32} = %{EVRD}
 Suggests:	%{wine64}-binfmt
 # This one is now part of Mesa
-Suggests:	libtxc_dxtn
+Suggests:	lib64txc-dxtn
 # Download wine64-gecko from internet, when start wine
 #Suggests:	wine64-gecko
 Provides:	%{wine}-bin = %{EVRD}
@@ -619,8 +606,6 @@ systemctl stop systemd-binfmt.service
 %setup -qn wine-%{version} -b5 -a6 -a11 -a12
 %patch0 -p1 -b .conf
 %patch1 -p1 -b .staging-localization
-%patch2 -p1 -b .crossover_hack
-%patch3 -p1 -b .fix-headers
 
 # Wine-staging
 %if %{with unstable}
@@ -664,8 +649,8 @@ autoreconf -vfi
 	--with-gstreamer \
 	--without-oss \
 %if %{with unstable}
-	--with-xattr \
+	--without-pulse \
-	--without-pulse
+	--with-xattr
 %endif
 
 %make depend