git: 8089ca3c4ea2 - main - editors/zed: Update to 1.10.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 10 Jul 2026 01:58:32 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8089ca3c4ea289d2034297b918ea3cadea0bdd40
commit 8089ca3c4ea289d2034297b918ea3cadea0bdd40
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2026-07-10 01:57:09 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2026-07-10 01:58:25 +0000
editors/zed: Update to 1.10.1
Changelog:
- https://github.com/zed-industries/zed/releases/tag/v1.10.0
- https://github.com/zed-industries/zed/releases/tag/v1.10.1
Reported by: GitHub (watch releases)
---
editors/zed/Makefile | 2 +-
editors/zed/distinfo | 6 ++--
editors/zed/files/patch-Cargo.lock | 16 ++++-----
.../patch-crates_gpui__linux_src_linux_platform.rs | 29 ++++++++++++++++
.../zed/files/patch-crates_gpui_src_platform.rs | 4 +--
...tes_project_tests_integration_project__tests.rs | 40 ++++++++++++++++++++--
editors/zed/files/patch-crates_zed_src_main.rs | 16 ++++-----
editors/zed/files/patch-crates_zed_src_zed.rs | 4 +--
8 files changed, 91 insertions(+), 26 deletions(-)
diff --git a/editors/zed/Makefile b/editors/zed/Makefile
index c7f3e54fec48..c4a705bb4d50 100644
--- a/editors/zed/Makefile
+++ b/editors/zed/Makefile
@@ -1,6 +1,6 @@
PORTNAME= zed
DISTVERSIONPREFIX= v
-DISTVERSION= 1.9.0
+DISTVERSION= 1.10.1
CATEGORIES= editors
PKGNAMESUFFIX= -editor
diff --git a/editors/zed/distinfo b/editors/zed/distinfo
index 27346ff62e82..eeff48e5806c 100644
--- a/editors/zed/distinfo
+++ b/editors/zed/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1783084055
+TIMESTAMP = 1783629484
SHA256 (rust/crates/accesskit-0.24.1.crate) = d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320
SIZE (rust/crates/accesskit-0.24.1.crate) = 36947
SHA256 (rust/crates/accesskit_atspi_common-0.18.0.crate) = 842fd8203e6dfcf531d24f5bac792088edfba7d6b35844fead191603fb32a260
@@ -3089,5 +3089,5 @@ SHA256 (zed-industries-tree-sitter-yaml-baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a
SIZE (zed-industries-tree-sitter-yaml-baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a_GH0.tar.gz) = 145319
SHA256 (zed-industries-calloop-eb6b4fd17b9af5ecc226546bdd04185391b3e265_GH0.tar.gz) = 8698ebc194a6c3ee377cde94f4fdff590f6a7973bc7987c880801fa7fd69e5c3
SIZE (zed-industries-calloop-eb6b4fd17b9af5ecc226546bdd04185391b3e265_GH0.tar.gz) = 94768
-SHA256 (zed-industries-zed-v1.9.0_GH0.tar.gz) = 2f8066d0aa98b7485327405e495aba737876d9f0c407af06e22b940798ae82e6
-SIZE (zed-industries-zed-v1.9.0_GH0.tar.gz) = 22945160
+SHA256 (zed-industries-zed-v1.10.1_GH0.tar.gz) = c4595b01bd1c1a098db39b41f7be824230646891890957e8629748e3280c7dc9
+SIZE (zed-industries-zed-v1.10.1_GH0.tar.gz) = 23177969
diff --git a/editors/zed/files/patch-Cargo.lock b/editors/zed/files/patch-Cargo.lock
index 63deaee1c0e9..dfff951183dc 100644
--- a/editors/zed/files/patch-Cargo.lock
+++ b/editors/zed/files/patch-Cargo.lock
@@ -1,6 +1,6 @@
---- Cargo.lock.orig 2026-07-01 15:07:44 UTC
+--- Cargo.lock.orig 2026-07-09 18:37:25 UTC
+++ Cargo.lock
-@@ -9177,21 +9177,21 @@ name = "ipc-channel"
+@@ -9179,21 +9179,21 @@ name = "ipc-channel"
[[package]]
name = "ipc-channel"
@@ -30,7 +30,7 @@
]
[[package]]
-@@ -21327,16 +21327,6 @@ name = "windows"
+@@ -21364,16 +21364,6 @@ name = "windows"
[[package]]
name = "windows"
@@ -47,7 +47,7 @@
version = "0.61.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
-@@ -21429,19 +21419,6 @@ name = "windows-core"
+@@ -21466,19 +21456,6 @@ name = "windows-core"
[[package]]
name = "windows-core"
@@ -67,7 +67,7 @@
version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-@@ -21512,17 +21489,6 @@ name = "windows-implement"
+@@ -21549,17 +21526,6 @@ name = "windows-implement"
[[package]]
name = "windows-implement"
@@ -85,7 +85,7 @@
version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
-@@ -21556,17 +21522,6 @@ name = "windows-interface"
+@@ -21593,17 +21559,6 @@ name = "windows-interface"
[[package]]
name = "windows-interface"
@@ -103,7 +103,7 @@
version = "0.59.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
-@@ -21652,15 +21607,6 @@ name = "windows-result"
+@@ -21689,15 +21644,6 @@ name = "windows-result"
[[package]]
name = "windows-result"
@@ -119,7 +119,7 @@
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-@@ -21675,16 +21621,6 @@ dependencies = [
+@@ -21712,16 +21658,6 @@ dependencies = [
checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
dependencies = [
"windows-link 0.2.1",
diff --git a/editors/zed/files/patch-crates_gpui__linux_src_linux_platform.rs b/editors/zed/files/patch-crates_gpui__linux_src_linux_platform.rs
new file mode 100644
index 000000000000..ecd258ff5603
--- /dev/null
+++ b/editors/zed/files/patch-crates_gpui__linux_src_linux_platform.rs
@@ -0,0 +1,29 @@
+--- crates/gpui_linux/src/linux/platform.rs.orig 2026-07-09 20:22:36 UTC
++++ crates/gpui_linux/src/linux/platform.rs
+@@ -124,7 +124,7 @@ pub(crate) struct LinuxCommon {
+ pub(crate) signal: LoopSignal,
+ pub(crate) menus: Vec<OwnedMenu>,
+ #[cfg_attr(
+- not(all(target_os = "linux", any(feature = "wayland", feature = "x11"))),
++ not(all(any(target_os = "linux", target_os = "freebsd"), any(feature = "wayland", feature = "x11"))),
+ allow(dead_code)
+ )]
+ wake_sender: Sender<()>,
+@@ -172,7 +172,7 @@ impl LinuxCommon {
+
+ pub(crate) fn start_wake_listener(&mut self) {
+ if !self.wake_listener_started {
+- #[cfg(all(target_os = "linux", any(feature = "wayland", feature = "x11")))]
++ #[cfg(all(any(target_os = "linux", target_os = "freebsd"), any(feature = "wayland", feature = "x11")))]
+ smol::spawn({
+ let wake_sender = self.wake_sender.clone();
+ async move {
+@@ -195,7 +195,7 @@ impl LinuxCommon {
+ }
+ }
+
+-#[cfg(all(target_os = "linux", any(feature = "wayland", feature = "x11")))]
++#[cfg(all(any(target_os = "linux", target_os = "freebsd"), any(feature = "wayland", feature = "x11")))]
+ async fn listen_for_system_wake(wake_sender: Sender<()>) -> anyhow::Result<()> {
+ use futures::StreamExt as _;
+
diff --git a/editors/zed/files/patch-crates_gpui_src_platform.rs b/editors/zed/files/patch-crates_gpui_src_platform.rs
index 6524180624b7..f0e3a5094d54 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-06-17 14:36:18 UTC
+--- crates/gpui/src/platform.rs.orig 2026-07-09 18:37:25 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;
-@@ -1671,7 +1671,7 @@ pub enum WindowKind {
+@@ -1681,7 +1681,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_tests_integration_project__tests.rs b/editors/zed/files/patch-crates_project_tests_integration_project__tests.rs
index fc9b3a7ac71b..71d1c622d3c2 100644
--- a/editors/zed/files/patch-crates_project_tests_integration_project__tests.rs
+++ b/editors/zed/files/patch-crates_project_tests_integration_project__tests.rs
@@ -1,6 +1,15 @@
---- crates/project/tests/integration/project_tests.rs.orig 2026-06-24 15:32:03 UTC
+--- crates/project/tests/integration/project_tests.rs.orig 2026-07-09 18:37:25 UTC
+++ crates/project/tests/integration/project_tests.rs
-@@ -6124,7 +6124,7 @@ async fn test_rescan_and_remote_updates(cx: &mut gpui:
+@@ -68,7 +68,7 @@ use settings::SettingsStore;
+ use rand::{Rng as _, rngs::StdRng};
+ use serde_json::json;
+ use settings::SettingsStore;
+-#[cfg(target_os = "linux")]
++#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+ use settings::{LocalSettingsKind, LocalSettingsPath};
+ #[cfg(not(windows))]
+ use std::os;
+@@ -6266,7 +6266,7 @@ async fn test_rescan_and_remote_updates(cx: &mut gpui:
});
}
@@ -9,3 +18,30 @@
#[gpui::test(retries = 5)]
async fn test_recreated_directory_receives_child_events(cx: &mut gpui::TestAppContext) {
init_test(cx);
+@@ -11406,7 +11406,7 @@ async fn test_git_repository_status_removes_directory_
+ });
+ }
+
+-#[cfg(target_os = "linux")]
++#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+ #[gpui::test(retries = 5)]
+ async fn test_git_events_after_project_excludes_dot_git(cx: &mut gpui::TestAppContext) {
+ init_test(cx);
+@@ -13912,7 +13912,7 @@ fn git_reset(offset: usize, work_dir: &Path) {
+ );
+ }
+
+-#[cfg(target_os = "linux")]
++#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+ #[allow(clippy::disallowed_methods)]
+ #[track_caller]
+ fn git_branch(name: &str, work_dir: &Path) {
+@@ -13927,7 +13927,7 @@ fn git_branch(name: &str, work_dir: &Path) {
+ );
+ }
+
+-#[cfg(target_os = "linux")]
++#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+ #[allow(clippy::disallowed_methods)]
+ #[track_caller]
+ fn git_checkout(name: &str, work_dir: &Path) {
diff --git a/editors/zed/files/patch-crates_zed_src_main.rs b/editors/zed/files/patch-crates_zed_src_main.rs
index 10934ae997ea..591050cdfc5a 100644
--- a/editors/zed/files/patch-crates_zed_src_main.rs
+++ b/editors/zed/files/patch-crates_zed_src_main.rs
@@ -1,6 +1,6 @@
---- crates/zed/src/main.rs.orig 2026-07-01 15:07:44 UTC
+--- crates/zed/src/main.rs.orig 2026-07-09 18:37:25 UTC
+++ crates/zed/src/main.rs
-@@ -23,6 +23,7 @@ use collections::HashMap;
+@@ -21,6 +21,7 @@ use collections::HashMap;
use client::{Client, ProxySettings, RefreshLlmTokenListener, UserStore, parse_zed_link};
use collab_ui::channel_view::ChannelView;
use collections::HashMap;
@@ -8,7 +8,7 @@
use crashes::InitCrashHandler;
use db::kvp::{GlobalKeyValueStore, KeyValueStore};
use editor::Editor;
-@@ -79,7 +80,10 @@ use zed::{
+@@ -77,7 +78,10 @@ use zed::{
handle_keymap_file_changes, initialize_workspace, open_paths_with_positions,
};
@@ -19,7 +19,7 @@
#[cfg(feature = "mimalloc")]
#[global_allocator]
-@@ -221,6 +225,7 @@ fn main() {
+@@ -219,6 +223,7 @@ fn main() {
}
// `zed --crash-handler` Makes zed operate in minidump crash handler mode
@@ -27,7 +27,7 @@
if let Some(socket) = &args.crash_handler {
crashes::crash_server(socket.as_path(), paths::logs_dir().clone());
return;
-@@ -390,6 +395,7 @@ fn main() {
+@@ -388,6 +393,7 @@ fn main() {
) || *release_channel::RELEASE_CHANNEL
!= ReleaseChannel::Dev;
@@ -35,7 +35,7 @@
let crash_handler = if should_install_crash_handler {
Some(
app.background_executor().spawn(crashes::init(
-@@ -612,6 +618,7 @@ fn main() {
+@@ -610,6 +616,7 @@ fn main() {
let telemetry = telemetry.clone();
move |_, evt: &client::user::Event, cx| match evt {
client::user::Event::PrivateUserInfoUpdated => {
@@ -43,7 +43,7 @@
if let Some(crash_client) = cx.try_global::<CrashHandler>() {
crashes::set_user_info(
&crash_client.0,
-@@ -661,6 +668,7 @@ fn main() {
+@@ -659,6 +666,7 @@ fn main() {
auto_update::init(client.clone(), cx);
dap_adapters::init(cx);
auto_update_ui::init(cx);
@@ -51,7 +51,7 @@
reliability::init(client.clone(), cx);
extension_host::init(
extension_host_proxy.clone(),
-@@ -853,6 +861,7 @@ fn main() {
+@@ -851,6 +859,7 @@ fn main() {
let menus = app_menus(cx);
cx.set_menus(menus);
diff --git a/editors/zed/files/patch-crates_zed_src_zed.rs b/editors/zed/files/patch-crates_zed_src_zed.rs
index a786ade833df..02bc341cf888 100644
--- a/editors/zed/files/patch-crates_zed_src_zed.rs
+++ b/editors/zed/files/patch-crates_zed_src_zed.rs
@@ -1,4 +1,4 @@
---- crates/zed/src/zed.rs.orig 2026-06-24 15:32:03 UTC
+--- crates/zed/src/zed.rs.orig 2026-07-09 18:37:25 UTC
+++ crates/zed/src/zed.rs
@@ -108,8 +108,10 @@ const STATUS_URL: &str = "https://status.zed.dev";
const DOCS_URL: &str = "https://zed.dev/docs/";
@@ -11,7 +11,7 @@
impl gpui::Global for CrashHandler {}
actions!(
-@@ -545,6 +547,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>,
+@@ -548,6 +550,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>,
if let Some(specs) = window.gpu_specs() {
log::info!("Using GPU: {:?}", specs);
show_software_emulation_warning_if_needed(specs.clone(), window, cx);