Attachment #230324 for bug #260612

Lines 146-152 PLIST_SUB+= WINE32="" WINE64="@comment " WINEARCH="i386" Link Here

(-)b/emulators/wine-devel/Makefile (-1 / +3 lines)
146	.endif	146	.endif
147		147
148	post-extract-STAGING-on: fix-shebang	148	post-extract-STAGING-on: fix-shebang
149	cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${STAGING_DIST} --strip-components 1	149	@${LN} -s ${WRKDIR}/${PORTNAME}-staging-${DISTVERSION}/patches ${WRKSRC}/patches
		150
		151	post-patch-STAGING-on:
150	cd ${WRKSRC} && ${PATCH} -p0 < ${PATCHDIR}/extra-gitapply	152	cd ${WRKSRC} && ${PATCH} -p0 < ${PATCHDIR}/extra-gitapply
151	cd ${WRKSRC} && bash ./patches/patchinstall.sh --backend=patch DESTDIR=${WRKSRC} --all	153	cd ${WRKSRC} && bash ./patches/patchinstall.sh --backend=patch DESTDIR=${WRKSRC} --all
152		154

Added Link Here

(-)b/emulators/wine-devel/files/patch-dlls_ntdll_unix_virtual.c (+11 lines)
1	--- dlls/ntdll/unix/virtual.c 2021-12-22 04:19:04.331401000 +0300
2	+++ dlls/ntdll/unix/virtual.c 2021-12-22 03:43:41.570061000 +0300
3	@@ -3230,7 +3230,7 @@
4	if (!commit_size) commit_size = main_image_info.CommittedStackSize;
5
6	size = max( reserve_size, commit_size );
7	- if (size < 1024 * 1024) size = 1024 * 1024; /* Xlib needs a large stack */
8	+ size += (4 * 1024 * 1024); /* Xlib needs a large stack. */
9	size = (size + 0xffff) & ~0xffff; /* round to 64K boundary */
10
11	server_enter_uninterrupted_section( &virtual_mutex, &sigset );




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
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

lib/wine/%%WINEARCH%%-unix/npmshtml.dll.so
lib/wine/%%WINEARCH%%-unix/npptools.dll.so
lib/wine/%%WINEARCH%%-unix/nsi.dll.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

lib/wine/%%WINEARCH%%-unix/whoami.exe.so
lib/wine/%%WINEARCH%%-unix/wiaservc.dll.so
lib/wine/%%WINEARCH%%-unix/wimgapi.dll.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

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
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

lib/wine/%%WINEARCH%%-windows/whoami.exe
lib/wine/%%WINEARCH%%-windows/wiaservc.dll
lib/wine/%%WINEARCH%%-windows/wimgapi.dll
%%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

Return to bug 260612

Lines 1265-1271 lib/wine/%%WINEARCH%%-unix/api-ms-win-core-psapi-obsolete-l1-1-0.dll.so Link Here

(-)b/emulators/wine-devel/pkg-plist (-5 / +5 lines)
1265	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-psm-appnotify-l1-1-0.dll.so	1265	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-psm-appnotify-l1-1-0.dll.so
1266	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-quirks-l1-1-0.dll.so	1266	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-quirks-l1-1-0.dll.so
1267	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-realtime-l1-1-0.dll.so	1267	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-realtime-l1-1-0.dll.so
1268	%%STAGING%%lib/wine/%%WINEARCH%%-unix/api-ms-win-core-realtime-l1-1-1.dll.so	1268	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-realtime-l1-1-1.dll.so
1269	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-registry-l1-1-0.dll.so	1269	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-registry-l1-1-0.dll.so
1270	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-registry-l2-1-0.dll.so	1270	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-registry-l2-1-0.dll.so
1271	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-registry-l2-2-0.dll.so	1271	lib/wine/%%WINEARCH%%-unix/api-ms-win-core-registry-l2-2-0.dll.so
Lines 2088-2094 lib/wine/%%WINEARCH%%-unix/notepad.exe.so Link Here
2088	lib/wine/%%WINEARCH%%-unix/npmshtml.dll.so	2088	lib/wine/%%WINEARCH%%-unix/npmshtml.dll.so
2089	lib/wine/%%WINEARCH%%-unix/npptools.dll.so	2089	lib/wine/%%WINEARCH%%-unix/npptools.dll.so
2090	lib/wine/%%WINEARCH%%-unix/nsi.dll.so	2090	lib/wine/%%WINEARCH%%-unix/nsi.dll.so
2091	%%STAGING%%lib/wine/%%WINEARCH%%-unix/nsiproxy.so	2091	lib/wine/%%WINEARCH%%-unix/nsiproxy.so
2092	lib/wine/%%WINEARCH%%-unix/nsiproxy.sys.so	2092	lib/wine/%%WINEARCH%%-unix/nsiproxy.sys.so
2093	lib/wine/%%WINEARCH%%-unix/ntdll.dll.so	2093	lib/wine/%%WINEARCH%%-unix/ntdll.dll.so
2094	lib/wine/%%WINEARCH%%-unix/ntdll.so	2094	lib/wine/%%WINEARCH%%-unix/ntdll.so
Lines 2306-2312 lib/wine/%%WINEARCH%%-unix/where.exe.so Link Here
2306	lib/wine/%%WINEARCH%%-unix/whoami.exe.so	2306	lib/wine/%%WINEARCH%%-unix/whoami.exe.so
2307	lib/wine/%%WINEARCH%%-unix/wiaservc.dll.so	2307	lib/wine/%%WINEARCH%%-unix/wiaservc.dll.so
2308	lib/wine/%%WINEARCH%%-unix/wimgapi.dll.so	2308	lib/wine/%%WINEARCH%%-unix/wimgapi.dll.so
2309	%%STAGING%%%%WINE32%%lib/wine/%%WINEARCH%%-unix/win32k.sys.so	2309	%%WINE32%%lib/wine/%%WINEARCH%%-unix/win32k.sys.so
2310	%%WINE32%%lib/wine/%%WINEARCH%%-unix/win32s16.dll16.so	2310	%%WINE32%%lib/wine/%%WINEARCH%%-unix/win32s16.dll16.so
2311	lib/wine/%%WINEARCH%%-unix/win32u.dll.so	2311	lib/wine/%%WINEARCH%%-unix/win32u.dll.so
2312	lib/wine/%%WINEARCH%%-unix/win32u.so	2312	lib/wine/%%WINEARCH%%-unix/win32u.so
Lines 2558-2564 lib/wine/%%WINEARCH%%-windows/api-ms-win-core-psapi-obsolete-l1-1-0.dll Link Here
2558	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-psm-appnotify-l1-1-0.dll	2558	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-psm-appnotify-l1-1-0.dll
2559	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-quirks-l1-1-0.dll	2559	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-quirks-l1-1-0.dll
2560	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-realtime-l1-1-0.dll	2560	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-realtime-l1-1-0.dll
2561	%%STAGING%%lib/wine/%%WINEARCH%%-windows/api-ms-win-core-realtime-l1-1-1.dll	2561	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-realtime-l1-1-1.dll
2562	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-registry-l1-1-0.dll	2562	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-registry-l1-1-0.dll
2563	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-registry-l2-1-0.dll	2563	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-registry-l2-1-0.dll
2564	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-registry-l2-2-0.dll	2564	lib/wine/%%WINEARCH%%-windows/api-ms-win-core-registry-l2-2-0.dll
Lines 3347-3353 lib/wine/%%WINEARCH%%-windows/where.exe Link Here
3347	lib/wine/%%WINEARCH%%-windows/whoami.exe	3347	lib/wine/%%WINEARCH%%-windows/whoami.exe
3348	lib/wine/%%WINEARCH%%-windows/wiaservc.dll	3348	lib/wine/%%WINEARCH%%-windows/wiaservc.dll
3349	lib/wine/%%WINEARCH%%-windows/wimgapi.dll	3349	lib/wine/%%WINEARCH%%-windows/wimgapi.dll
3350	%%STAGING%%%%WINE32%%lib/wine/%%WINEARCH%%-windows/win32k.sys	3350	%%WINE32%%lib/wine/%%WINEARCH%%-windows/win32k.sys
3351	%%WINE32%%lib/wine/%%WINEARCH%%-windows/win32s16.dll16	3351	%%WINE32%%lib/wine/%%WINEARCH%%-windows/win32s16.dll16
3352	lib/wine/%%WINEARCH%%-windows/win32u.dll	3352	lib/wine/%%WINEARCH%%-windows/win32u.dll
3353	%%WINE32%%lib/wine/%%WINEARCH%%-windows/win87em.dll16	3353	%%WINE32%%lib/wine/%%WINEARCH%%-windows/win87em.dll16