les/patch-crates_gpui_examples_layer__shell.rs index 9ed9afee3ec4..39ad76d7f38c 100644 --- a/editors/zed/files/patch-crates_gpui_examples_layer__shell.rs +++ b/editors/zed/files/patch-crates_gpui_examples_layer__shell.rs @@ -1,7 +1,9 @@ ---- crates/gpui/examples/layer_shell.rs.orig 2025-11-15 06:20:54 UTC +--- crates/gpui/examples/layer_shell.rs.orig 2026-03-11 14:31:09 UTC +++ crates/gpui/examples/layer_shell.rs -@@ -1,12 +1,12 @@ fn main() { - fn main() { +@@ -1,10 +1,10 @@ fn run_example() { + #![cfg_attr(target_family = "wasm", no_main)] + + fn run_example() { - #[cfg(all(target_os = "linux", feature = "wayland"))] + #[cfg(all(any(target_os = "linux", target_os = "freebsd"), feature = "wayland"))] example::main(); @@ -11,6 +13,10 @@ panic!("This example requires the `wayland` feature and a linux system."); } +@@ -20,7 +20,7 @@ pub fn start() { + run_example(); + } + -#[cfg(all(target_os = "linux", feature = "wayland"))] +#[cfg(all(any(target_os = "linux", target_os = "freebsd"), feature = "wayland"))] mod example { diff --git a/editors/zed/files/patch-crates_gpui_src_gpui.rs b/editors/zed/files/patch-crates_gpui_src_gpui.rs index 65439068c7d4..7d91fac11cc6 100644 --- a/editors/zed/files/patch-crates_gpui_src_gpui.rs +++ b/editors/zed/files/patch-crates_gpui_src_gpui.rs @@ -1,20 +1,20 @@ ---- crates/gpui/src/gpui.rs.orig 2026-03-04 15:41:56 UTC +--- crates/gpui/src/gpui.rs.orig 2026-03-11 14:31:09 UTC +++ crates/gpui/src/gpui.rs @@ -35,7 +35,7 @@ pub mod profiler; pub mod prelude; /// Profiling utilities for task timing and thread performance tracking. pub mod profiler; --#[cfg(any(target_os = "windows", target_os = "linux"))] -+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "freebsd"))] +-#[cfg(any(target_os = "windows", target_os = "linux", target_family = "wasm"))] ++#[cfg(any(target_os = "windows", target_os = "linux", target_os = "freebsd", target_family = "wasm"))] #[expect(missing_docs)] pub mod queue; mod scene; -@@ -96,7 +96,7 @@ pub use profiler::*; +@@ -97,7 +97,7 @@ pub use profiler::*; pub use path_builder::*; pub use platform::*; pub use profiler::*; --#[cfg(any(target_os = "windows", target_os = "linux"))] -+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "freebsd"))] +-#[cfg(any(target_os = "windows", target_os = "linux", target_family = "wasm"))] ++#[cfg(any(target_os = "windows", target_os = "linux", target_os = "freebsd", target_family = "wasm"))] pub use queue::{PriorityQueueReceiver, PriorityQueueSender}; pub use refineable::*; pub use scene::*; diff --git a/editors/zed/files/patch-crates_gpui_src_platform.rs b/editors/zed/files/patch-crates_gpui_src_platform.rs index 937fb3f34191..8d08ca63638d 100644 --- a/editors/zed/files/patch-crates_gpui_src_platform.rs +++ b/editors/zed/files/patch-crates_gpui_src_platform.rs @@ -1,4 +1,4 @@ ---- crates/gpui/src/platform.rs.orig 2026-03-04 15:41:56 UTC +--- crates/gpui/src/platform.rs.orig 2026-03-11 14:31:09 UTC +++ crates/gpui/src/platform.rs @@ -2,7 +2,7 @@ mod keystroke; mod keyboard; @@ -18,7 +18,7 @@ feature = "screen-capture" ))] pub(crate) type PlatformScreenCaptureFrame = scap::frame::Frame; -@@ -1365,7 +1365,7 @@ pub enum WindowKind { +@@ -1366,7 +1366,7 @@ pub enum WindowKind { /// A Wayland LayerShell window, used to draw overlays or backgrounds for applications such as /// docks, notifications or wallpapers. diff --git a/editors/zed/files/patch-crates_project_src_agent__registry__store.rs b/editors/zed/files/patch-crates_project_src_agent__registry__store.rs index f25072aaf558..849a5d7a6b40 100644 --- a/editors/zed/files/patch-crates_project_src_agent__registry__store.rs +++ b/editors/zed/files/patch-crates_project_src_agent__registry__store.rs @@ -1,6 +1,6 @@ ---- crates/project/src/agent_registry_store.rs.orig 2026-02-25 15:15:01 UTC +--- crates/project/src/agent_registry_store.rs.orig 2026-03-11 14:31:09 UTC +++ crates/project/src/agent_registry_store.rs -@@ -490,6 +490,8 @@ fn current_platform_key() -> Option<&'static str> { +@@ -512,6 +512,8 @@ fn current_platform_key() -> Option<&'static str> { "linux" } else if cfg!(target_os = "windows") { "windows" @@ -9,7 +9,7 @@ } else { return None; }; -@@ -516,6 +518,11 @@ fn current_platform_key() -> Option<&'static str> { +@@ -538,6 +540,11 @@ fn current_platform_key() -> Option<&'static str> { "windows" => match arch { "aarch64" => "windows-aarch64", "x86_64" => "windows-x86_64", diff --git a/editors/zed/files/patch-crates_project_src_agent__server__store.rs b/editors/zed/files/patch-crates_project_src_agent__server__store.rs index b481f994b135..7b91ba7f7a8a 100644 --- a/editors/zed/files/patch-crates_project_src_agent__server__store.rs +++ b/editors/zed/files/patch-crates_project_src_agent__server__store.rs @@ -1,15 +1,6 @@ ---- crates/project/src/agent_server_store.rs.orig 2026-02-25 15:15:01 UTC +--- crates/project/src/agent_server_store.rs.orig 2026-03-11 14:31:09 UTC +++ crates/project/src/agent_server_store.rs -@@ -1690,6 +1690,8 @@ fn get_platform_info() -> Option<(&'static str, &'stat - "pc-windows-msvc" - } else if cfg!(target_os = "linux") { - "unknown-linux-gnu" -+ } else if cfg!(target_os = "freebsd") { -+ "unknown-freebsd" - } else { - return None; - }; -@@ -1771,6 +1773,8 @@ impl ExternalAgentServer for LocalExtensionArchiveAgen +@@ -1046,6 +1046,8 @@ impl ExternalAgentServer for LocalExtensionArchiveAgen "linux" } else if cfg!(target_os = "windows") { "windows" @@ -18,7 +9,7 @@ } else { anyhow::bail!("unsupported OS"); }; -@@ -1973,6 +1977,8 @@ impl ExternalAgentServer for LocalRegistryArchiveAgent +@@ -1240,6 +1242,8 @@ impl ExternalAgentServer for LocalRegistryArchiveAgent "linux" } else if cfg!(target_os = "windows") { "windows" diff --git a/editors/zed/files/patch-crates_project_tests_integration_project__tests.rs b/editors/zed/files/patch-crates_project_tests_integration_project__tests.rs new file mode 100644 index 000000000000..a4ed454a9377 --- /dev/null +++ b/editors/zed/files/patch-crates_project_tests_integration_project__tests.rs @@ -0,0 +1,11 @@ +--- crates/project/tests/integration/project_tests.rs.orig 2026-03-15 12:40:17 UTC ++++ crates/project/tests/integration/project_tests.rs +@@ -5359,7 +5359,7 @@ async fn test_rescan_and_remote_updates(cx: &mut gpui: + }); + } + +-#[cfg(target_os = "linux")] ++#[cfg(any(target_os = "linux", target_os = "freebsd"))] + #[gpui::test(retries = 5)] + async fn test_recreated_directory_receives_child_events(cx: &mut gpui::TestAppContext) { + init_test(cx); diff --git a/editors/zed/files/patch-crates_remote__server_src_server.rs b/editors/zed/files/patch-crates_remote__server_src_server.rs index b36d60e6889c..2413439da76c 100644 --- a/editors/zed/files/patch-crates_remote__server_src_server.rs +++ b/editors/zed/files/patch-crates_remote__server_src_server.rs @@ -1,6 +1,6 @@ ---- crates/remote_server/src/server.rs.orig 2026-03-04 15:41:56 UTC +--- crates/remote_server/src/server.rs.orig 2026-03-11 14:31:09 UTC +++ crates/remote_server/src/server.rs -@@ -452,6 +452,7 @@ pub fn execute_run( +@@ -461,6 +461,7 @@ pub fn execute_run( let app = gpui_platform::headless(); let pid = std::process::id(); let id = pid.to_string(); @@ -8,7 +8,7 @@ crashes::init( crashes::InitCrashHandler { session_id: id, -@@ -707,6 +708,7 @@ pub(crate) fn execute_proxy( +@@ -716,6 +717,7 @@ pub(crate) fn execute_proxy( let server_paths = ServerPaths::new(&identifier)?; let id = std::process::id().to_string(); diff --git a/editors/zed/files/patch-crates_remote_src_transport.rs b/editors/zed/files/patch-crates_remote_src_transport.rs index 9fcce5bb184a..0088371195df 100644 --- a/editors/zed/files/patch-crates_remote_src_transport.rs +++ b/editors/zed/files/patch-crates_remote_src_transport.rs @@ -1,6 +1,6 @@ ---- crates/remote/src/transport.rs.orig 2026-01-29 22:37:26 UTC +--- crates/remote/src/transport.rs.orig 2026-03-11 14:31:09 UTC +++ crates/remote/src/transport.rs -@@ -30,6 +30,7 @@ fn parse_platform(output: &str) -> Result Result RemoteOs::MacOs, "Linux" => RemoteOs::Linux, @@ -8,7 +8,7 @@ _ => anyhow::bail!( "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development" ), -@@ -42,7 +43,7 @@ fn parse_platform(output: &str) -> Result Result anyhow::Result { +@@ -289,7 +289,7 @@ pub fn get_shell_safe_zed_path(shell_kind: shell::Shel + use paths::PathExt; let mut zed_path = std::env::current_exe().context("Failed to determine current zed executable path.")?; - if cfg!(target_os = "linux") diff --git a/editors/zed/files/patch-crates_zed_Cargo.toml b/editors/zed/files/patch-crates_zed_Cargo.toml index 38d5dd0e6974..144d33995df1 100644 --- a/editors/zed/files/patch-crates_zed_Cargo.toml +++ b/editors/zed/files/patch-crates_zed_Cargo.toml @@ -1,17 +1,17 @@ ---- crates/zed/Cargo.toml.orig 2026-03-04 15:41:56 UTC +--- crates/zed/Cargo.toml.orig 2026-03-11 14:31:09 UTC +++ crates/zed/Cargo.toml @@ -93,7 +93,6 @@ copilot_ui.workspace = true copilot.workspace = true copilot_chat.workspace = true copilot_ui.workspace = true -crashes.workspace = true + csv_preview.workspace = true dap_adapters.workspace = true db.workspace = true - debug_adapter_extension.workspace = true -@@ -238,6 +237,9 @@ ashpd.workspace = true +@@ -244,6 +243,9 @@ pkg-config = "0.3.22" - [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies] - ashpd.workspace = true + [target.'cfg(target_os = "linux")'.build-dependencies] + pkg-config = "0.3.22" + +[target.'cfg(not(target_os = "freebsd"))'.dependencies] +crashes.workspace = true diff --git a/editors/zed/files/patch-crates_zed_src_zed.rs b/editors/zed/files/patch-crates_zed_src_zed.rs index 4e4f860de231..60fce9c9013d 100644 --- a/editors/zed/files/patch-crates_zed_src_zed.rs +++ b/editors/zed/files/patch-crates_zed_src_zed.rs @@ -1,6 +1,6 @@ ---- crates/zed/src/zed.rs.orig 2026-02-25 15:15:01 UTC +--- crates/zed/src/zed.rs.orig 2026-03-11 14:31:09 UTC +++ crates/zed/src/zed.rs -@@ -411,6 +411,7 @@ pub fn initialize_workspace( +@@ -422,6 +422,7 @@ pub fn initialize_workspace( if let Some(specs) = window.gpu_specs() { log::info!("Using GPU: {:?}", specs); show_software_emulation_warning_if_needed(specs.clone(), window, cx);