git: d2405792e2bf - main - editors/zed: Update to 1.14.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Aug 2026 11:26:28 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d2405792e2bf55250f7193aa2ae96487e8dbf2b3
commit d2405792e2bf55250f7193aa2ae96487e8dbf2b3
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2026-08-10 11:25:24 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2026-08-10 11:26:22 +0000
editors/zed: Update to 1.14.2
Changelog: https://github.com/zed-industries/zed/releases/tag/v1.14.2
Reported by: GitHub (watch releases)
---
editors/zed/Makefile | 4 ++--
editors/zed/Makefile.crates | 11 +++++----
editors/zed/distinfo | 28 ++++++++++++----------
editors/zed/files/patch-Cargo.lock | 16 ++++++-------
editors/zed/files/patch-crates_fs_src_fs.rs | 18 +++++++-------
.../zed/files/patch-crates_gpui_src_platform.rs | 6 ++---
editors/zed/files/patch-crates_gpui_src_window.rs | 4 ++--
...tes_project_tests_integration_project__tests.rs | 12 +++++-----
editors/zed/files/patch-crates_zed_src_zed.rs | 4 ++--
9 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/editors/zed/Makefile b/editors/zed/Makefile
index 57cf03fd9709..64a7bfb7af99 100644
--- a/editors/zed/Makefile
+++ b/editors/zed/Makefile
@@ -1,6 +1,6 @@
PORTNAME= zed
DISTVERSIONPREFIX= v
-DISTVERSION= 1.13.2
+DISTVERSION= 1.14.2
CATEGORIES= editors
PKGNAMESUFFIX= -editor
@@ -14,7 +14,7 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE
LICENSE_FILE_GPLv3+ = ${WRKSRC}/LICENSE-GPL
ONLY_FOR_ARCHS= aarch64 amd64
-ONLY_FOR_ARCHS_REASON= Some of dependent crates only support these architectures
+ONLY_FOR_ARCHS_REASON= some of dependency crates only support these architectures
BUILD_DEPENDS= protoc:devel/protobuf
LIB_DEPENDS= libzstd.so:archivers/zstd \
diff --git a/editors/zed/Makefile.crates b/editors/zed/Makefile.crates
index 829bfcdbb070..f2061dc3b3dc 100644
--- a/editors/zed/Makefile.crates
+++ b/editors/zed/Makefile.crates
@@ -8,9 +8,9 @@ CARGO_CRATES= accesskit-0.24.1 \
addr2line-0.25.1 \
adler2-2.0.1 \
aes-0.8.4 \
- agent-client-protocol-1.3.0 \
- agent-client-protocol-derive-1.3.0 \
- agent-client-protocol-schema-1.4.0 \
+ agent-client-protocol-2.0.0 \
+ agent-client-protocol-derive-2.0.0 \
+ agent-client-protocol-schema-1.5.0 \
ahash-0.7.8 \
ahash-0.8.12 \
aho-corasick-1.1.3 \
@@ -1135,6 +1135,7 @@ CARGO_CRATES= accesskit-0.24.1 \
symphonia-utils-xiph-0.5.5 \
syn-1.0.109 \
syn-2.0.117 \
+ syn-3.0.3 \
sync_wrapper-0.1.2 \
sync_wrapper-1.0.2 \
synchronoise-1.0.1 \
@@ -1308,7 +1309,6 @@ CARGO_CRATES= accesskit-0.24.1 \
wasm-metadata-0.227.1 \
wasm-metadata-0.244.0 \
wasm-streams-0.4.2 \
- wasm_thread-0.3.3 \
wasmparser-0.201.0 \
wasmparser-0.227.1 \
wasmparser-0.236.1 \
@@ -1530,7 +1530,6 @@ CARGO_CRATES= accesskit-0.24.1 \
zvariant-5.11.0 \
zvariant_derive-5.11.0 \
zvariant_utils-3.3.1 \
- trash@git+https://github.com/zed-industries/trash-rs?rev=47761739192828a66b11a94ba5420b82d63c03c5\#47761739192828a66b11a94ba5420b82d63c03c5 \
pet,pet-conda,pet-core,pet-env-var-path,pet-fs,pet-global-virtualenvs,pet-homebrew,pet-jsonrpc,pet-linux-global-python,pet-mac-commandlinetools,pet-mac-python-org,pet-mac-xcode,pet-pipenv,pet-pixi,pet-poetry,pet-pyenv,pet-python-utils,pet-reporter,pet-telemetry,pet-uv,pet-venv,pet-virtualenv,pet-virtualenvwrapper,pet-windows-registry,pet-windows-store,pet-winpython@git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056\#9e61a22af989fe54937bf07c9f9cff1bc53d9056 \
notify,notify-types@git+https://github.com/zed-industries/notify?rev=0890bbb8ca40a4b5d1f67031698dd7918b37d991\#0890bbb8ca40a4b5d1f67031698dd7918b37d991 \
async-task@git+https://github.com/smol-rs/async-task.git?rev=b4486cd71e4e94fbda54ce6302444de14f4d190e\#b4486cd71e4e94fbda54ce6302444de14f4d190e \
@@ -1542,6 +1541,7 @@ CARGO_CRATES= accesskit-0.24.1 \
libwebrtc,livekit,livekit-api,livekit-protocol,livekit-runtime,webrtc-sys,webrtc-sys-build@git+https://github.com/zed-industries/livekit-rust-sdks?rev=d0e27be0cdad89eadab3e36207cda0a2b6e359ee\#d0e27be0cdad89eadab3e36207cda0a2b6e359ee \
yawc@git+https://github.com/zed-industries/yawc?rev=71a452f551cac178367eaac5d7418a09afa1f3a2\#71a452f551cac178367eaac5d7418a09afa1f3a2 \
tree-sitter-gitcommit@git+https://github.com/zed-industries/tree-sitter-git-commit?rev=88309716a69dd13ab83443721ba6e0b491d37ee9\#88309716a69dd13ab83443721ba6e0b491d37ee9 \
+ trash@git+https://github.com/zed-industries/trash-rs?rev=41c6c800d884a89351f3b8856d12894cccee261d\#41c6c800d884a89351f3b8856d12894cccee261d \
rodio@git+https://github.com/RustAudio/rodio?rev=e50e726ddd0292f6ef9de0dda6b90af4ed1fb66a\#e50e726ddd0292f6ef9de0dda6b90af4ed1fb66a \
tree-sitter-md@git+https://github.com/zed-industries/tree-sitter-markdown?rev=b596e737286780d7bfa9fcddceaeeb754574b352\#b596e737286780d7bfa9fcddceaeeb754574b352 \
zed-reqwest@git+https://github.com/zed-industries/reqwest.git?rev=c15662463bda39148ba154100dd44d3fba5873a4\#c15662463bda39148ba154100dd44d3fba5873a4 \
@@ -1550,6 +1550,7 @@ CARGO_CRATES= accesskit-0.24.1 \
xim-ctext,xim-parser,zed-xim@git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8\#16f35a2c881b815a2b6cdfd6687988e84f8447d8 \
tree-sitter-cpp@git+https://github.com/tree-sitter/tree-sitter-cpp?rev=5cb9b693cfd7bfacab1d9ff4acac1a4150700609\#5cb9b693cfd7bfacab1d9ff4acac1a4150700609 \
tree-sitter-heex@git+https://github.com/zed-industries/tree-sitter-heex?rev=1dd45142fbb05562e35b2040c6129c9bca346592\#1dd45142fbb05562e35b2040c6129c9bca346592 \
+ wasm_thread@git+https://github.com/zed-industries/wasm_thread?rev=0cf96c7708dfb97ccf3da50347e25edcf75d6937\#0cf96c7708dfb97ccf3da50347e25edcf75d6937 \
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 \
wprcontrol@git+https://github.com/zed-industries/wprcontrol?rev=cd811f7\#cd811f7d744f65291e13131b1d907fda63ed91a1 \
diff --git a/editors/zed/distinfo b/editors/zed/distinfo
index 6ec951a0022d..b048562afa0d 100644
--- a/editors/zed/distinfo
+++ b/editors/zed/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1785760811
+TIMESTAMP = 1786347429
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
@@ -19,12 +19,12 @@ SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06
SIZE (rust/crates/adler2-2.0.1.crate) = 13366
SHA256 (rust/crates/aes-0.8.4.crate) = b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0
SIZE (rust/crates/aes-0.8.4.crate) = 124812
-SHA256 (rust/crates/agent-client-protocol-1.3.0.crate) = 1d386d6a58f4dbe0ebfa98e915caa54005dabdefd419de3d4678b28cd5752444
-SIZE (rust/crates/agent-client-protocol-1.3.0.crate) = 179954
-SHA256 (rust/crates/agent-client-protocol-derive-1.3.0.crate) = 97b94934d118a69e921d14e94d4af5b3076563318c52662c89a0ecb3f139e1da
-SIZE (rust/crates/agent-client-protocol-derive-1.3.0.crate) = 3975
-SHA256 (rust/crates/agent-client-protocol-schema-1.4.0.crate) = 06679e1542356341f4550ccfb16338b64f37f6af70de2105446ef6fbb078234c
-SIZE (rust/crates/agent-client-protocol-schema-1.4.0.crate) = 213052
+SHA256 (rust/crates/agent-client-protocol-2.0.0.crate) = 6d87bc7769eba641753ba5dc52f73ec3765d51022c6753bf040967125ddc86a8
+SIZE (rust/crates/agent-client-protocol-2.0.0.crate) = 211657
+SHA256 (rust/crates/agent-client-protocol-derive-2.0.0.crate) = 3abd4080f51e4f24f5042beb7fb7a66ede29a2dc1c2582c329532e1c27264ddc
+SIZE (rust/crates/agent-client-protocol-derive-2.0.0.crate) = 5234
+SHA256 (rust/crates/agent-client-protocol-schema-1.5.0.crate) = d5c231915b4ab578c722eca2d1bd7df4d300bfd6cac3b8e9f0d1e3ddc95b187c
+SIZE (rust/crates/agent-client-protocol-schema-1.5.0.crate) = 222973
SHA256 (rust/crates/ahash-0.7.8.crate) = 891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9
SIZE (rust/crates/ahash-0.7.8.crate) = 38550
SHA256 (rust/crates/ahash-0.8.12.crate) = 5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75
@@ -2273,6 +2273,8 @@ SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67
SIZE (rust/crates/syn-1.0.109.crate) = 237611
SHA256 (rust/crates/syn-2.0.117.crate) = e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99
SIZE (rust/crates/syn-2.0.117.crate) = 306011
+SHA256 (rust/crates/syn-3.0.3.crate) = 53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3
+SIZE (rust/crates/syn-3.0.3.crate) = 312999
SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160
SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933
SHA256 (rust/crates/sync_wrapper-1.0.2.crate) = 0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263
@@ -2619,8 +2621,6 @@ SHA256 (rust/crates/wasm-metadata-0.244.0.crate) = bb0e353e6a2fbdc176932bbaab493
SIZE (rust/crates/wasm-metadata-0.244.0.crate) = 21500
SHA256 (rust/crates/wasm-streams-0.4.2.crate) = 15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65
SIZE (rust/crates/wasm-streams-0.4.2.crate) = 36773
-SHA256 (rust/crates/wasm_thread-0.3.3.crate) = b7516db7f32decdadb1c3b8deb1b7d78b9df7606c5cc2f6241737c2ab3a0258e
-SIZE (rust/crates/wasm_thread-0.3.3.crate) = 26870
SHA256 (rust/crates/wasmparser-0.201.0.crate) = 84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708
SIZE (rust/crates/wasmparser-0.201.0.crate) = 193177
SHA256 (rust/crates/wasmparser-0.227.1.crate) = 0f51cad774fb3c9461ab9bccc9c62dfb7388397b5deda31bf40e8108ccd678b2
@@ -3063,8 +3063,6 @@ SHA256 (rust/crates/zvariant_derive-5.11.0.crate) = c7d5b780599bbde114e39d9a0799
SIZE (rust/crates/zvariant_derive-5.11.0.crate) = 17729
SHA256 (rust/crates/zvariant_utils-3.3.1.crate) = 6d464f5733ffa07a3164d656f18533caace9d0638596721355d73256a410d691
SIZE (rust/crates/zvariant_utils-3.3.1.crate) = 15680
-SHA256 (zed-industries-trash-rs-47761739192828a66b11a94ba5420b82d63c03c5_GH0.tar.gz) = a07a3da0d25da8e56e69b50a009484c4a473257e35d1b65c457bab55987ef41c
-SIZE (zed-industries-trash-rs-47761739192828a66b11a94ba5420b82d63c03c5_GH0.tar.gz) = 58879
SHA256 (microsoft-python-environment-tools-9e61a22af989fe54937bf07c9f9cff1bc53d9056_GH0.tar.gz) = 0775b3621bc3ca967d159e2cb89faf83941f825d8f5bdfff2bc94301874a38ac
SIZE (microsoft-python-environment-tools-9e61a22af989fe54937bf07c9f9cff1bc53d9056_GH0.tar.gz) = 1567623
SHA256 (zed-industries-notify-0890bbb8ca40a4b5d1f67031698dd7918b37d991_GH0.tar.gz) = c02f44b32df9013546d6d2b0f16be243bf464cf557ceb088dd77054b465b7ceb
@@ -3087,6 +3085,8 @@ SHA256 (zed-industries-yawc-71a452f551cac178367eaac5d7418a09afa1f3a2_GH0.tar.gz)
SIZE (zed-industries-yawc-71a452f551cac178367eaac5d7418a09afa1f3a2_GH0.tar.gz) = 146675
SHA256 (zed-industries-tree-sitter-git-commit-88309716a69dd13ab83443721ba6e0b491d37ee9_GH0.tar.gz) = 8483d01c4443a016961545bf520c841bbec9b6d927e12a94666ebc4bf0186327
SIZE (zed-industries-tree-sitter-git-commit-88309716a69dd13ab83443721ba6e0b491d37ee9_GH0.tar.gz) = 73789
+SHA256 (zed-industries-trash-rs-41c6c800d884a89351f3b8856d12894cccee261d_GH0.tar.gz) = 475413ceb21d6e2b4dd5c2be9b8ebecc5e1747def70e20e1da9bcd1e286ef400
+SIZE (zed-industries-trash-rs-41c6c800d884a89351f3b8856d12894cccee261d_GH0.tar.gz) = 60401
SHA256 (RustAudio-rodio-e50e726ddd0292f6ef9de0dda6b90af4ed1fb66a_GH0.tar.gz) = 748e2536761a1e07d40716d7c94fb46595b462824a4898a3be8228e6bb05ba8e
SIZE (RustAudio-rodio-e50e726ddd0292f6ef9de0dda6b90af4ed1fb66a_GH0.tar.gz) = 15049482
SHA256 (zed-industries-tree-sitter-markdown-b596e737286780d7bfa9fcddceaeeb754574b352_GH0.tar.gz) = 98c428789d759bcadf7fc8a0754e39854edb23e7858568608882688fe57cffcd
@@ -3103,6 +3103,8 @@ SHA256 (tree-sitter-tree-sitter-cpp-5cb9b693cfd7bfacab1d9ff4acac1a4150700609_GH0
SIZE (tree-sitter-tree-sitter-cpp-5cb9b693cfd7bfacab1d9ff4acac1a4150700609_GH0.tar.gz) = 1194179
SHA256 (zed-industries-tree-sitter-heex-1dd45142fbb05562e35b2040c6129c9bca346592_GH0.tar.gz) = 5893a55adebf54b5a89102b50841928e286dae53bac15e19d1d8860f6a815560
SIZE (zed-industries-tree-sitter-heex-1dd45142fbb05562e35b2040c6129c9bca346592_GH0.tar.gz) = 33900
+SHA256 (zed-industries-wasm_thread-0cf96c7708dfb97ccf3da50347e25edcf75d6937_GH0.tar.gz) = 4dc9b3324038ed7f761f8b32811c27eb8e5234a940fa741a6d5214eb88a7abb6
+SIZE (zed-industries-wasm_thread-0cf96c7708dfb97ccf3da50347e25edcf75d6937_GH0.tar.gz) = 22361
SHA256 (zed-industries-dap-types-1b461b310481d01e02b2603c16d7144b926339f8_GH0.tar.gz) = 11106a57bca99027d5f3a18a3d32af394fa522d91dbefa5b1abf70c70b19bf83
SIZE (zed-industries-dap-types-1b461b310481d01e02b2603c16d7144b926339f8_GH0.tar.gz) = 77173
SHA256 (zed-industries-async-pipe-rs-82d00a04211cf4e1236029aa03e6b6ce2a74c553_GH0.tar.gz) = ee759b95851990a402e7e121dd1d6b3ab3215746901f0dc319d0c0266f7ca09b
@@ -3125,5 +3127,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.13.2_GH0.tar.gz) = 09946e6dd00a88b677dd459d68dd8bfd560f236daed59a9f99ce5b587942a4c6
-SIZE (zed-industries-zed-v1.13.2_GH0.tar.gz) = 23595623
+SHA256 (zed-industries-zed-v1.14.2_GH0.tar.gz) = 2a76e45be06708e719d71aa37cab887c2fcf34e5d5cad8c41ef2be5b70ba2e02
+SIZE (zed-industries-zed-v1.14.2_GH0.tar.gz) = 23745558
diff --git a/editors/zed/files/patch-Cargo.lock b/editors/zed/files/patch-Cargo.lock
index f37906283f93..866f7c8fd212 100644
--- a/editors/zed/files/patch-Cargo.lock
+++ b/editors/zed/files/patch-Cargo.lock
@@ -1,6 +1,6 @@
---- Cargo.lock.orig 2026-07-29 14:43:24 UTC
+--- Cargo.lock.orig 2026-08-05 15:24:27 UTC
+++ Cargo.lock
-@@ -9230,21 +9230,21 @@ name = "ipc-channel"
+@@ -9234,21 +9234,21 @@ name = "ipc-channel"
[[package]]
name = "ipc-channel"
@@ -30,7 +30,7 @@
]
[[package]]
-@@ -21545,16 +21545,6 @@ name = "windows"
+@@ -21599,16 +21599,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"
-@@ -21647,19 +21637,6 @@ name = "windows-core"
+@@ -21701,19 +21691,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"
-@@ -21730,17 +21707,6 @@ name = "windows-implement"
+@@ -21784,17 +21761,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"
-@@ -21774,17 +21740,6 @@ name = "windows-interface"
+@@ -21828,17 +21794,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"
-@@ -21870,15 +21825,6 @@ name = "windows-result"
+@@ -21924,15 +21879,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"
-@@ -21893,16 +21839,6 @@ dependencies = [
+@@ -21947,16 +21893,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 05caa13b4987..b309dc110d4d 100644
--- a/editors/zed/files/patch-crates_fs_src_fs.rs
+++ b/editors/zed/files/patch-crates_fs_src_fs.rs
@@ -1,6 +1,6 @@
---- crates/fs/src/fs.rs.orig 2026-07-29 14:43:24 UTC
+--- crates/fs/src/fs.rs.orig 2026-08-05 15:24:27 UTC
+++ crates/fs/src/fs.rs
-@@ -460,7 +460,7 @@ impl FileHandle for std::fs::File {
+@@ -463,7 +463,7 @@ impl FileHandle for std::fs::File {
Ok(new_path)
}
@@ -9,7 +9,7 @@
fn current_path(&self, _: &Arc<dyn Fs>) -> Result<PathBuf> {
use std::{
ffi::{CStr, OsStr},
-@@ -469,7 +469,10 @@ impl FileHandle for std::fs::File {
+@@ -472,7 +472,10 @@ impl FileHandle for std::fs::File {
let fd = self.as_fd();
let mut kif = MaybeUninit::<libc::kinfo_file>::uninit();
@@ -21,7 +21,7 @@
let result = unsafe { libc::fcntl(fd.as_raw_fd(), libc::F_KINFO, kif.as_mut_ptr()) };
anyhow::ensure!(result != -1, "fcntl returned -1");
-@@ -481,6 +484,11 @@ impl FileHandle for std::fs::File {
+@@ -484,6 +487,11 @@ impl FileHandle for std::fs::File {
Ok(path)
}
@@ -33,7 +33,7 @@
#[cfg(target_os = "windows")]
fn current_path(&self, _: &Arc<dyn Fs>) -> Result<PathBuf> {
use std::ffi::OsString;
-@@ -572,7 +580,7 @@ impl RealFs {
+@@ -575,7 +583,7 @@ impl RealFs {
}
}
@@ -42,7 +42,7 @@
fn rename_without_replace(source: &Path, target: &Path) -> io::Result<()> {
let source = path_to_c_string(source)?;
let target = path_to_c_string(target)?;
-@@ -592,6 +600,27 @@ fn rename_without_replace(source: &Path, target: &Path
+@@ -595,6 +603,27 @@ fn rename_without_replace(source: &Path, target: &Path
)
};
@@ -70,7 +70,7 @@
if result == 0 {
Ok(())
} else {
-@@ -619,7 +648,7 @@ fn rename_without_replace(source: &Path, target: &Path
+@@ -622,7 +651,7 @@ fn rename_without_replace(source: &Path, target: &Path
.map_err(|_| io::Error::last_os_error())
}
@@ -79,7 +79,7 @@
fn path_to_c_string(path: &Path) -> io::Result<CString> {
CString::new(path.as_os_str().as_bytes()).map_err(|_| {
io::Error::new(
-@@ -723,7 +752,12 @@ impl Fs for RealFs {
+@@ -779,7 +808,12 @@ impl Fs for RealFs {
}
let use_metadata_fallback = {
@@ -93,7 +93,7 @@
{
let source = source.to_path_buf();
let target = target.to_path_buf();
-@@ -756,7 +790,12 @@ impl Fs for RealFs {
+@@ -812,7 +846,12 @@ impl Fs for RealFs {
}
}
diff --git a/editors/zed/files/patch-crates_gpui_src_platform.rs b/editors/zed/files/patch-crates_gpui_src_platform.rs
index e6581babb50e..5590028ee217 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-07-29 14:43:24 UTC
+--- crates/gpui/src/platform.rs.orig 2026-08-05 15:24:27 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;
-@@ -878,7 +878,7 @@ pub trait PlatformWindow: HasWindowHandle + HasDisplay
+@@ -888,7 +888,7 @@ pub trait PlatformWindow: HasWindowHandle + HasDisplay
fn start_window_move(&self) {}
fn start_window_resize(&self, _edge: ResizeEdge) {}
fn set_exclusive_zone(&self, _zone: Pixels) {}
@@ -27,7 +27,7 @@
fn set_exclusive_edge(&self, _edge: layer_shell::Anchor) {}
fn set_input_region(&self, _region: Option<&[Bounds<Pixels>]>) {}
fn window_decorations(&self) -> Decorations {
-@@ -1976,7 +1976,7 @@ pub enum WindowKind {
+@@ -2007,7 +2007,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_gpui_src_window.rs b/editors/zed/files/patch-crates_gpui_src_window.rs
index 310ecebc55e3..a6c20c7a945f 100644
--- a/editors/zed/files/patch-crates_gpui_src_window.rs
+++ b/editors/zed/files/patch-crates_gpui_src_window.rs
@@ -1,6 +1,6 @@
---- crates/gpui/src/window.rs.orig 2026-07-29 14:43:24 UTC
+--- crates/gpui/src/window.rs.orig 2026-08-05 15:24:27 UTC
+++ crates/gpui/src/window.rs
-@@ -2123,7 +2123,7 @@ impl Window {
+@@ -2135,7 +2135,7 @@ impl Window {
/// This is only needed to disambiguate a corner-anchored surface; otherwise the
/// edge is deduced from the anchor. The edge must be a single edge the surface
/// is anchored to, or it is ignored. (Wayland layer-shell windows only)
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 2ba8f1243b56..d6473b89fa11 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,6 @@
---- crates/project/tests/integration/project_tests.rs.orig 2026-07-29 14:43:24 UTC
+--- crates/project/tests/integration/project_tests.rs.orig 2026-08-05 15:24:27 UTC
+++ crates/project/tests/integration/project_tests.rs
-@@ -67,7 +67,7 @@ use settings::{GlobalLspSettingsContent, SettingsStore
+@@ -68,7 +68,7 @@ use settings::{GlobalLspSettingsContent, SettingsStore
use rand::{Rng as _, rngs::StdRng};
use serde_json::json;
use settings::{GlobalLspSettingsContent, SettingsStore};
@@ -9,7 +9,7 @@
use settings::{LocalSettingsKind, LocalSettingsPath};
#[cfg(not(windows))]
use std::os;
-@@ -6763,7 +6763,7 @@ async fn test_rescan_and_remote_updates(cx: &mut gpui:
+@@ -6575,7 +6575,7 @@ async fn test_rescan_and_remote_updates(cx: &mut gpui:
});
}
@@ -18,7 +18,7 @@
#[gpui::test(retries = 5)]
async fn test_recreated_directory_receives_child_events(cx: &mut gpui::TestAppContext) {
init_test(cx);
-@@ -12821,7 +12821,7 @@ async fn test_git_repository_status_removes_directory_
+@@ -12633,7 +12633,7 @@ async fn test_git_repository_status_removes_directory_
});
}
@@ -27,7 +27,7 @@
#[gpui::test(retries = 5)]
async fn test_git_events_after_project_excludes_dot_git(cx: &mut gpui::TestAppContext) {
init_test(cx);
-@@ -15528,7 +15528,7 @@ fn git_reset(offset: usize, work_dir: &Path) {
+@@ -15419,7 +15419,7 @@ fn git_reset(offset: usize, work_dir: &Path) {
);
}
@@ -36,7 +36,7 @@
#[allow(clippy::disallowed_methods)]
#[track_caller]
fn git_branch(name: &str, work_dir: &Path) {
-@@ -15543,7 +15543,7 @@ fn git_branch(name: &str, work_dir: &Path) {
+@@ -15434,7 +15434,7 @@ fn git_branch(name: &str, work_dir: &Path) {
);
}
diff --git a/editors/zed/files/patch-crates_zed_src_zed.rs b/editors/zed/files/patch-crates_zed_src_zed.rs
index 63ca942b2ef6..4773012f5489 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-07-29 14:43:24 UTC
+--- crates/zed/src/zed.rs.orig 2026-08-05 15:24:27 UTC
+++ crates/zed/src/zed.rs
@@ -112,8 +112,10 @@ const MERCH_URL: &str = "https://merch.zed.dev/";
const STATUS_URL: &str = "https://status.zed.dev";
@@ -11,7 +11,7 @@
impl gpui::Global for CrashHandler {}
actions!(
-@@ -573,6 +575,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>,
+@@ -574,6 +576,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);