From a00a58a1d3116e3135d6fb141d1057bab4ff22a0 Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Sun, 5 Jul 2026 07:30:01 -0700 Subject: [PATCH] chore: use upstream Xilem --- Cargo.lock | 27 +++++++++++++++--------- crates/hearthspace-compositor/Cargo.toml | 12 +++++------ crates/hearthspace-settings/Cargo.toml | 2 +- crates/hearthspace-shell/Cargo.toml | 2 +- crates/ui-components/Cargo.toml | 2 +- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5e55ee..486d9a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2913,7 +2913,7 @@ dependencies = [ [[package]] name = "linebender_include_doc_path" version = "0.1.0" -source = "git+https://github.com/crutchcorn/xilem?branch=wayland-app-id#9ff8afea16aa62039f3b2046d097626a162244d2" +source = "git+https://github.com/linebender/xilem#c5950bcb03d4f3d187a20d1159f6aa276fd056bf" dependencies = [ "proc-macro2", "quote", @@ -2991,7 +2991,7 @@ dependencies = [ [[package]] name = "masonry" version = "0.4.0" -source = "git+https://github.com/crutchcorn/xilem?branch=wayland-app-id#9ff8afea16aa62039f3b2046d097626a162244d2" +source = "git+https://github.com/linebender/xilem#c5950bcb03d4f3d187a20d1159f6aa276fd056bf" dependencies = [ "accesskit", "linebender_include_doc_path", @@ -3000,12 +3000,13 @@ dependencies = [ "resvg", "smallvec", "tracing", + "understory_virtual_list", ] [[package]] name = "masonry_core" version = "0.4.0" -source = "git+https://github.com/crutchcorn/xilem?branch=wayland-app-id#9ff8afea16aa62039f3b2046d097626a162244d2" +source = "git+https://github.com/linebender/xilem#c5950bcb03d4f3d187a20d1159f6aa276fd056bf" dependencies = [ "accesskit", "anymap3", @@ -3032,7 +3033,7 @@ dependencies = [ [[package]] name = "masonry_imaging" version = "0.4.0" -source = "git+https://github.com/crutchcorn/xilem?branch=wayland-app-id#9ff8afea16aa62039f3b2046d097626a162244d2" +source = "git+https://github.com/linebender/xilem#c5950bcb03d4f3d187a20d1159f6aa276fd056bf" dependencies = [ "imaging", "imaging_vello", @@ -3045,7 +3046,7 @@ dependencies = [ [[package]] name = "masonry_testing" version = "0.4.0" -source = "git+https://github.com/crutchcorn/xilem?branch=wayland-app-id#9ff8afea16aa62039f3b2046d097626a162244d2" +source = "git+https://github.com/linebender/xilem#c5950bcb03d4f3d187a20d1159f6aa276fd056bf" dependencies = [ "accesskit_consumer 0.35.0", "image", @@ -3058,7 +3059,7 @@ dependencies = [ [[package]] name = "masonry_winit" version = "0.4.0" -source = "git+https://github.com/crutchcorn/xilem?branch=wayland-app-id#9ff8afea16aa62039f3b2046d097626a162244d2" +source = "git+https://github.com/linebender/xilem#c5950bcb03d4f3d187a20d1159f6aa276fd056bf" dependencies = [ "accesskit_winit", "copypasta", @@ -5355,7 +5356,7 @@ dependencies = [ [[package]] name = "tree_arena" version = "0.2.0" -source = "git+https://github.com/crutchcorn/xilem?branch=wayland-app-id#9ff8afea16aa62039f3b2046d097626a162244d2" +source = "git+https://github.com/linebender/xilem#c5950bcb03d4f3d187a20d1159f6aa276fd056bf" dependencies = [ "hashbrown 0.17.1", ] @@ -5432,6 +5433,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" +[[package]] +name = "understory_virtual_list" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1562c70e80970850aefd08f87cda4bd134355b8d6dad65ea1320725f157b709e" + [[package]] name = "unicode-bidi" version = "0.3.18" @@ -6529,7 +6536,7 @@ checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" [[package]] name = "xilem" version = "0.4.0" -source = "git+https://github.com/crutchcorn/xilem?branch=wayland-app-id#9ff8afea16aa62039f3b2046d097626a162244d2" +source = "git+https://github.com/linebender/xilem#c5950bcb03d4f3d187a20d1159f6aa276fd056bf" dependencies = [ "masonry", "masonry_winit", @@ -6543,7 +6550,7 @@ dependencies = [ [[package]] name = "xilem_core" version = "0.4.0" -source = "git+https://github.com/crutchcorn/xilem?branch=wayland-app-id#9ff8afea16aa62039f3b2046d097626a162244d2" +source = "git+https://github.com/linebender/xilem#c5950bcb03d4f3d187a20d1159f6aa276fd056bf" dependencies = [ "anymore", "hashbrown 0.17.1", @@ -6553,7 +6560,7 @@ dependencies = [ [[package]] name = "xilem_masonry" version = "0.4.0" -source = "git+https://github.com/crutchcorn/xilem?branch=wayland-app-id#9ff8afea16aa62039f3b2046d097626a162244d2" +source = "git+https://github.com/linebender/xilem#c5950bcb03d4f3d187a20d1159f6aa276fd056bf" dependencies = [ "masonry", "smallvec", diff --git a/crates/hearthspace-compositor/Cargo.toml b/crates/hearthspace-compositor/Cargo.toml index 4ddb23d..3f0e91b 100644 --- a/crates/hearthspace-compositor/Cargo.toml +++ b/crates/hearthspace-compositor/Cargo.toml @@ -34,13 +34,11 @@ gtk = { package = "gtk4", version = "0.11", optional = true } hearthspace-common = { path = "../hearthspace-common" } hearthspace-ipc = { path = "../hearthspace-ipc" } hearthspace-shell = { path = "../hearthspace-shell" } -# Xilem (app shell) and Masonry (compositor-side imaging) are pulled from our -# linebender/xilem fork branch backing PR linebender/xilem#1830, which adds -# `WindowOptionsExtLinux::with_name` so a Xilem window can advertise a Wayland -# `app_id` (and X11 `WM_CLASS`). Repoint to upstream once the PR lands. -# See SETUP.md for details. -masonry = { git = "https://github.com/crutchcorn/xilem", branch = "wayland-app-id", features = ["testing"] } -xilem = { git = "https://github.com/crutchcorn/xilem", branch = "wayland-app-id" } +# Xilem (app shell) and Masonry (compositor-side imaging) are pulled from +# upstream git because the latest published crates are still behind the APIs we +# use, including `WindowOptionsExtLinux::with_name`. +masonry = { git = "https://github.com/linebender/xilem", features = ["testing"] } +xilem = { git = "https://github.com/linebender/xilem" } # naga 28 (pulled in transitively via wgpu/vello) only compiles its WGSL # error-emit path when the `termcolor` feature is enabled, but the crates that # depend on it (wgpu-core, vello_shaders) enable `wgsl-in` without it. We add a diff --git a/crates/hearthspace-settings/Cargo.toml b/crates/hearthspace-settings/Cargo.toml index 0b0ad02..13fbdb9 100644 --- a/crates/hearthspace-settings/Cargo.toml +++ b/crates/hearthspace-settings/Cargo.toml @@ -11,7 +11,7 @@ hearthspace-ipc = { path = "../hearthspace-ipc" } hearthspace-ui-components = { path = "../ui-components" } rfd = { version = "0.17.2", features = ["xdg-portal"] } wayland-client = "0.31.14" -xilem = { git = "https://github.com/crutchcorn/xilem", branch = "wayland-app-id" } +xilem = { git = "https://github.com/linebender/xilem" } [lints.rust] unsafe_op_in_unsafe_fn = "deny" diff --git a/crates/hearthspace-shell/Cargo.toml b/crates/hearthspace-shell/Cargo.toml index 6c2617b..03821c7 100644 --- a/crates/hearthspace-shell/Cargo.toml +++ b/crates/hearthspace-shell/Cargo.toml @@ -11,7 +11,7 @@ hearthspace-ui-components = { path = "../ui-components" } tracing = "0.1.41" tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } wayland-client = "0.31.14" -xilem = { git = "https://github.com/crutchcorn/xilem", branch = "wayland-app-id" } +xilem = { git = "https://github.com/linebender/xilem" } [dev-dependencies] rstest = "0.26" diff --git a/crates/ui-components/Cargo.toml b/crates/ui-components/Cargo.toml index 2ddd9c6..0159796 100644 --- a/crates/ui-components/Cargo.toml +++ b/crates/ui-components/Cargo.toml @@ -6,7 +6,7 @@ rust-version = "1.93.1" license = "Apache-2.0" [dependencies] -xilem = { git = "https://github.com/crutchcorn/xilem", branch = "wayland-app-id" } +xilem = { git = "https://github.com/linebender/xilem" } [lints.rust] unsafe_op_in_unsafe_fn = "deny" -- 2.51.2