vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: libwayland durability patch replaces fragile Python modifications

Browse Source 
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:
Vasilito
2026-04-28 12:09:28 +01:00
parent 0b09a54065
commit 4bcad7fd7d
2 changed files with 97 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/patches/libwayland/redox.patch
+97
View File
@@ -0,0 +1,97 @@
diff -ruN libwayland-base/meson.build libwayland-mod/meson.build
--- libwayland-base/meson.build 2025-07-06 13:11:26.000000000 +0100
+++ libwayland-mod/meson.build 2026-04-28 11:55:10.625896809 +0100
@@ -80,8 +80,8 @@
ffi_dep = dependency('libffi')
decls = [
- { 'header': 'sys/signalfd.h', 'symbol': 'SFD_CLOEXEC' },
- { 'header': 'sys/timerfd.h', 'symbol': 'TFD_CLOEXEC' },
+ { 'header': 'signal.h', 'symbol': 'SIG_BLOCK' },
+ { 'header': 'time.h', 'symbol': 'CLOCK_MONOTONIC' },
{ 'header': 'time.h', 'symbol': 'CLOCK_MONOTONIC' },
]
diff -ruN libwayland-base/src/connection.c libwayland-mod/src/connection.c
--- libwayland-base/src/connection.c 2025-07-06 13:11:26.000000000 +0100
+++ libwayland-mod/src/connection.c 2026-04-28 12:06:49.776451773 +0100
@@ -40,6 +40,15 @@
#include <time.h>
#include <ffi.h>
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+static FILE *open_memstream(char **bufp, size_t *sizep) {
+ *bufp = NULL; *sizep = 0; return NULL;
+}
+
#include "wayland-util.h"
#include "wayland-private.h"
#include "wayland-os.h"
diff -ruN libwayland-base/src/event-loop.c libwayland-mod/src/event-loop.c
--- libwayland-base/src/event-loop.c 2025-07-06 13:11:26.000000000 +0100
+++ libwayland-mod/src/event-loop.c 2026-04-28 11:58:30.794153149 +0100
@@ -35,9 +35,45 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/epoll.h>
-#include <sys/signalfd.h>
-#include <sys/timerfd.h>
+/* #include <sys/signalfd.h> */
+/* #include <sys/timerfd.h> */
#include <unistd.h>
+
+#ifndef SFD_CLOEXEC
+#define SFD_CLOEXEC O_CLOEXEC
+#endif
+#ifndef SFD_NONBLOCK
+#define SFD_NONBLOCK O_NONBLOCK
+#endif
+#ifndef TFD_CLOEXEC
+#define TFD_CLOEXEC O_CLOEXEC
+#endif
+#ifndef TFD_NONBLOCK
+#define TFD_NONBLOCK O_NONBLOCK
+#endif
+#ifndef TFD_TIMER_ABSTIME
+#define TFD_TIMER_ABSTIME 0x1
+#endif
+
+struct signalfd_siginfo { uint8_t pad[128]; };
+static int signalfd_impl(int fd, const sigset_t *mask, uintptr_t masksize, int flags) {
+ int oflag = O_RDWR;
+ if (flags & SFD_CLOEXEC) oflag |= O_CLOEXEC;
+ if (flags & SFD_NONBLOCK) oflag |= O_NONBLOCK;
+ if (fd == -1) { fd = open("/scheme/event", oflag); if (fd < 0) return -1; }
+ else { if (flags & SFD_CLOEXEC) fcntl(fd, F_SETFD, FD_CLOEXEC); }
+ sigprocmask(SIG_BLOCK, mask, NULL);
+ return fd;
+}
+int signalfd(int fd, const sigset_t *mask, uintptr_t masksize) { return signalfd_impl(fd, mask, masksize, 0); }
+static int timerfd_create(int clockid, int flags) {
+ int oflag = O_RDWR;
+ if (flags & TFD_CLOEXEC) oflag |= O_CLOEXEC;
+ if (flags & TFD_NONBLOCK) oflag |= O_NONBLOCK;
+ char path[64];
+ snprintf(path, sizeof(path), "/scheme/time/%d", clockid);
+ return open(path, oflag);
+}
#include "timespec-util.h"
#include "wayland-util.h"
#include "wayland-private.h"
diff -ruN libwayland-base/src/meson.build libwayland-mod/src/meson.build
--- libwayland-base/src/meson.build 2025-07-06 13:11:26.000000000 +0100
+++ libwayland-mod/src/meson.build 2026-04-28 11:55:10.625994641 +0100
@@ -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
recipes/wip/wayland/libwayland/redox.patch
-90
View File
@@ -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;