Update wayland to the latest version. I need this to build the latest WIP KDE Plasma.
OK? diff --git a/wayland/wayland/Makefile b/wayland/wayland/Makefile index ce3516b670f..bd2f77ed5b2 100644 --- a/wayland/wayland/Makefile +++ b/wayland/wayland/Makefile @@ -1,7 +1,7 @@ COMMENT = Display server protocol DISTNAME = wayland-${V} -V = 1.21.0 +V = 1.21.91 CATEGORIES = wayland @@ -10,7 +10,7 @@ HOMEPAGE = https://wayland.freedesktop.org/ SHARED_LIBS += wayland-client 0.1 # 0.21.0 SHARED_LIBS += wayland-cursor 0.0 # 0.21.0 SHARED_LIBS += wayland-egl 0.0 # 1.0 -SHARED_LIBS += wayland-server 0.1 # 0.21.0 +SHARED_LIBS += wayland-server 0.2 # 0.21.0 WANTLIB += c epoll-shim expat ffi xml2 diff --git a/wayland/wayland/distinfo b/wayland/wayland/distinfo index 660d0f26be6..e833ec8070e 100644 --- a/wayland/wayland/distinfo +++ b/wayland/wayland/distinfo @@ -1,2 +1,2 @@ -SHA256 (wayland-1.21.0.tar.xz) = bcZNf8FoN6aTpRz9suVo21OL/cn0V9RlYoW7lZTvEaw= -SIZE (wayland-1.21.0.tar.xz) = 225936 +SHA256 (wayland-1.21.91.tar.xz) = U4GxjbfxuYsbzXHPd0DewzgrNL6mjlFPImcqbBpLQYo= +SIZE (wayland-1.21.91.tar.xz) = 229124 diff --git a/wayland/wayland/patches/patch-tests_test-compositor_c b/wayland/wayland/patches/patch-tests_test-compositor_c deleted file mode 100644 index cd229f10e7b..00000000000 --- a/wayland/wayland/patches/patch-tests_test-compositor_c +++ /dev/null @@ -1,42 +0,0 @@ -https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/256 - -Index: tests/test-compositor.c ---- tests/test-compositor.c.orig -+++ tests/test-compositor.c -@@ -101,26 +101,23 @@ handle_client_destroy(void *data) - { - struct client_info *ci = data; - struct display *d; -- siginfo_t status; -+ int status; - - d = ci->display; - -- assert(waitid(P_PID, ci->pid, &status, WEXITED) != -1); -+ assert(waitpid(ci->pid, &status, 0) != -1); - -- switch (status.si_code) { -- case CLD_KILLED: -- case CLD_DUMPED: -+ if (WIFSIGNALED(status)) { - fprintf(stderr, "Client '%s' was killed by signal %d\n", -- ci->name, status.si_status); -- ci->exit_code = status.si_status; -- break; -- case CLD_EXITED: -- if (status.si_status != EXIT_SUCCESS) -+ ci->name, WTERMSIG(status)); -+ ci->exit_code = WTERMSIG(status); -+ -+ } else if (WIFEXITED(status)) { -+ if (WEXITSTATUS(status) != EXIT_SUCCESS) - fprintf(stderr, "Client '%s' exited with code %d\n", -- ci->name, status.si_status); -+ ci->name, WEXITSTATUS(status)); - -- ci->exit_code = status.si_status; -- break; -+ ci->exit_code = WEXITSTATUS(status); - } - - ++d->clients_terminated_no;