From cd8bf1fe0ec6b5250774d8f74b736340b6e0bb4b Mon Sep 17 00:00:00 2001 From: WilliamWang1721 <140129782+WilliamWang1721@users.noreply.github.com> Date: Sun, 27 Sep 2026 17:30:27 +0800 Subject: [PATCH] fix(windows): pin GPUI color emoji enumeration fix --- Cargo.lock | 44 ++++++++++++++++++++++---------------------- Cargo.toml | 9 ++++++--- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b29c151..69e2edf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1403,7 +1403,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "gpui_util", "indexmap", @@ -2013,7 +2013,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "proc-macro2", "quote", @@ -3105,7 +3105,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "accesskit", "anyhow", @@ -3298,7 +3298,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "accesskit", "accesskit_unix", @@ -3350,7 +3350,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "accesskit", "accesskit_macos", @@ -3399,7 +3399,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3410,7 +3410,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "console_error_panic_hook", "gpui", @@ -3423,7 +3423,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "schemars", "serde", @@ -3433,7 +3433,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "anyhow", "log", @@ -3443,7 +3443,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "anyhow", "console_error_panic_hook", @@ -3466,7 +3466,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "anyhow", "bytemuck", @@ -3496,7 +3496,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "accesskit", "accesskit_windows", @@ -3792,7 +3792,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "anyhow", "async-compression", @@ -4754,7 +4754,7 @@ checksum = "7ebb8d8732c6a6df3d8f032a82911cfc747e00efb95cc46e8d0acd5b5b88570c" [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "anyhow", "bindgen", @@ -6175,7 +6175,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "collections", "serde", @@ -7074,7 +7074,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "derive_refineable", ] @@ -7669,7 +7669,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "async-task", "backtrace", @@ -8512,7 +8512,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "heapless", "log", @@ -9838,7 +9838,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "perf", "quote", @@ -11702,7 +11702,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "anyhow", "chrono", @@ -11719,7 +11719,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" dependencies = [ "tracing", "tracing-subscriber", @@ -11730,7 +11730,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/Kuddev/zed?rev=7c662384cd77c1d1e1566206920e3a420ea6767b#7c662384cd77c1d1e1566206920e3a420ea6767b" +source = "git+https://github.com/Kuddev/zed?rev=2b0d6d1948e374dc7a1263a27661df1409ae24c1#2b0d6d1948e374dc7a1263a27661df1409ae24c1" [[package]] name = "zune-core" diff --git a/Cargo.toml b/Cargo.toml index 51a904a..1cdd735 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ toml_edit = "0.24.0" # GPUI v1.16.1 把平台启动入口拆到独立 crate。它必须与 `gpui` 使用完全相同 # 的 Git URL 和 rev，否则 Cargo 会把同名类型解析成两套互不兼容的 crate。 # Without font-kit, the macOS platform uses NoopTextSystem and renders no text. -gpui_platform = { git = "https://github.com/Kuddev/zed", rev = "7c662384cd77c1d1e1566206920e3a420ea6767b", version = "=0.1.0", features = ["font-kit"] } +gpui_platform = { git = "https://github.com/Kuddev/zed", rev = "2b0d6d1948e374dc7a1263a27661df1409ae24c1", version = "=0.1.0", features = ["font-kit"] } # TODO: Drop this pin and return to the crates.io release once the fix ships there. [patch.crates-io] @@ -182,8 +182,11 @@ winit = { path = "third_party/winit-0.30.13" } # tests/root_test_window.rs 验证以依赖方式编译的 Root 可使用虚拟窗口； # 上游提供等价的下游 headless 测试支持后撤销本补丁。 # -# 当前精确引用包含补丁 1-3、6 及字体内存修补；Input 补丁 4-5 仍保持独立。 -gpui = { git = "https://github.com/Kuddev/zed", rev = "7c662384cd77c1d1e1566206920e3a420ea6767b", version = "=0.2.2" } +# 当前精确引用包含补丁 1-3、6、字体内存修补及 Windows 彩色 emoji 枚举修复。 +# DirectWrite 必须先 MoveNext 再 GetCurrentRun，否则回退为黑色字形（issue #317）。 +# 修复来源：WilliamWang1721/zed codex/issue-317-color-emoji；维护分支吸收后改回其固定点。 +# Input 补丁 4-5 仍保持独立。 +gpui = { git = "https://github.com/Kuddev/zed", rev = "2b0d6d1948e374dc7a1263a27661df1409ae24c1", version = "=0.2.2" } # Native inputs share rendered text's device-pixel line height and expose a # post-paint point lookup. Window selection ends on release even when a child # consumes MouseUp or the platform reports the next move without a held button.