Attachment 230975 Details for Bug 260612 – patch

[patch] patch

58002ce2a9.patch (text/plain), 2.47 KB, created by Ivan Rozhuk on 2022-01-13 08:21:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2022-01-13 08:21:59 UTC

Size: 2.47 KB

patch

obsolete

>From 58002ce2a959751393bc824a3a23ec5ccb037e29 Mon Sep 17 00:00:00 2001
>From: Rozhuk Ivan <rozhuk.im@gmail.com>
>Date: Wed, 22 Dec 2021 17:22:09 +0300
>Subject: [PATCH] emulators/wine-devel: - extract staging only once - fix
> plist: some files was wrongly marked as STAGING - add thread stack size
> calculation patch
>
>---
> .../wine-devel/files/patch-dlls_ntdll_unix_virtual.c  | 11 +++++++++++
> emulators/wine-devel/pkg-plist                        |  4 ++--
> 2 files changed, 13 insertions(+), 2 deletions(-)
> create mode 100644 emulators/wine-devel/files/patch-dlls_ntdll_unix_virtual.c
>
>diff --git a/emulators/wine-devel/files/patch-dlls_ntdll_unix_virtual.c b/emulators/wine-devel/files/patch-dlls_ntdll_unix_virtual.c
>new file mode 100644
>index 000000000000..d6e7d0d90948
>--- /dev/null
>+++ b/emulators/wine-devel/files/patch-dlls_ntdll_unix_virtual.c
>@@ -0,0 +1,11 @@
>+--- dlls/ntdll/unix/virtual.c	2021-12-22 04:19:04.331401000 +0300
>++++ dlls/ntdll/unix/virtual.c	2021-12-22 03:43:41.570061000 +0300
>+@@ -3230,7 +3230,7 @@
>+     if (!commit_size) commit_size = main_image_info.CommittedStackSize;
>+ 
>+     size = max( reserve_size, commit_size );
>+-    if (size < 1024 * 1024) size = 1024 * 1024;  /* Xlib needs a large stack */
>++    size += (4 * 1024 * 1024);  /* Xlib needs a large stack. */
>+     size = (size + 0xffff) & ~0xffff;  /* round to 64K boundary */
>+ 
>+     server_enter_uninterrupted_section( &virtual_mutex, &sigset );
>diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
>index f7fa00744cf5..5f8a433f5c45 100644
>--- a/emulators/wine-devel/pkg-plist
>+++ b/emulators/wine-devel/pkg-plist
>@@ -2309,7 +2309,7 @@ lib/wine/%%WINEARCH%%-unix/where.exe.so
> lib/wine/%%WINEARCH%%-unix/whoami.exe.so
> lib/wine/%%WINEARCH%%-unix/wiaservc.dll.so
> lib/wine/%%WINEARCH%%-unix/wimgapi.dll.so
>-%%STAGING%%%%WINE32%%lib/wine/%%WINEARCH%%-unix/win32k.sys.so
>+%%WINE32%%lib/wine/%%WINEARCH%%-unix/win32k.sys.so
> %%WINE32%%lib/wine/%%WINEARCH%%-unix/win32s16.dll16.so
> lib/wine/%%WINEARCH%%-unix/win32u.dll.so
> lib/wine/%%WINEARCH%%-unix/win32u.so
>@@ -3351,7 +3351,7 @@ lib/wine/%%WINEARCH%%-windows/where.exe
> lib/wine/%%WINEARCH%%-windows/whoami.exe
> lib/wine/%%WINEARCH%%-windows/wiaservc.dll
> lib/wine/%%WINEARCH%%-windows/wimgapi.dll
>-%%STAGING%%%%WINE32%%lib/wine/%%WINEARCH%%-windows/win32k.sys
>+%%WINE32%%lib/wine/%%WINEARCH%%-windows/win32k.sys
> %%WINE32%%lib/wine/%%WINEARCH%%-windows/win32s16.dll16
> lib/wine/%%WINEARCH%%-windows/win32u.dll
> %%WINE32%%lib/wine/%%WINEARCH%%-windows/win87em.dll16

Flags:

rozhuk.im: maintainer-approval?

Actions: View | Diff

Attachments on bug 260612: 230316 | 230317 | 230324 | 230975