Update to 5.0.1 and 5.10

.abf.yml

@@ -1,8 +1,8 @@
 sources:
   icons-4.0.tar.xz: 3063b6fcf8d9aeedcb9ecaab9c522bed88a21c0a
   rosa-wine-desktop-4.4.1.tar.xz: 299d6a589af1e4db705f0e09190a8b388bb74b95
-  wine-5.0.tar.xz: d225098b2923808b2e73072ec20b81763e3ad7a5
-  wine-5.7.tar.xz: 8551eb9f5ca467833351568658c65c5eee43f2f3
+  wine-5.0.1.tar.xz: 1c6908c5289e146e3016aa6502edf23466949cb4
+  wine-5.10.tar.xz: 0bc7beb22e3d4d9ed13c00be27627741787cc9d3
   wine-nine-standalone-0.5.tar.gz: 7d24bac66d34493a725b1c47d7570daf60788532
-  wine-staging-5.7.tar.gz: 4378c2774811a42c95be95fee4afe1b6784d28e1
+  wine-staging-5.10.tar.gz: 0a85bfd4cdcf6d900cfd48d2e8502b70837a9c3c
   winetricks-20200412.tar.gz: ccf36402a3dd754f67f0b1fc7401dcc882a409aa

README.urpmi

@@ -1,9 +1,7 @@
 To install or update DXVK (DirectX10/DX11->Vulkan) in Wine
 run in a terminal:
-winetricks --force dxvk96
-or (latest, untested):
 winetricks --force dxvk
-To configure Gallium Nine D3D9 run in a terminal:
+To configure Gallium Nine D3D9 run:
 wine ninewinecfg
 or (for disable)
 wine ninewinecfg -d
@@ -12,10 +10,8 @@ wine ninewinecfg -d
 
 Для установки или обновления DXVK (DirectX10/DX11->Vulkan) в Wine
 запустите в терминале:
-winetricks --force dxvk96
-или (последнее, непроверенное):
 winetricks --force dxvk
-Для настройки Gallium Nine D3D9 запустите в терминале:
+Для настройки Gallium Nine D3D9 запустите:
 wine ninewinecfg
 или (для выключения)
 wine ninewinecfg -d

wine-4.14-fix-crackling-audio.patch

@@ -1,16 +0,0 @@
-diff -up wine-4.14/loader/main.c.omv~ wine-4.14/loader/main.c
---- wine-4.14/loader/main.c.omv~	2019-08-30 01:28:08.748036639 +0200
-+++ wine-4.14/loader/main.c	2019-08-30 01:31:44.770908819 +0200
-@@ -320,6 +320,12 @@ int main( int argc, char *argv[] )
-     char error[1024];
-     int i;
- 
-+    /* Workaround for crackling audio with many games (e.g. Civ3, Broken Sword 4, ...) */
-+    if (!getenv( "PULSE_LATENCY_MSEC" ) && !getenv( "WINE_DONT_MESS_WITH_PULSE" ))
-+    {
-+        setenv( "PULSE_LATENCY_MSEC", "60", 1);
-+    }
-+
-     if (!getenv( "WINELOADERNOEXEC" ))  /* first time around */
-     {
-         static char noexec[] = "WINELOADERNOEXEC=1";

wine-5.10-assertion-failed.patch

@@ -0,0 +1,12 @@
+diff -ur wine-5.10_patched/dlls/ntdll/unix/virtual.c wine-5.10_patched_patched/dlls/ntdll/unix/virtual.c
+--- wine-5.10_patched/dlls/ntdll/unix/virtual.c	2020-06-05 22:15:16.000000000 +0300
++++ wine-5.10_patched_patched/dlls/ntdll/unix/virtual.c	2020-06-09 18:48:13.592821152 +0300
+@@ -555,7 +555,7 @@
+     /* this should never happen */
+     if (range->base > view_base || range->end < view_end)
+         ERR( "range %p - %p is already partially mapped\n", view_base, view_end );
+-    assert( range->base <= view_base && range->end >= view_end );
++/*    assert( range->base <= view_base && range->end >= view_end );*/
+ 
+     /* need to split the range in two */
+     if (range->base < view_base && range->end > view_end)

wine-5.10-mdkconf.patch

@@ -0,0 +1,15 @@
+diff -ur wine-5.10/dlls/ntdll/unix/server.c wine-5.10_patched/dlls/ntdll/unix/server.c
+--- wine-5.10/dlls/ntdll/unix/server.c	2020-06-05 22:15:16.000000000 +0300
++++ wine-5.10_patched/dlls/ntdll/unix/server.c	2020-06-07 16:27:05.023605679 +0300
+@@ -1203,6 +1203,11 @@
+         mkdir( "drive_c", 0777 );
+         symlink( "../drive_c", "dosdevices/c:" );
+         symlink( "/", "dosdevices/z:" );
++
++	/* Rosa specific */
++	symlink( "/media/floppy", "dosdevices/a:" );
++	symlink( getenv( "HOME" ), "dosdevices/d:" );
++	symlink( "/dev/ttyUSB0", "dosdevices/com4" );
+     }
+     else if (errno != EEXIST) fatal_perror( "cannot create %s/dosdevices", config_dir );
+ 

wine-stable.rpmlintrc

@@ -6,8 +6,5 @@ addFilter("E: library-not-linked-against-libc")
 addFilter("E: explicit-lib-dependency")
 # Required to decipher the abbreviation
 addFilter("W: name-repeated-in-summary")
-# No libs in there
-addFilter("E: incoherent-version-in-name")
-addFilter("E: invalid-spec-name")
 addFilter("E: empty-%postun")
 

wine.spec

@@ -9,10 +9,10 @@
 %bcond_without	systemd
 
 # wine-staging tarball version
-%define stagver		5.7
+%define stagver		5.10
 
 # wine-stable tarball version
-%define	stabver		5.0
+%define	stabver		5.0.1
 
 %define	winetricks_ver	20200412
 %define	winenine_ver	0.5
@@ -79,16 +79,17 @@ Source25:	README.install.urpmi.i586.stable
 #		note that Wine also provides $HOME in My Documents)
 # com4 => /dev/ttyUSB0 (replaces /dev/ttyS3)
 # We have to substitute @MDKVERSION@ in dlls/ntdll/server.c
-Patch0:		wine-3.16-mdkconf.patch
+Patch0:		wine-5.10-mdkconf.patch
 # Russian localization
 Patch1:		wine-3.6-staging-ru-localization.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
-# From OpenMandriva
-Patch6:		wine-4.14-fix-crackling-audio.patch
 # https://bugs.winehq.org/show_bug.cgi?id=41930#c0
 Patch7:		0001-Revert-gdi32-Fix-arguments-for-OSMesaMakeCurrent-whe.patch
+# For wine-stable
+Patch8:		wine-3.16-mdkconf.patch
+Patch9:		wine-5.10-assertion-failed.patch
 # From CentOS
 Patch511:	wine-cjk.patch
 
@@ -217,7 +218,9 @@ Provides:	%{wine}-bin = %{EVRD}
 %rename		winetricks
 Conflicts:	%{wine64}
 Conflicts:	%{wine} < %{EVRD}
-Conflicts:	%{owine} %{owine32} %{owine}-binfmt
+Conflicts:	%{owine}
+Conflicts:	%{owine32}
+Conflicts:	%{owine}-binfmt
 %endif
 
 %description
@@ -337,6 +340,10 @@ files needed to support 32-bit Windows programs.
 
 %files -n %{wine32}
 %doc AUTHORS README.install.urpmi
+%if %{with unstable}
+%{_libdir}/wine/*.ax.so
+%{_libdir}/wine/ntdll.so
+%endif
 %{_bindir}/wine
 %{_bindir}/wine-preloader
 %{_libdir}/libwine*.so.%{major}*
@@ -366,7 +373,8 @@ Group:		Development/C
 Requires:	%{wine} = %{EVRD}
 %rename		%{devname}
 Conflicts:	%{wine64}-devel
-Conflicts:	%{owine}-devel %{owine}
+Conflicts:	%{owine}-devel
+Conflicts:	%{owine}
 
 %description -n %{wine}-devel
 Wine is a program which allows running Microsoft Windows programs (including
@@ -463,7 +471,10 @@ Provides:	%{wine}-bin = %{EVRD}
 %rename		winetricks
 Conflicts:	%{wine}
 Conflicts:	%{wine64} < %{EVRD}
-Conflicts:	%{owine64} %{owine32} %{owine64}-binfmt %{owine}-bin
+Conflicts:	%{owine64}
+Conflicts:	%{owine32}
+Conflicts:	%{owine64}-binfmt
+Conflicts:	%{owine}-bin
 
 %description -n %{wine64}
 Wine is a program which allows running Microsoft Windows programs (including
@@ -472,13 +483,14 @@ program loader which loads and executes a Microsoft Windows binary, and a
 library (called Winelib) that implements Windows API calls using their Unix or
 X11 equivalents. The library may also be used for porting Win32 code into
 native Unix executables.
-This package contains the Win64 version of Wine.
-You need the %{wine32} package
+This package contains the Win64 version of Wine. You need the wine32 package
 from the 32-bit repository to be able to run 32-bit applications.
 
 %files -n %{wine64}
 %doc ANNOUNCE AUTHORS README README.install.urpmi README.urpmi
 %if %{with unstable}
+%{_libdir}/wine/*.ax.so
+%{_libdir}/wine/ntdll.so
 %{_datadir}/wine/nls/c_*.nls
 %{_datadir}/wine/nls/l_intl.nls
 %{_datadir}/wine/nls/norm*.nls
@@ -645,19 +657,22 @@ systemctl stop systemd-binfmt.service
 
 %prep
 %setup -qn wine-%{version} -b5 -a6 -a11 -a12
+%if %{with unstable}
 %patch0 -p1 -b .conf
+%patch9 -p1 -b .assert
+%else
+%patch8 -p1 -b .conf
+%endif
 %patch1 -p1 -b .staging-localization
-%patch6 -p1 -b .pulse
 %patch7 -p1 -b .civ3
 %patch511 -p1 -b .cjk
 
-# Wine-staging
 %if %{with unstable}
+# Wine-staging
 gzip -dc "%{SOURCE4}" | /bin/tar -xf - --strip-components=1
 #patch4 -p1 -b .for-mock-urpm-build
 ./patches/patchinstall.sh DESTDIR="%{_builddir}/wine-%{version}" --all
 %endif
-
 # wine-nine-standalone
 pushd ../wine-nine-standalone-%{winenine_ver}
 %patch5 -p1 -b .wine-nine-localization
@@ -701,6 +716,7 @@ autoreconf -vfi
 	--with-gstreamer \
 	--without-oss \
 %if %{with unstable}
+	--without-pulse \
 	--with-xattr
 %endif
 
@@ -711,15 +727,13 @@ autoreconf -vfi
 pushd ../wine-nine-standalone-%{winenine_ver}
 export PKG_CONFIG_PATH=%{_libdir}/pkgconfig
 mkdir -p ./tmp
-sed -i "s/@PKG_CONFIG@/i586-unknown-linux-gnu-pkg-config/g" ./tools/cross-wine32.in
-sed -i "s/@PKG_CONFIG@/x86_64-unknown-linux-gnu-pkg-config/g" ./tools/cross-wine64.in
-cp ./tools/cross-wine32.in ./tools/cross-wine32
-cp ./tools/cross-wine64.in ./tools/cross-wine64
+sed -i "s/@PKG_CONFIG@/pkg-config/g" ./tools/cross-wine32.in
+sed -i "s/@PKG_CONFIG@/pkg-config/g" ./tools/cross-wine64.in
 meson \
 %ifarch x86_64
-	--cross-file "./tools/cross-wine64" \
+	--cross-file "./tools/cross-wine64.in" \
 %else
-	--cross-file "./tools/cross-wine32" \
+	--cross-file "./tools/cross-wine32.in" \
 %endif
 	--buildtype "release" \
 	--bindir bin \
@@ -796,7 +810,7 @@ cp %{SOURCE24} README.install.urpmi.x86_64
 cp %{SOURCE25} README.install.urpmi
 %endif
 %ifarch x86_64
-mv -f README.install.urpmi{.x86_64,}
+mv -f README.install.urpmi.x86_64 README.install.urpmi
 %else
 rm README.install.urpmi.x86_64
 %endif