From baaa276fb98264579316512389cb9b3fa31bdfe2 Mon Sep 17 00:00:00 2001 From: no92 Date: Tue, 29 Jul 2025 13:08:28 +0200 Subject: [PATCH 1/4] wayland: bump to 1.24.0 --- bootstrap.d/dev-libs.y4.yml | 10 +++---- bootstrap.d/dev-util.y4.yml | 1 + .../0001-Managarm-specific-changes.patch | 30 ++++++++++++++----- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/bootstrap.d/dev-libs.y4.yml b/bootstrap.d/dev-libs.y4.yml index cb6e1f5c1..f9c854426 100644 --- a/bootstrap.d/dev-libs.y4.yml +++ b/bootstrap.d/dev-libs.y4.yml @@ -58,13 +58,13 @@ sources: - name: wayland subdir: 'ports' - url: 'https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.23.0/downloads/wayland-1.23.0.tar.xz' - checksum: 'blake2b:efb80e3c67db7a707a6d2ea66e7a5132173550bc13fdff447925ec3d33bfba8131532f819d5ab0dd80924cb4339b58b7ca83d9e70a436cea8268167476355bd8' - extract_path: 'wayland-1.23.0' + url: 'https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.24.0/downloads/wayland-1.24.0.tar.xz' + checksum: 'blake2b:7ac6ac1f33cb2cae60e4058478655eeabd4f8f8e0fe07f6b9b386967ed4b31bdaac571dc2b812f3189534e3e53797822ca39f829207e45c24b494f039f82a836' + extract_path: 'wayland-1.24.0' patch-path-strip: 1 format: 'tar.xz' - tag: '1.23.0' - version: '1.23.0' + tag: '1.24.0' + version: '1.24.0' - name: libtool subdir: 'ports' diff --git a/bootstrap.d/dev-util.y4.yml b/bootstrap.d/dev-util.y4.yml index 40b26e8a9..d62fb5c40 100644 --- a/bootstrap.d/dev-util.y4.yml +++ b/bootstrap.d/dev-util.y4.yml @@ -118,6 +118,7 @@ tools: tools_required: - virtual: pkgconfig-for-host program_name: host-pkg-config + revision: 1 configure: - args: - 'meson' diff --git a/patches/wayland/0001-Managarm-specific-changes.patch b/patches/wayland/0001-Managarm-specific-changes.patch index 2eeab2886..28c9afb18 100644 --- a/patches/wayland/0001-Managarm-specific-changes.patch +++ b/patches/wayland/0001-Managarm-specific-changes.patch @@ -1,16 +1,30 @@ -From 8202c2d110fd49cd883fc2e85350a7447f2b97e2 Mon Sep 17 00:00:00 2001 +From ca31b227962b58dc9a545d73cbc03d6e769962b6 Mon Sep 17 00:00:00 2001 From: no92 Date: Fri, 14 Jan 2022 13:47:14 +0100 Subject: [PATCH] Managarm-specific changes --- + src/meson.build | 2 +- src/wayland-os.c | 1 + src/wayland-server.c | 4 +++- tests/test-runner.c | 1 + - 3 files changed, 5 insertions(+), 1 deletion(-) + 4 files changed, 6 insertions(+), 2 deletions(-) +diff --git a/src/meson.build b/src/meson.build +index 984e34a..c9b6dea 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -82,7 +82,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', dirs: scanner_dep.get_variable(pkgconfig: 'wayland_scanner')) + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/src/wayland-os.c b/src/wayland-os.c -index 27c6035..43f7b00 100644 +index f00ead4..233c678 100644 --- a/src/wayland-os.c +++ b/src/wayland-os.c @@ -27,6 +27,7 @@ @@ -22,10 +36,10 @@ index 27c6035..43f7b00 100644 #include #include diff --git a/src/wayland-server.c b/src/wayland-server.c -index 02f1365..fb7c1c5 100644 +index 72a1201..a6133bc 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c -@@ -1490,6 +1490,8 @@ wl_socket_lock(struct wl_socket *socket) +@@ -1699,6 +1699,8 @@ wl_socket_lock(struct wl_socket *socket) { struct stat socket_stat; @@ -34,7 +48,7 @@ index 02f1365..fb7c1c5 100644 snprintf(socket->lock_addr, sizeof socket->lock_addr, "%s%s", socket->addr.sun_path, LOCK_SUFFIX); -@@ -1517,7 +1519,7 @@ wl_socket_lock(struct wl_socket *socket) +@@ -1726,7 +1728,7 @@ wl_socket_lock(struct wl_socket *socket) } else if (socket_stat.st_mode & S_IWUSR || socket_stat.st_mode & S_IWGRP) { unlink(socket->addr.sun_path); @@ -44,7 +58,7 @@ index 02f1365..fb7c1c5 100644 return 0; err_fd: diff --git a/tests/test-runner.c b/tests/test-runner.c -index c0247b5..47280d1 100644 +index 9a50d1d..8fa636a 100644 --- a/tests/test-runner.c +++ b/tests/test-runner.c @@ -27,6 +27,7 @@ @@ -56,5 +70,5 @@ index c0247b5..47280d1 100644 #include #include -- -2.34.1 +2.49.0 From 2c0000ee86dbe1fcb6e4c176c190361d0d8cf252 Mon Sep 17 00:00:00 2001 From: no92 Date: Tue, 29 Jul 2025 13:09:26 +0200 Subject: [PATCH 2/4] wayland-protocols: bump to 1.45 --- bootstrap.d/dev-libs.y4.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap.d/dev-libs.y4.yml b/bootstrap.d/dev-libs.y4.yml index f9c854426..e1687b083 100644 --- a/bootstrap.d/dev-libs.y4.yml +++ b/bootstrap.d/dev-libs.y4.yml @@ -2509,11 +2509,11 @@ packages: categories: ['dev-libs'] source: subdir: 'ports' - url: 'https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.42/downloads/wayland-protocols-1.42.tar.xz' - checksum: 'blake2b:7dc9cf43f82ee7522419327eaeaa36ebfe2a05f45687a2068951125af0de587d3a496bb2eb80f1e0afa96c960090d8d80ff7806117c578fb3771126fd2b8d65d' - extract_path: 'wayland-protocols-1.42' + url: 'https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.45/downloads/wayland-protocols-1.45.tar.xz' + checksum: 'blake2b:9c70bf8975056e4038492101c38acdc476b28e277200144ff6e436e573b1e023e609b0a7bbf8f5acedecbfb268af6b41d11d4c101ffecebafe29440f4dcee4c1' + extract_path: 'wayland-protocols-1.45' format: 'tar.xz' - version: '1.42' + version: '1.45' tools_required: - system-gcc - wayland-scanner From f7bdf32f7e470c4293422754d4ef3dd7865363bb Mon Sep 17 00:00:00 2001 From: no92 Date: Tue, 29 Jul 2025 13:10:28 +0200 Subject: [PATCH 3/4] wlroots: bump to 0.19.0 --- bootstrap.d/gui-libs.y4.yml | 4 +-- ...wayland-path-prefixing-by-pkg-config.patch | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 patches/wlroots/0001-Fix-Xwayland-path-prefixing-by-pkg-config.patch diff --git a/bootstrap.d/gui-libs.y4.yml b/bootstrap.d/gui-libs.y4.yml index fd371ebe1..bad1d65a5 100644 --- a/bootstrap.d/gui-libs.y4.yml +++ b/bootstrap.d/gui-libs.y4.yml @@ -364,8 +364,8 @@ packages: source: subdir: 'ports' git: 'https://gitlab.freedesktop.org/wlroots/wlroots/' - tag: '0.18.2' - version: '0.18.2' + tag: '0.19.0' + version: '0.19.0' tools_required: - system-gcc - host-libtool diff --git a/patches/wlroots/0001-Fix-Xwayland-path-prefixing-by-pkg-config.patch b/patches/wlroots/0001-Fix-Xwayland-path-prefixing-by-pkg-config.patch new file mode 100644 index 000000000..b95cfb7a2 --- /dev/null +++ b/patches/wlroots/0001-Fix-Xwayland-path-prefixing-by-pkg-config.patch @@ -0,0 +1,33 @@ +From 1d816d68b87bb9d57026763d919175124f3d84ea Mon Sep 17 00:00:00 2001 +From: no92 +Date: Sun, 27 Jul 2025 11:12:49 +0200 +Subject: [PATCH] Fix Xwayland path prefixing by pkg-config + +--- + xwayland/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xwayland/meson.build b/xwayland/meson.build +index 81cb018..ddae4b3 100644 +--- a/xwayland/meson.build ++++ b/xwayland/meson.build +@@ -33,6 +33,7 @@ xwayland = dependency( + 'xvfb=false', + ], + ) ++ + if not xwayland.found() + subdir_done() + endif +@@ -74,7 +75,7 @@ xwayland_feature_names = [ + 'terminate_delay', + ] + +-internal_config.set_quoted('XWAYLAND_PATH', xwayland.get_variable('xwayland')) ++internal_config.set_quoted('XWAYLAND_PATH', xwayland.get_variable('xwayland').replace('{XBSTRAP_SYSTEM_ROOT}', '')) + foreach name : xwayland_feature_names + have = xwayland.get_variable('have_' + name, default_value: 'false') == 'true' + internal_config.set10('HAVE_XWAYLAND_' + name.to_upper(), have) +-- +2.49.0 + From 3664f4ed0f7401ce07cc8ebd9ed3d1dcd821009d Mon Sep 17 00:00:00 2001 From: no92 Date: Tue, 29 Jul 2025 13:11:14 +0200 Subject: [PATCH 4/4] sway: bump to 1.11 --- bootstrap.d/gui-wm.y4.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap.d/gui-wm.y4.yml b/bootstrap.d/gui-wm.y4.yml index f6e34dce9..7ef491951 100644 --- a/bootstrap.d/gui-wm.y4.yml +++ b/bootstrap.d/gui-wm.y4.yml @@ -11,8 +11,8 @@ packages: source: subdir: 'ports' git: 'https://github.com/swaywm/sway' - tag: '1.10.1' - version: '1.10.1' + tag: '1.11' + version: '1.11' tools_required: - system-gcc - host-libtool