Attachment 216596 Details for Bug 248118 – STAGING work again

[patch] STAGING work again

wine-devel.diff (text/plain), 4.67 KB, created by Vladimir Druzenko on 2020-07-20 07:32:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2020-07-20 07:32:34 UTC

Size: 4.67 KB

patch

obsolete

>diff -urN emulators/wine-devel.orig/Makefile emulators/wine-devel/Makefile
>--- emulators/wine-devel.orig/Makefile
>+++ emulators/wine-devel/Makefile
>@@ -102,7 +102,6 @@
> OPENAL_CONFIGURE_WITH=	openal
> OPENAL_USES=		openal
> 
>-STAGING_BROKEN=		fails to build
> STAGING_MASTER_SITES=	https://github.com/wine-staging/wine-staging/archive/:staging
> STAGING_DIST=		v${DISTVERSION}.tar.gz
> STAGING_DISTFILES=	${STAGING_DIST}:staging
>@@ -135,6 +134,10 @@
> # i386-wine-devel slave port.
> .ifndef WINE_SLAVE_BUILD
> .include <bsd.port.pre.mk>
>+.endif
>+
>+.if !${PORT_OPTIONS:MSTAGING}
>+EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-dlls-ntdll-unix-registry.c
> .endif
> 
> .if ${ARCH} == amd64
>diff -urN emulators/wine-devel.orig/distinfo emulators/wine-devel/distinfo
>--- emulators/wine-devel.orig/distinfo
>+++ emulators/wine-devel/distinfo
>@@ -1,3 +1,5 @@
> TIMESTAMP = 1595177781
> SHA256 (wine-5.13.tar.xz) = c46a5c1c2aaf41993de5a5e78b7780060e0e77066531d0ca672ae08e325e0152
> SIZE (wine-5.13.tar.xz) = 23955832
>+SHA256 (v5.13.tar.gz) = 395c047d993cf8809727abecadacf2851f078d1f0e68d622a6e6c5284717cb68
>+SIZE (v5.13.tar.gz) = 9807468
>diff -urN emulators/wine-devel.orig/files/extrapatch-dlls-ntdll-unix-registry.c emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c
>--- emulators/wine-devel.orig/files/extrapatch-dlls-ntdll-unix-registry.c
>+++ emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c
>@@ -0,0 +1,42 @@
>+From: Gerald Pfeifer <gerald@pfeifer.com>
>+To: wine-devel@winehq.org
>+Date: Sat, 18 Jul 2020 12:02:58 +0300 (EEST)
>+Subject: [PATCH] ntdll: Include <signal.h> for sigset_t
>+
>+commit 7053b7c615b44e7112ab8fb4c056206d32b6f1c9
>+Author: Alexandre Julliard <julliard@winehq.org>
>+Date:   Fri Jul 17 11:46:15 2020 +0200
>+
>+    ntdll: Move the registry system calls to the Unix library.
>+    
>+    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
>+
>+broke non-Linux platforms since sigset_t isn't necessarily defined
>+based on the #include statements in the new dlls/ntdll/unix/registry.c.
>+
>+This fixes it.
>+
>+Observed and tested on FreeBSD 11.4/i386.
>+
>+Gerald
>+
>+Signed-off-by: Gerald Pfeifer <gerald@pfeifer.com>
>+---
>+ dlls/ntdll/unix/registry.c | 1 +
>+ 1 file changed, 1 insertion(+)
>+
>+diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c
>+index f94c8ff98e..6d58361818 100644
>+--- dlls/ntdll/unix/registry.c
>++++ dlls/ntdll/unix/registry.c
>+@@ -25,6 +25,7 @@
>+ #pragma makedep unix
>+ #endif
>+ 
>++#include <signal.h>
>+ #include <stdarg.h>
>+ #include <string.h>
>+ 
>+-- 
>+2.27.0
>+
>diff -urN emulators/wine-devel.orig/files/patch-dlls-ntdll-unix-registry.c emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c
>--- emulators/wine-devel.orig/files/patch-dlls-ntdll-unix-registry.c
>+++ emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c
>@@ -1,42 +0,0 @@
>-From: Gerald Pfeifer <gerald@pfeifer.com>
>-To: wine-devel@winehq.org
>-Date: Sat, 18 Jul 2020 12:02:58 +0300 (EEST)
>-Subject: [PATCH] ntdll: Include <signal.h> for sigset_t
>-
>-commit 7053b7c615b44e7112ab8fb4c056206d32b6f1c9
>-Author: Alexandre Julliard <julliard@winehq.org>
>-Date:   Fri Jul 17 11:46:15 2020 +0200
>-
>-    ntdll: Move the registry system calls to the Unix library.
>-    
>-    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
>-
>-broke non-Linux platforms since sigset_t isn't necessarily defined
>-based on the #include statements in the new dlls/ntdll/unix/registry.c.
>-
>-This fixes it.
>-
>-Observed and tested on FreeBSD 11.4/i386.
>-
>-Gerald
>-
>-Signed-off-by: Gerald Pfeifer <gerald@pfeifer.com>
>----
>- dlls/ntdll/unix/registry.c | 1 +
>- 1 file changed, 1 insertion(+)
>-
>-diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c
>-index f94c8ff98e..6d58361818 100644
>---- dlls/ntdll/unix/registry.c
>-+++ dlls/ntdll/unix/registry.c
>-@@ -25,6 +25,7 @@
>- #pragma makedep unix
>- #endif
>- 
>-+#include <signal.h>
>- #include <stdarg.h>
>- #include <string.h>
>- 
>--- 
>-2.27.0
>-
>diff -urN emulators/wine-devel.orig/pkg-plist emulators/wine-devel/pkg-plist
>--- emulators/wine-devel.orig/pkg-plist
>+++ emulators/wine-devel/pkg-plist
>@@ -1014,7 +1014,6 @@
> include/wine/windows/wuapi.idl
> include/wine/windows/x3daudio.h
> include/wine/windows/xact3.h
>-%%STAGING%%include/wine/windows/xact3.idl
> include/wine/windows/xact3wb.h
> include/wine/windows/xapo.h
> include/wine/windows/xapo.idl
>@@ -2405,6 +2404,7 @@
> lib/wine/fakedlls/winedevice.exe
> lib/wine/fakedlls/winefile.exe
> lib/wine/fakedlls/winehid.sys
>+lib/wine/fakedlls/winejoystick.drv
> lib/wine/fakedlls/winemapi.dll
> lib/wine/fakedlls/winemenubuilder.exe
> lib/wine/fakedlls/winemine.exe
>@@ -3133,6 +3133,7 @@
> lib/wine/winedbg.exe.so
> lib/wine/winedevice.exe.so
> lib/wine/winefile.exe.so
>+lib/wine/winejoystick.drv.so
> lib/wine/winehid.sys.so
> lib/wine/winemapi.dll.so
> lib/wine/winemenubuilder.exe.so

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 248118: 216596