mirror of
https://abf.rosa.ru/djam/wine.git
synced 2025-02-24 06:42:47 +00:00
Updated to 3.18
This commit is contained in:
parent
f2802f9616
commit
228ef537fa
3 changed files with 20 additions and 17 deletions
8
.abf.yml
8
.abf.yml
|
@ -1,6 +1,6 @@
|
|||
sources:
|
||||
wine-3.12.tar.xz: 79ce06feb7096ace87b8d9d72e6f1e167c17f96c
|
||||
wine-3.12.tar.xz.sign: 67bf44107fea7cfbc5ed175b360d9088ad859c2a
|
||||
wine-staging-3.12.tar.gz: a013bbdac1b7fd2c9b2f3a0f4c65e35dbe3497e5
|
||||
wine-d3d9-patches-wine-d3d9-3.12.tar.gz: 4350e26f0791de369baee8b10fc72dc05b8c35bd
|
||||
wine-3.18.tar.xz: 2222bc4d91f33f9db158af825d46aa21035dfa0b
|
||||
wine-3.18.tar.xz.sign: d96ee1811f7fc9d91faa46164b74cdf62d885229
|
||||
wine-staging-3.18.tar.gz: 49148c657fe3756c69ce8cd4adbc16439fa7cec2
|
||||
wine-d3d9-patches-wine-d3d9-3.18.tar.gz: 01bcc7c32288d022e67078c6f1087ec0438455b5
|
||||
winetricks-20180815.tar.gz: e927590ecedce4ace13c6a721fa449d8c8386496
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
diff -ur wine-3.6/dlls/ntdll/server.c wine-3.6_patched/dlls/ntdll/server.c
|
||||
--- wine-3.6/dlls/ntdll/server.c 2018-04-13 23:52:23.000000000 +0300
|
||||
+++ wine-3.6_patched/dlls/ntdll/server.c 2018-04-15 13:20:26.850259581 +0300
|
||||
@@ -1163,6 +1163,19 @@
|
||||
mkdir( "drive_c", 0777 );
|
||||
diff -rupN wine-3.16.old/dlls/ntdll/server.c wine-3.16/dlls/ntdll/server.c
|
||||
--- wine-3.16.old/dlls/ntdll/server.c 2018-09-14 21:19:10.000000000 +0200
|
||||
+++ wine-3.16/dlls/ntdll/server.c 2018-09-17 16:58:46.116353880 +0200
|
||||
@@ -1165,6 +1165,19 @@ static int setup_config_dir(void)
|
||||
symlink( "../drive_c", "dosdevices/c:" );
|
||||
symlink( "/", "dosdevices/z:" );
|
||||
+
|
||||
+ /* Mandriva specific */
|
||||
|
||||
+ /* Mandriva specific */
|
||||
+#if @MDKVERSION@ >= 200810
|
||||
+ symlink( "/media/floppy", "dosdevices/a:" );
|
||||
+#elif @MDKVERSION@ >= 200800
|
||||
|
@ -18,6 +17,7 @@ diff -ur wine-3.6/dlls/ntdll/server.c wine-3.6_patched/dlls/ntdll/server.c
|
|||
+#endif
|
||||
+ symlink( getenv( "HOME" ), "dosdevices/d:" );
|
||||
+ symlink( "/dev/ttyUSB0", "dosdevices/com4" );
|
||||
}
|
||||
|
||||
|
||||
+
|
||||
done:
|
||||
if (fd_cwd == -1) fd_cwd = open( "dosdevices/c:", O_RDONLY );
|
||||
fcntl( fd_cwd, F_SETFD, FD_CLOEXEC );
|
|
@ -24,8 +24,8 @@
|
|||
|
||||
Summary: WINE Is Not An Emulator - runs MS Windows programs
|
||||
Name: wine
|
||||
Version: 3.12
|
||||
Release: 5
|
||||
Version: 3.18
|
||||
Release: 1
|
||||
Epoch: 2
|
||||
License: LGPLv2+
|
||||
Group: Emulators
|
||||
|
@ -55,7 +55,7 @@ Source10: wine.rpmlintrc
|
|||
# only on 2008.0: e: => /media/cdrom (does not exist on 2008.1+)
|
||||
# com4 => /dev/ttyUSB0 (replaces /dev/ttyS3)
|
||||
# have to substitute @MDKVERSION@ in dlls/ntdll/server.c
|
||||
Patch0: wine-mdkconf.patch
|
||||
Patch0: wine-3.16-mdkconf.patch
|
||||
Patch1: wine-3.6-staging-ru-localization.patch
|
||||
# Working workaround for Steam troubles
|
||||
# Also fixed by passing -no-cef-sandbox to the cmd line
|
||||
|
@ -174,8 +174,10 @@ Suggests: webcore-fonts
|
|||
|
||||
%ifarch %{ix86}
|
||||
Conflicts: wine64
|
||||
Conflicts: wine < %{EVRD}
|
||||
%else
|
||||
Conflicts: wine
|
||||
Conflicts: wine64 < %{EVRD}
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
@ -375,6 +377,7 @@ autoreconf -vfi
|
|||
%ifarch x86_64
|
||||
--enable-win64 \
|
||||
%endif
|
||||
--without-pulse
|
||||
|
||||
%make depend
|
||||
%make
|
||||
|
|
Loading…
Add table
Reference in a new issue