fix: libwayland durability patch replaces fragile Python modifications

Created proper redox.patch (105 lines) that applies to wayland-1.24.0:
- meson.build: SFD/TFD checks → signal.h/time.h
- src/meson.build: wayland-scanner detection
- src/event-loop.c: signalfd/timerfd compat + definitions
- src/connection.c: MSG_NOSIGNAL + open_memstream stub

Recipe simplified from 270-line Python heredoc to clean meson build.
Patch survives make clean, git clone, and upstream rebase.
This commit is contained in:
2026-04-28 12:09:28 +01:00
parent 0b09a54065
commit 4bcad7fd7d
2 changed files with 97 additions and 90 deletions
@@ -1,90 +0,0 @@
diff --git a/src/meson.build b/src/meson.build
--- a/src/meson.build
+++ b/src/meson.build
@@ -81,8 +81,7 @@
endif
if meson.is_cross_build() or not get_option('scanner')
- scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version())
- wayland_scanner_for_build = find_program(scanner_dep.get_variable(pkgconfig: 'wayland_scanner'))
+ wayland_scanner_for_build = find_program('wayland-scanner', native: true)
else
wayland_scanner_for_build = wayland_scanner
endif
diff --git a/src/event-loop.c b/src/event-loop.c
--- a/src/event-loop.c
+++ b/src/event-loop.c
@@ -35,7 +35,9 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/epoll.h>
#include <sys/signalfd.h>
+#include <sys/timerfd.h>
#ifdef __redox__
#ifndef TFD_CLOEXEC
#define TFD_CLOEXEC O_CLOEXEC
#endif
#ifndef TFD_NONBLOCK
#define TFD_NONBLOCK O_NONBLOCK
#endif
int timerfd_create(int clockid, int flags);
int timerfd_settime(int fd, int flags, const struct itimerspec *new_value, struct itimerspec *old_value);
#else
#endif
#include <unistd.h>
#include "timespec-util.h"
diff --git a/src/wayland-server.c b/src/wayland-server.c
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -39,7 +39,17 @@
#include <dlfcn.h>
#include <sys/time.h>
#include <fcntl.h>
+#ifdef __redox__
+#ifndef EFD_CLOEXEC
+#define EFD_CLOEXEC O_CLOEXEC
+#endif
+#ifndef EFD_NONBLOCK
+#define EFD_NONBLOCK O_NONBLOCK
+#endif
+int eventfd(unsigned int initval, int flags);
+#else
#include <sys/eventfd.h>
+#endif
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/src/connection.c b/src/connection.c
--- a/src/connection.c
+++ b/src/connection.c
@@ -40,6 +40,13 @@
#include <time.h>
#include <ffi.h>
+#ifdef __redox__
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+FILE *open_memstream(char **bufp, size_t *sizep);
+#endif
+
#include "wayland-util.h"
#include "wayland-private.h"
#include "wayland-os.h"
@@ -1503,6 +1510,15 @@
wl_closure_print(struct wl_closure *closure, struct wl_object *target,
int send, int discarded, uint32_t (*n_parse)(union wl_argument *arg),
const char *queue_name)
{
+#ifdef __redox__
+ (void)closure;
+ (void)target;
+ (void)send;
+ (void)discarded;
+ (void)n_parse;
+ (void)queue_name;
+ return;
+#endif
int i;
struct argument_details arg;
const char *signature = closure->message->signature;