Attachment 230324 Details for Bug 260612 – patch

[patch] patch

273ac68a00.patch (text/plain), 4.83 KB, created by Ivan Rozhuk on 2021-12-22 22:27:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2021-12-22 22:27:00 UTC

Size: 4.83 KB

patch

obsolete

>From 273ac68a00c9d40a598a0fd6a4aa4dd43e5954fd 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
>
>---
> emulators/wine-devel/Makefile                         |  4 +++-
> .../wine-devel/files/patch-dlls_ntdll_unix_virtual.c  | 11 +++++++++++
> emulators/wine-devel/pkg-plist                        | 10 +++++-----
> 3 files changed, 19 insertions(+), 6 deletions(-)
> create mode 100644 emulators/wine-devel/files/patch-dlls_ntdll_unix_virtual.c
>
>diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
>index 2641b88d5dac..99b6377547fe 100644
>--- a/emulators/wine-devel/Makefile
>+++ b/emulators/wine-devel/Makefile
>@@ -146,7 +146,9 @@ PLIST_SUB+=		WINE32="" WINE64="@comment " WINEARCH="i386"
> .endif
> 
> post-extract-STAGING-on: fix-shebang
>-	cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${STAGING_DIST} --strip-components 1
>+	@${LN} -s ${WRKDIR}/${PORTNAME}-staging-${DISTVERSION}/patches ${WRKSRC}/patches
>+
>+post-patch-STAGING-on:
> 	cd ${WRKSRC} && ${PATCH} -p0 < ${PATCHDIR}/extra-gitapply
> 	cd ${WRKSRC} && bash ./patches/patchinstall.sh --backend=patch DESTDIR=${WRKSRC} --all
> 
>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 305c9afd59dd..837d3b7e3293 100644
>--- a/emulators/wine-devel/pkg-plist
>+++ b/emulators/wine-devel/pkg-plist
>@@ -1265,7 +1265,7 @@ lib/wine/%%WINEARCH%%-unix/api-ms-win-core-psapi-obsolete-l1-1-0.dll.so
> lib/wine/%%WINEARCH%%-unix/api-ms-win-core-psm-appnotify-l1-1-0.dll.so
> lib/wine/%%WINEARCH%%-unix/api-ms-win-core-quirks-l1-1-0.dll.so
> lib/wine/%%WINEARCH%%-unix/api-ms-win-core-realtime-l1-1-0.dll.so
>-%%STAGING%%lib/wine/%%WINEARCH%%-unix/api-ms-win-core-realtime-l1-1-1.dll.so
>+lib/wine/%%WINEARCH%%-unix/api-ms-win-core-realtime-l1-1-1.dll.so
> lib/wine/%%WINEARCH%%-unix/api-ms-win-core-registry-l1-1-0.dll.so
> lib/wine/%%WINEARCH%%-unix/api-ms-win-core-registry-l2-1-0.dll.so
> lib/wine/%%WINEARCH%%-unix/api-ms-win-core-registry-l2-2-0.dll.so
>@@ -2088,7 +2088,7 @@ lib/wine/%%WINEARCH%%-unix/notepad.exe.so
> lib/wine/%%WINEARCH%%-unix/npmshtml.dll.so
> lib/wine/%%WINEARCH%%-unix/npptools.dll.so
> lib/wine/%%WINEARCH%%-unix/nsi.dll.so
>-%%STAGING%%lib/wine/%%WINEARCH%%-unix/nsiproxy.so
>+lib/wine/%%WINEARCH%%-unix/nsiproxy.so
> lib/wine/%%WINEARCH%%-unix/nsiproxy.sys.so
> lib/wine/%%WINEARCH%%-unix/ntdll.dll.so
> lib/wine/%%WINEARCH%%-unix/ntdll.so
>@@ -2306,7 +2306,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
>@@ -2558,7 +2558,7 @@ lib/wine/%%WINEARCH%%-windows/api-ms-win-core-psapi-obsolete-l1-1-0.dll
> lib/wine/%%WINEARCH%%-windows/api-ms-win-core-psm-appnotify-l1-1-0.dll
> lib/wine/%%WINEARCH%%-windows/api-ms-win-core-quirks-l1-1-0.dll
> lib/wine/%%WINEARCH%%-windows/api-ms-win-core-realtime-l1-1-0.dll
>-%%STAGING%%lib/wine/%%WINEARCH%%-windows/api-ms-win-core-realtime-l1-1-1.dll
>+lib/wine/%%WINEARCH%%-windows/api-ms-win-core-realtime-l1-1-1.dll
> lib/wine/%%WINEARCH%%-windows/api-ms-win-core-registry-l1-1-0.dll
> lib/wine/%%WINEARCH%%-windows/api-ms-win-core-registry-l2-1-0.dll
> lib/wine/%%WINEARCH%%-windows/api-ms-win-core-registry-l2-2-0.dll
>@@ -3347,7 +3347,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

Actions: View | Diff

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