From 0e138feffde3353782cbe70713fab363c87a2100 Mon Sep 17 00:00:00 2001 From: markik Date: Wed, 20 May 2026 03:35:24 -0400 Subject: [PATCH 1/2] Bump ashpd to 0.13 to match the gpui_linux portal API gpui_linux uses the ashpd 0.13 API (ashpd::Uri in crates/gpui_linux/src/linux/platform.rs, the desktop::{file_chooser, open_uri, settings} portals), but the workspace still pinned ashpd 0.12.1 where those don't resolve, so gpui_linux failed to build on Linux. 0.13 also renamed the runtime feature async-std -> async-io and gates each portal behind its own feature, so file_chooser/open_uri/settings are enabled explicitly. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 81836d9..3bf25d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,7 +94,7 @@ derive_refineable = { path = "crates/refineable/derive_refineable" } # anyhow = "1.0.86" -ashpd = { version = "0.12.1", default-features = false, features = ["async-std"] } +ashpd = { version = "0.13", default-features = false, features = ["async-io", "file_chooser", "open_uri", "settings"] } async-channel = "2.5.0" async-compression = { version = "0.4", features = ["bzip2", "gzip", "futures-io"] } async-fs = "2.1" From 94c7180c8cc4f842f3a3705f7b4989143963e9eb Mon Sep 17 00:00:00 2001 From: markik Date: Wed, 20 May 2026 03:35:37 -0400 Subject: [PATCH 2/2] Restore LayerShellNotSupportedError dropped during platform extraction gpui_linux's wayland window code imports gpui::layer_shell::LayerShellNotSupportedError (crates/gpui_linux/src/linux/wayland/window.rs), but the type was not carried into the extracted gpui::layer_shell module, breaking the wayland build. It existed in the pre-extraction monolith; re-add the unit error struct. --- crates/gpui/src/platform/layer_shell.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/gpui/src/platform/layer_shell.rs b/crates/gpui/src/platform/layer_shell.rs index 9ed3fe2..31a273f 100644 --- a/crates/gpui/src/platform/layer_shell.rs +++ b/crates/gpui/src/platform/layer_shell.rs @@ -62,3 +62,9 @@ pub struct LayerShellOptions { /// How keyboard focus should be handled. pub keyboard_interactivity: KeyboardInteractivity, } + +/// An error indicating that an action failed because the compositor doesn't +/// support the required `zwlr_layer_shell_v1` protocol. +#[derive(Debug, thiserror::Error)] +#[error("Compositor doesn't support zwlr_layer_shell_v1")] +pub struct LayerShellNotSupportedError;