aboutsummaryrefslogtreecommitdiff
path: root/editors/zed/files
diff options
context:
space:
mode:
Diffstat (limited to 'editors/zed/files')
-rw-r--r--editors/zed/files/patch-Cargo.lock16
-rw-r--r--editors/zed/files/patch-crates_fs_src_fs.rs25
-rw-r--r--editors/zed/files/patch-crates_gpui_src_platform.rs4
-rw-r--r--editors/zed/files/patch-crates_project_src_agent__server__store.rs6
-rw-r--r--editors/zed/files/patch-crates_remote__server_Cargo.toml4
-rw-r--r--editors/zed/files/patch-crates_remote__server_src_unix.rs6
-rw-r--r--editors/zed/files/patch-crates_remote_src_transport_ssh.rs21
-rw-r--r--editors/zed/files/patch-crates_zed_Cargo.toml4
-rw-r--r--editors/zed/files/patch-crates_zed_src_main.rs10
-rw-r--r--editors/zed/files/patch-crates_zed_src_reliability.rs18
-rw-r--r--editors/zed/files/patch-crates_zed_src_zed.rs4
11 files changed, 80 insertions, 38 deletions
diff --git a/editors/zed/files/patch-Cargo.lock b/editors/zed/files/patch-Cargo.lock
index 90fb39c65279..5104838bae3a 100644
--- a/editors/zed/files/patch-Cargo.lock
+++ b/editors/zed/files/patch-Cargo.lock
@@ -1,6 +1,6 @@
---- Cargo.lock.orig 2025-11-15 04:02:09 UTC
+--- Cargo.lock.orig 2025-11-19 15:41:44 UTC
+++ Cargo.lock
-@@ -8378,21 +8378,20 @@ name = "ipc-channel"
+@@ -8389,21 +8389,20 @@ name = "ipc-channel"
[[package]]
name = "ipc-channel"
@@ -26,7 +26,7 @@
]
[[package]]
-@@ -19790,16 +19789,6 @@ name = "windows"
+@@ -19824,16 +19823,6 @@ name = "windows"
[[package]]
name = "windows"
@@ -43,7 +43,7 @@
version = "0.61.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
-@@ -19858,19 +19847,6 @@ name = "windows-core"
+@@ -19892,19 +19881,6 @@ name = "windows-core"
[[package]]
name = "windows-core"
@@ -63,7 +63,7 @@
version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-@@ -19919,17 +19895,6 @@ name = "windows-implement"
+@@ -19953,17 +19929,6 @@ name = "windows-implement"
[[package]]
name = "windows-implement"
@@ -81,7 +81,7 @@
version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
-@@ -19952,17 +19917,6 @@ name = "windows-interface"
+@@ -19986,17 +19951,6 @@ name = "windows-interface"
[[package]]
name = "windows-interface"
@@ -99,7 +99,7 @@
version = "0.59.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
-@@ -20038,15 +19992,6 @@ name = "windows-result"
+@@ -20072,15 +20026,6 @@ name = "windows-result"
[[package]]
name = "windows-result"
@@ -115,7 +115,7 @@
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-@@ -20061,16 +20006,6 @@ dependencies = [
+@@ -20095,16 +20040,6 @@ dependencies = [
checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
dependencies = [
"windows-link 0.2.1",
diff --git a/editors/zed/files/patch-crates_fs_src_fs.rs b/editors/zed/files/patch-crates_fs_src_fs.rs
index 6e1826cf7b49..aee69dd1bc0b 100644
--- a/editors/zed/files/patch-crates_fs_src_fs.rs
+++ b/editors/zed/files/patch-crates_fs_src_fs.rs
@@ -1,6 +1,15 @@
---- crates/fs/src/fs.rs.orig 2025-11-15 04:52:04 UTC
+--- crates/fs/src/fs.rs.orig 2025-11-19 15:41:44 UTC
+++ crates/fs/src/fs.rs
-@@ -309,7 +309,10 @@ impl FileHandle for std::fs::File {
+@@ -356,7 +356,7 @@ impl FileHandle for std::fs::File {
+ Ok(new_path)
+ }
+
+- #[cfg(target_os = "freebsd")]
++ #[cfg(all(target_os = "freebsd", target_arch = "x86_64"))]
+ fn current_path(&self, _: &Arc<dyn Fs>) -> Result<PathBuf> {
+ use std::{
+ ffi::{CStr, OsStr},
+@@ -365,7 +365,10 @@ impl FileHandle for std::fs::File {
let fd = self.as_fd();
let mut kif = MaybeUninit::<libc::kinfo_file>::uninit();
@@ -12,3 +21,15 @@
let result = unsafe { libc::fcntl(fd.as_raw_fd(), libc::F_KINFO, kif.as_mut_ptr()) };
if result == -1 {
+@@ -376,6 +379,11 @@ impl FileHandle for std::fs::File {
+ let c_str = unsafe { CStr::from_ptr(kif.assume_init().kf_path.as_ptr()) };
+ let path = PathBuf::from(OsStr::from_bytes(c_str.to_bytes()));
+ Ok(path)
++ }
++
++ #[cfg(all(target_os = "freebsd", not(target_arch = "x86_64")))]
++ fn current_path(&self, _: &Arc<dyn Fs>) -> Result<PathBuf> {
++ anyhow::bail!("unimplemented")
+ }
+
+ #[cfg(target_os = "windows")]
diff --git a/editors/zed/files/patch-crates_gpui_src_platform.rs b/editors/zed/files/patch-crates_gpui_src_platform.rs
index 9b4cc0975678..d4c4f89d6498 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 2025-11-15 04:46:05 UTC
+--- crates/gpui/src/platform.rs.orig 2025-11-19 15:41:44 UTC
+++ crates/gpui/src/platform.rs
@@ -82,7 +82,7 @@ pub(crate) use windows::*;
#[cfg(target_os = "windows")]
@@ -9,7 +9,7 @@
pub use linux::layer_shell;
#[cfg(any(test, feature = "test-support"))]
-@@ -1320,7 +1320,7 @@ pub enum WindowKind {
+@@ -1338,7 +1338,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__server__store.rs b/editors/zed/files/patch-crates_project_src_agent__server__store.rs
index 6acc5fd6868e..c9e30fac72cf 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,6 +1,6 @@
---- crates/project/src/agent_server_store.rs.orig 2025-11-15 06:30:50 UTC
+--- crates/project/src/agent_server_store.rs.orig 2025-11-19 15:41:44 UTC
+++ crates/project/src/agent_server_store.rs
-@@ -1343,6 +1343,8 @@ fn get_platform_info() -> Option<(&'static str, &'stat
+@@ -1355,6 +1355,8 @@ fn get_platform_info() -> Option<(&'static str, &'stat
"pc-windows-msvc"
} else if cfg!(target_os = "linux") {
"unknown-linux-gnu"
@@ -9,7 +9,7 @@
} else {
return None;
};
-@@ -1429,6 +1431,8 @@ impl ExternalAgentServer for LocalExtensionArchiveAgen
+@@ -1441,6 +1443,8 @@ impl ExternalAgentServer for LocalExtensionArchiveAgen
"linux"
} else if cfg!(target_os = "windows") {
"windows"
diff --git a/editors/zed/files/patch-crates_remote__server_Cargo.toml b/editors/zed/files/patch-crates_remote__server_Cargo.toml
index e5b7f034984c..2ddd55aacd6d 100644
--- a/editors/zed/files/patch-crates_remote__server_Cargo.toml
+++ b/editors/zed/files/patch-crates_remote__server_Cargo.toml
@@ -1,6 +1,6 @@
---- crates/remote_server/Cargo.toml.orig 2025-11-15 04:13:17 UTC
+--- crates/remote_server/Cargo.toml.orig 2025-11-19 15:41:44 UTC
+++ crates/remote_server/Cargo.toml
-@@ -67,12 +67,16 @@ rayon.workspace = true
+@@ -68,12 +68,16 @@ rayon.workspace = true
thiserror.workspace = true
rayon.workspace = true
diff --git a/editors/zed/files/patch-crates_remote__server_src_unix.rs b/editors/zed/files/patch-crates_remote__server_src_unix.rs
index 5651c60c6719..e32625cf1d47 100644
--- a/editors/zed/files/patch-crates_remote__server_src_unix.rs
+++ b/editors/zed/files/patch-crates_remote__server_src_unix.rs
@@ -1,6 +1,6 @@
---- crates/remote_server/src/unix.rs.orig 2025-11-15 05:26:18 UTC
+--- crates/remote_server/src/unix.rs.orig 2025-11-19 15:41:44 UTC
+++ crates/remote_server/src/unix.rs
-@@ -347,6 +347,7 @@ pub fn execute_run(
+@@ -348,6 +348,7 @@ pub fn execute_run(
let app = gpui::Application::headless();
let id = std::process::id().to_string();
@@ -8,7 +8,7 @@
app.background_executor()
.spawn(crashes::init(crashes::InitCrashHandler {
session_id: id,
-@@ -562,6 +563,7 @@ pub(crate) fn execute_proxy(
+@@ -561,6 +562,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_ssh.rs b/editors/zed/files/patch-crates_remote_src_transport_ssh.rs
new file mode 100644
index 000000000000..eb3db95eb4d4
--- /dev/null
+++ b/editors/zed/files/patch-crates_remote_src_transport_ssh.rs
@@ -0,0 +1,21 @@
+--- crates/remote/src/transport/ssh.rs.orig 2025-11-24 20:23:08 UTC
++++ crates/remote/src/transport/ssh.rs
+@@ -1058,6 +1058,7 @@ impl SshSocket {
+ let os = match os.trim() {
+ "Darwin" => "macos",
+ "Linux" => "linux",
++ "FreeBSD" => "freebsd",
+ _ => anyhow::bail!(
+ "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
+ ),
+@@ -1069,7 +1070,9 @@ impl SshSocket {
+ || arch.starts_with("aarch64")
+ {
+ "aarch64"
+- } else if arch.starts_with("x86") {
++ } else if arch.starts_with("x86")
++ || arch.starts_with("amd64")
++ {
+ "x86_64"
+ } else {
+ anyhow::bail!(
diff --git a/editors/zed/files/patch-crates_zed_Cargo.toml b/editors/zed/files/patch-crates_zed_Cargo.toml
index 00e9ae35d37e..a531457cfe61 100644
--- a/editors/zed/files/patch-crates_zed_Cargo.toml
+++ b/editors/zed/files/patch-crates_zed_Cargo.toml
@@ -1,4 +1,4 @@
---- crates/zed/Cargo.toml.orig 2025-11-15 04:18:59 UTC
+--- crates/zed/Cargo.toml.orig 2025-11-19 15:41:44 UTC
+++ crates/zed/Cargo.toml
@@ -43,7 +43,6 @@ copilot.workspace = true
command_palette.workspace = true
@@ -8,7 +8,7 @@
dap_adapters.workspace = true
db.workspace = true
debug_adapter_extension.workspace = true
-@@ -175,6 +174,9 @@ ashpd.workspace = true
+@@ -177,6 +176,9 @@ ashpd.workspace = true
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
ashpd.workspace = true
diff --git a/editors/zed/files/patch-crates_zed_src_main.rs b/editors/zed/files/patch-crates_zed_src_main.rs
index 71fe4f854f1d..b13c3099302d 100644
--- a/editors/zed/files/patch-crates_zed_src_main.rs
+++ b/editors/zed/files/patch-crates_zed_src_main.rs
@@ -1,4 +1,4 @@
---- crates/zed/src/main.rs.orig 2025-11-14 23:13:53 UTC
+--- crates/zed/src/main.rs.orig 2025-11-19 15:41:44 UTC
+++ crates/zed/src/main.rs
@@ -8,6 +8,7 @@ use collections::HashMap;
use client::{Client, ProxySettings, UserStore, parse_zed_link};
@@ -8,7 +8,7 @@
use crashes::InitCrashHandler;
use db::kvp::{GLOBAL_KEY_VALUE_STORE, KEY_VALUE_STORE};
use editor::Editor;
-@@ -174,6 +175,7 @@ pub fn main() {
+@@ -181,6 +182,7 @@ pub fn main() {
}
// `zed --crash-handler` Makes zed operate in minidump crash handler mode
@@ -16,7 +16,7 @@
if let Some(socket) = &args.crash_handler {
crashes::crash_server(socket.as_path());
return;
-@@ -284,6 +286,7 @@ pub fn main() {
+@@ -291,6 +293,7 @@ pub fn main() {
let session_id = Uuid::new_v4().to_string();
let session = app.background_executor().block(Session::new());
@@ -24,8 +24,8 @@
app.background_executor()
.spawn(crashes::init(InitCrashHandler {
session_id: session_id.clone(),
-@@ -541,6 +544,7 @@ pub fn main() {
- auto_update::init(client.http_client(), cx);
+@@ -547,6 +550,7 @@ pub fn main() {
+ auto_update::init(client.clone(), cx);
dap_adapters::init(cx);
auto_update_ui::init(cx);
+ #[cfg(not(target_os = "freebsd"))]
diff --git a/editors/zed/files/patch-crates_zed_src_reliability.rs b/editors/zed/files/patch-crates_zed_src_reliability.rs
index 72cc90fa734a..e0106a811bc5 100644
--- a/editors/zed/files/patch-crates_zed_src_reliability.rs
+++ b/editors/zed/files/patch-crates_zed_src_reliability.rs
@@ -1,22 +1,22 @@
---- crates/zed/src/reliability.rs.orig 2025-11-15 05:44:38 UTC
+--- crates/zed/src/reliability.rs.orig 2025-11-19 15:41:44 UTC
+++ crates/zed/src/reliability.rs
-@@ -11,6 +11,7 @@ use util::ResultExt;
- use std::{ffi::OsStr, fs, sync::Arc};
- use util::ResultExt;
+@@ -14,6 +14,7 @@ use crate::STARTUP_TIME;
+
+ use crate::STARTUP_TIME;
+#[cfg(not(target_os = "freebsd"))]
pub fn init(http_client: Arc<HttpClientWithUrl>, installation_id: Option<String>, cx: &mut App) {
- #[cfg(target_os = "macos")]
- monitor_main_thread_hangs(http_client.clone(), installation_id.clone(), cx);
-@@ -272,6 +273,7 @@ pub fn monitor_main_thread_hangs(
- .detach()
+ monitor_hangs(cx);
+
+@@ -365,6 +366,7 @@ fn save_hang_trace(
+ );
}
+#[cfg(not(target_os = "freebsd"))]
pub async fn upload_previous_minidumps(
http: Arc<HttpClientWithUrl>,
installation_id: Option<String>,
-@@ -311,6 +313,7 @@ pub async fn upload_previous_minidumps(
+@@ -404,6 +406,7 @@ pub async fn upload_previous_minidumps(
Ok(())
}
diff --git a/editors/zed/files/patch-crates_zed_src_zed.rs b/editors/zed/files/patch-crates_zed_src_zed.rs
index 630fcaa7dcee..77bc408cce2e 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 2025-11-15 05:42:34 UTC
+--- crates/zed/src/zed.rs.orig 2025-11-24 20:23:08 UTC
+++ crates/zed/src/zed.rs
-@@ -370,6 +370,7 @@ pub fn initialize_workspace(
+@@ -382,6 +382,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);
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-27 18:09:51 +0000