From nobody Sat Nov 22 19:02:15 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDM0808LNz6HPXw for ; Sat, 22 Nov 2025 19:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDM075BvBz3sCv for ; Sat, 22 Nov 2025 19:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763838135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fLbDp5jeD1MmHRhlKjcztyGFMtreYNJ4pDWdKUuI0BY=; b=dUckcRwdgQya19YIf4eTFtLydkHqj7reAuO8dnWTUZTXI19UprYCfcUE/NCfRcDpRSj+19 XukQ9dr6dbQZgK2D5raK3aKSU3cm33s8QPgK9m8s39ZF77iuUD4JOOyR9YoQJNlt0yqtZk E0TKe+j+gn0sU1igzLt+0ZzsWHRnhJCuvJFvAi0ePDaDWcGTcs0H/6T2PctEWWjRX7o5fp Psz+uABHQi/xpmylaPKhzmIgBIV7McO0iPN4eq15ixbP9UNxet4q5RZMUnSaTEe1E1lr3q tujO3klpAHS5Gw40jONvkc+lOJ72dSmSjuH+7O81U8X4tGEl2Y9VGNbEMFOhew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763838135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fLbDp5jeD1MmHRhlKjcztyGFMtreYNJ4pDWdKUuI0BY=; b=Q38LNKyw/GMfD1EjeV9RnxmtaKbklWGrePM0XD40WET8LmaHkocC5rzL4/KW2vw5ASBnRe hoENahLGgSIm2f1cU8P0h5P0TAiN3zPZ6kLRSCVGDh29nikexphPZtVb1vIZKvD5IRdxdn 0goDmDohEcJWccjSvQcMP1pIfo5SnXS8CUael4cJNcRYoncIUVjBtYOdeuz8uQ16cVQHwQ XT79Pfk8s2B4KTJy+sfkHDXu47jUN7FpOiH6gF1ztFBBZBbwg3dY6NBxghXiLNWuKwQiMw F+NONyistPhLYg0A64gO8RwZA+u5BvlTpAfVaFa1WVry82wdWNDslaT6dZKsBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763838135; a=rsa-sha256; cv=none; b=UBePMOjjw+DUkuxoApfqMdgTShg5xXMei04CtqFvrhIp2aXJWOaGd51/ZwaM5zps2S/T7R Hy/EjezmpU4qIJVIrfCtmWFEkjJpmg7+n1U4Qzekh/oU/xrJ6hV/68TXDkEzbxiL1RLmVj MhQDkECD0PD+Xbhky28SgziDmVVwskb3Ebq63RzzywjF/pJ5+y+tFNbPVFCo7JDpX8CQzk 4mgN2qTDtYx6VadgJ7tC/jNaIr7cV7RL7TWxG+F2xgHzULY627F0kh+SkDpyOSrE/8hidV y40JFfc+ibK+nmk8L4osAJ5crwdkuoGa15wf1yVGuEkldLpXSMrjxAtiJ7ZTgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDM074pVZz19Xf for ; Sat, 22 Nov 2025 19:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22dd9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 19:02:15 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 61d342776945 - main - editors/zed: Update to 0.213.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61d34277694585eaf603a1c1ac4579199e5fe250 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 19:02:15 +0000 Message-Id: <692208b7.22dd9.2c128756@gitrepo.freebsd.org> The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=61d34277694585eaf603a1c1ac4579199e5fe250 commit 61d34277694585eaf603a1c1ac4579199e5fe250 Author: Hiroki Tagato AuthorDate: 2025-11-22 19:00:43 +0000 Commit: Hiroki Tagato CommitDate: 2025-11-22 19:02:09 +0000 editors/zed: Update to 0.213.3 Changelog: - https://github.com/zed-industries/zed/releases/tag/v0.212.7 - https://github.com/zed-industries/zed/releases/tag/v0.213.3 Reported by: GitHub (watch releases) --- editors/zed/Makefile | 2 +- editors/zed/Makefile.crates | 5 +++-- editors/zed/distinfo | 16 ++++++++------ editors/zed/files/patch-Cargo.lock | 16 +++++++------- editors/zed/files/patch-crates_fs_src_fs.rs | 25 ++++++++++++++++++++-- .../zed/files/patch-crates_gpui_src_platform.rs | 4 ++-- ...atch-crates_project_src_agent__server__store.rs | 6 +++--- .../files/patch-crates_remote__server_Cargo.toml | 4 ++-- .../files/patch-crates_remote__server_src_unix.rs | 6 +++--- .../files/patch-crates_remote_src_transport_ssh.rs | 10 +++++++++ editors/zed/files/patch-crates_zed_Cargo.toml | 4 ++-- editors/zed/files/patch-crates_zed_src_main.rs | 10 ++++----- .../zed/files/patch-crates_zed_src_reliability.rs | 18 ++++++++-------- editors/zed/files/patch-crates_zed_src_zed.rs | 4 ++-- 14 files changed, 82 insertions(+), 48 deletions(-) diff --git a/editors/zed/Makefile b/editors/zed/Makefile index 10ef52968aba..4c8c96786210 100644 --- a/editors/zed/Makefile +++ b/editors/zed/Makefile @@ -1,6 +1,6 @@ PORTNAME= zed DISTVERSIONPREFIX= v -DISTVERSION= 0.212.6 +DISTVERSION= 0.213.3 CATEGORIES= editors PKGNAMESUFFIX= -editor diff --git a/editors/zed/Makefile.crates b/editors/zed/Makefile.crates index fd44a0307cc3..9393864101c1 100644 --- a/editors/zed/Makefile.crates +++ b/editors/zed/Makefile.crates @@ -408,7 +408,7 @@ CARGO_CRATES= addr2line-0.25.1 \ foreign-types-macros-0.2.3 \ foreign-types-shared-0.1.1 \ foreign-types-shared-0.3.1 \ - fork-0.2.0 \ + fork-0.4.0 \ form_urlencoded-1.2.2 \ fraction-0.15.3 \ freetype-sys-0.20.1 \ @@ -1013,6 +1013,7 @@ CARGO_CRATES= addr2line-0.25.1 \ socket2-0.6.1 \ spdx-0.10.9 \ spin-0.9.8 \ + spin-0.10.0 \ spirv-0.3.0+sdk-1.3.268.0 \ spki-0.6.0 \ spki-0.7.3 \ @@ -1457,7 +1458,7 @@ CARGO_CRATES= addr2line-0.25.1 \ dap-types@git+https://github.com/zed-industries/dap-types?rev=1b461b310481d01e02b2603c16d7144b926339f8\#1b461b310481d01e02b2603c16d7144b926339f8 \ async-pipe@git+https://github.com/zed-industries/async-pipe-rs?rev=82d00a04211cf4e1236029aa03e6b6ce2a74c553\#82d00a04211cf4e1236029aa03e6b6ce2a74c553 \ nvim-rs@git+https://github.com/KillTheMule/nvim-rs?rev=764dd270c642f77f10f3e19d05cc178a6cbe69f3\#764dd270c642f77f10f3e19d05cc178a6cbe69f3 \ - notify,notify-types@git+https://github.com/zed-industries/notify.git?rev=bbb9ea5ae52b253e095737847e367c30653a2e96\#bbb9ea5ae52b253e095737847e367c30653a2e96 \ zed-font-kit@git+https://github.com/zed-industries/font-kit?rev=110523127440aefb11ce0cf280ae7c5071337ec5\#110523127440aefb11ce0cf280ae7c5071337ec5 \ + notify,notify-types@git+https://github.com/zed-industries/notify.git?rev=b4588b2e5aee68f4c0e100f140e808cbce7b1419\#b4588b2e5aee68f4c0e100f140e808cbce7b1419 \ tree-sitter-typescript@git+https://github.com/zed-industries/tree-sitter-typescript?rev=e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899\#e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899 \ tree-sitter-yaml@git+https://github.com/zed-industries/tree-sitter-yaml?rev=baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a\#baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a diff --git a/editors/zed/distinfo b/editors/zed/distinfo index a1d1fbfbe0ad..2d18ef654fa4 100644 --- a/editors/zed/distinfo +++ b/editors/zed/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1763179827 +TIMESTAMP = 1763729048 SHA256 (rust/crates/addr2line-0.25.1.crate) = 1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b SIZE (rust/crates/addr2line-0.25.1.crate) = 43134 SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa @@ -819,8 +819,8 @@ SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7f SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672 SHA256 (rust/crates/foreign-types-shared-0.3.1.crate) = aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b SIZE (rust/crates/foreign-types-shared-0.3.1.crate) = 6006 -SHA256 (rust/crates/fork-0.2.0.crate) = 05dc8b302e04a1c27f4fe694439ef0f29779ca4edc205b7b58f00db04e29656d -SIZE (rust/crates/fork-0.2.0.crate) = 5903 +SHA256 (rust/crates/fork-0.4.0.crate) = 30268f1eefccc9d72f43692e8b89e659aeb52e84016c3b32b6e7e9f1c8f38f94 +SIZE (rust/crates/fork-0.4.0.crate) = 25166 SHA256 (rust/crates/form_urlencoded-1.2.2.crate) = cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf SIZE (rust/crates/form_urlencoded-1.2.2.crate) = 9347 SHA256 (rust/crates/fraction-0.15.3.crate) = 0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7 @@ -2029,6 +2029,8 @@ SHA256 (rust/crates/spdx-0.10.9.crate) = c3e17e880bafaeb362a7b751ec46bdc5b61445a SIZE (rust/crates/spdx-0.10.9.crate) = 1050181 SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67 SIZE (rust/crates/spin-0.9.8.crate) = 38958 +SHA256 (rust/crates/spin-0.10.0.crate) = d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591 +SIZE (rust/crates/spin-0.10.0.crate) = 39654 SHA256 (rust/crates/spirv-0.3.0+sdk-1.3.268.0.crate) = eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844 SIZE (rust/crates/spirv-0.3.0+sdk-1.3.268.0.crate) = 30802 SHA256 (rust/crates/spki-0.6.0.crate) = 67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b @@ -2917,13 +2919,13 @@ SHA256 (zed-industries-async-pipe-rs-82d00a04211cf4e1236029aa03e6b6ce2a74c553_GH SIZE (zed-industries-async-pipe-rs-82d00a04211cf4e1236029aa03e6b6ce2a74c553_GH0.tar.gz) = 5575 SHA256 (KillTheMule-nvim-rs-764dd270c642f77f10f3e19d05cc178a6cbe69f3_GH0.tar.gz) = a0b9cab774f5b0cb88f39e084d6d074992fbb717eedccc727d062f09335d6a8d SIZE (KillTheMule-nvim-rs-764dd270c642f77f10f3e19d05cc178a6cbe69f3_GH0.tar.gz) = 49979 -SHA256 (zed-industries-notify-bbb9ea5ae52b253e095737847e367c30653a2e96_GH0.tar.gz) = db553633512a116f6a91755b0a393d65bd43185983d4908bd507685af06e6782 -SIZE (zed-industries-notify-bbb9ea5ae52b253e095737847e367c30653a2e96_GH0.tar.gz) = 104977 SHA256 (zed-industries-font-kit-110523127440aefb11ce0cf280ae7c5071337ec5_GH0.tar.gz) = 2908e5a0100f109ba337db639dfb4ee5bab0e90fc119f9db4bf5bd69c907ee10 SIZE (zed-industries-font-kit-110523127440aefb11ce0cf280ae7c5071337ec5_GH0.tar.gz) = 1289436 +SHA256 (zed-industries-notify-b4588b2e5aee68f4c0e100f140e808cbce7b1419_GH0.tar.gz) = edfe99bfa91db8a5783d6bda29b15340a79de0d4d9f4296a3fc3ba39725ee44a +SIZE (zed-industries-notify-b4588b2e5aee68f4c0e100f140e808cbce7b1419_GH0.tar.gz) = 133736 SHA256 (zed-industries-tree-sitter-typescript-e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899_GH0.tar.gz) = f86dbd36ba4c1f733dfbf6cb8f6c287eddeb525b27d6519a5ef01cbe47b5de44 SIZE (zed-industries-tree-sitter-typescript-e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899_GH0.tar.gz) = 1029506 SHA256 (zed-industries-tree-sitter-yaml-baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a_GH0.tar.gz) = c8ae67d171e47f3f48c7f8c0afa2d0e7684ad95f41529ea233214655e19b89f1 SIZE (zed-industries-tree-sitter-yaml-baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a_GH0.tar.gz) = 145319 -SHA256 (zed-industries-zed-v0.212.6_GH0.tar.gz) = 33ebdb373cd2ae8aedbeef0c2331147caba0cb05f20e0f8594e28eb495cedcdf -SIZE (zed-industries-zed-v0.212.6_GH0.tar.gz) = 21572492 +SHA256 (zed-industries-zed-v0.213.3_GH0.tar.gz) = ad3ab6ddb794f51a20ea1cbd4f2aaee70d462a65e1feab024fe3911d4186739f +SIZE (zed-industries-zed-v0.213.3_GH0.tar.gz) = 21633045 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) -> Result { + use std::{ + ffi::{CStr, OsStr}, +@@ -365,7 +365,10 @@ impl FileHandle for std::fs::File { let fd = self.as_fd(); let mut kif = MaybeUninit::::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) -> Result { ++ 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..9723ed02ac52 --- /dev/null +++ b/editors/zed/files/patch-crates_remote_src_transport_ssh.rs @@ -0,0 +1,10 @@ +--- crates/remote/src/transport/ssh.rs.orig 2025-11-21 14:41:36 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" + ), 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, installation_id: Option, 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, installation_id: Option, -@@ -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..1eb0a8a515a2 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-19 15:41:44 UTC +++ crates/zed/src/zed.rs -@@ -370,6 +370,7 @@ pub fn initialize_workspace( +@@ -381,6 +381,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);