Reapply revision 542851 that broke the index via an interaction with

emulators/i386-wine-devel and was reverted, now with a tweak to avoid
that breakage:

The Wine Staging patchset for Wine 5.13 is now available and fixed
(compared to the previous one).

It also addresses the build issue for Wine 5.13 that I fixed via
files/patch-dlls-ntdll-unix-registry.c, so we need to make that
patch only apply when the Wine Staging patchset is not used.

PR:             248118 [1]
Submitted by:   vvd@unislabs.com

1 files changed, 42 insertions, 0 deletions

diff --git a/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c b/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c
new file mode 100644
index 000000000000..b7a0b9cb3975
--- /dev/null
+++ b/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
+