diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 18870b92faa..790d19ff1ff 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -358,7 +358,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`vlang`](vlang/) | V programming language | weekly.2021.31 | https://github.com/vlang/v | | [`vttest`](vttest/) | vttest | 20251205 | https://invisible-island.net/vttest/ | | [`VVVVVV`](VVVVVV/) | Terry Cavanagh's VVVVVV | 2.4.3 | https://github.com/TerryCavanagh/VVVVVV/ | -| [`wayland`](wayland/) | Wayland client libraries | 1.24.0 | https://wayland.freedesktop.org/ | +| [`wayland`](wayland/) | Wayland client libraries | 1.26.0 | https://wayland.freedesktop.org/ | | [`wget`](wget/) | GNU Wget | 1.25.0 | https://www.gnu.org/software/wget/ | | [`which`](which/) | GNU which | 2.21 | https://www.gnu.org/software/which/ | | [`wireguard-tools`](wireguard-tools/) | WireGuard Tools | 1.0.20260223 | https://www.wireguard.com/ | diff --git a/Ports/wayland/package.sh b/Ports/wayland/package.sh index ec6fd69908b..51508a81363 100755 --- a/Ports/wayland/package.sh +++ b/Ports/wayland/package.sh @@ -1,6 +1,6 @@ #!/usr/bin/env -S bash ../.port_include.sh port='wayland' -version='1.24.0' +version='1.26.0' useconfigure='true' configopts=( "--buildtype=release" @@ -16,7 +16,7 @@ depends=( 'libxml2' ) files=( - "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/wayland-${version}.tar.xz#82892487a01ad67b334eca83b54317a7c86a03a89cfadacfef5211f11a5d0536" + "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/wayland-${version}.tar.xz#64176eaa46e4969903e286f8e5ef8331affc17fdf03ac9b58381d2b23162b7a3" ) configure() { diff --git a/Ports/wayland/patches/0001-Don-t-build-wayland-server.patch b/Ports/wayland/patches/0001-Don-t-build-wayland-server.patch index da46004b1ad..1045df129ac 100644 --- a/Ports/wayland/patches/0001-Don-t-build-wayland-server.patch +++ b/Ports/wayland/patches/0001-Don-t-build-wayland-server.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Don't build wayland-server 2 files changed, 2 insertions(+), 57 deletions(-) diff --git a/meson.build b/meson.build -index ef34ba4a5511d7ccf25edd1c048752a737f9bca9..3b9c66693b1028bdd738d7d09284000582d597ce 100644 +index 2c010be034fa58156c55288cd7ac7a2611fee1eb..4def130feca306d1fb5191c01b92a90a1960e789 100644 --- a/meson.build +++ b/meson.build -@@ -80,8 +80,8 @@ if get_option('libraries') +@@ -85,8 +85,8 @@ if get_option('libraries') ffi_dep = dependency('libffi') decls = [ @@ -24,10 +24,10 @@ index ef34ba4a5511d7ccf25edd1c048752a737f9bca9..3b9c66693b1028bdd738d7d092840005 ] diff --git a/src/meson.build b/src/meson.build -index 984e34abccc095890e5e05fde4f11dbf99967ab8..e9f041c2a6b43f46b7408c8123c909e5b482c738 100644 +index b3b9ea57313abb1c4b7224fbb0d81dab1bf7dbb7..ca1302de112b498d501d50b13c8a21747799b9ad 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -170,59 +170,6 @@ if get_option('libraries') +@@ -169,59 +169,6 @@ if get_option('libraries') error('We probably need to bump the SONAME of libwayland-server and -client') endif @@ -87,7 +87,7 @@ index 984e34abccc095890e5e05fde4f11dbf99967ab8..e9f041c2a6b43f46b7408c8123c909e5 wayland_client = library( 'wayland-client', sources: [ -@@ -274,8 +221,6 @@ if get_option('libraries') +@@ -273,8 +220,6 @@ if get_option('libraries') install_headers([ 'wayland-util.h', diff --git a/Ports/wayland/patches/0002-Use-native-wayland-scanner.patch b/Ports/wayland/patches/0002-Use-native-wayland-scanner.patch index d694b90b88a..d6b6e952e33 100644 --- a/Ports/wayland/patches/0002-Use-native-wayland-scanner.patch +++ b/Ports/wayland/patches/0002-Use-native-wayland-scanner.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Use native wayland-scanner 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build -index e9f041c2a6b43f46b7408c8123c909e5b482c738..9140db6bac1fcfdb800607a2540cc7a33b7962fc 100644 +index ca1302de112b498d501d50b13c8a21747799b9ad..c689f5a9ab4f96baa81b769cd3f316ce2d283043 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -81,8 +81,7 @@ if get_option('scanner') +@@ -80,8 +80,7 @@ if get_option('scanner') endif if meson.is_cross_build() or not get_option('scanner') diff --git a/Ports/wayland/patches/0004-Don-t-use-CMSG_CLOEXEC.patch b/Ports/wayland/patches/0004-Don-t-use-CMSG_CLOEXEC.patch index 7012cfaff55..ebf4ff6c00b 100644 --- a/Ports/wayland/patches/0004-Don-t-use-CMSG_CLOEXEC.patch +++ b/Ports/wayland/patches/0004-Don-t-use-CMSG_CLOEXEC.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Don't use CMSG_CLOEXEC 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 3b9c66693b1028bdd738d7d09284000582d597ce..cf09e11f7065c06949849ba8d8a2849751b82ea0 100644 +index 4def130feca306d1fb5191c01b92a90a1960e789..52c72f32e70d700072e2040e55b7833c69f3d11d 100644 --- a/meson.build +++ b/meson.build -@@ -51,7 +51,7 @@ foreach f: have_funcs +@@ -56,7 +56,7 @@ foreach f: have_funcs config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f)) endforeach config_h.set10('HAVE_XUCRED_CR_PID', cc.has_member('struct xucred', 'cr_pid', prefix : '#include ')) diff --git a/Ports/wayland/patches/0005-Remove-call-to-open_memstream-3-from-wl_closure_prin.patch b/Ports/wayland/patches/0005-Remove-call-to-open_memstream-3-from-wl_closure_prin.patch index dadda1e381b..8569c711500 100644 --- a/Ports/wayland/patches/0005-Remove-call-to-open_memstream-3-from-wl_closure_prin.patch +++ b/Ports/wayland/patches/0005-Remove-call-to-open_memstream-3-from-wl_closure_prin.patch @@ -4,31 +4,31 @@ Date: Sat, 11 Feb 2023 15:17:27 -0700 Subject: [PATCH] Remove call to open_memstream(3) from wl_closure_print --- - src/connection.c | 11 +---------- - 1 file changed, 1 insertion(+), 10 deletions(-) + src/connection.c | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/connection.c b/src/connection.c -index 3ef8688d7b06e6797de852533e1db2b54107623e..9d676011cdaa2ae1aa0a32d3c4136a341563618b 100644 +index 6ab20ab01c6506513f7c8fa8bcb932a5b9027b10..6199c9890790e44073128e6bb1993a61d68d4d26 100644 --- a/src/connection.c +++ b/src/connection.c -@@ -1503,12 +1503,8 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, - unsigned int time; +@@ -1549,12 +1549,7 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, + struct timespec tp; uint32_t nval; FILE *f; - char *buffer; - size_t buffer_length; - +- - f = open_memstream(&buffer, &buffer_length); - if (f == NULL) - return; + f = stderr; clock_gettime(CLOCK_REALTIME, &tp); - time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000); -@@ -1588,11 +1584,6 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, + fprintf(f, "%s[%02u:%02u:%02u.%06u] ", +@@ -1659,11 +1654,6 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, } - fprintf(f, ")\n"); + fprintf(f, ")%s\n", color ? WL_DEBUG_COLOR_RESET : ""); - - if (fclose(f) == 0) { - fprintf(stderr, "%s", buffer);