okooooooo/pebrel
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(windows): pin GPUI color emoji enumeration fix

Browse Source
This commit is contained in:
WilliamWang1721 committed 2026-09-27 17:30:27 +08:00
1 parent 7b0cedb5f9
commit cd8bf1fe0e
2 files changed
+28 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Cargo.lock
Generated
+22 -22
View File
@@ -1403,7 +1403,7 @@ dependencies = [
[[package]] [[package]]
name = "collections" name = "collections"
version = "0.1.0" 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 = [ dependencies = [
"gpui_util", "gpui_util",
"indexmap", "indexmap",
@@ -2013,7 +2013,7 @@ dependencies = [
[[package]] [[package]]
name = "derive_refineable" name = "derive_refineable"
version = "0.1.0" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -3105,7 +3105,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui" name = "gpui"
version = "0.2.2" 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 = [ dependencies = [
"accesskit", "accesskit",
"anyhow", "anyhow",
@@ -3298,7 +3298,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_linux" name = "gpui_linux"
version = "0.1.0" 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 = [ dependencies = [
"accesskit", "accesskit",
"accesskit_unix", "accesskit_unix",
@@ -3350,7 +3350,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_macos" name = "gpui_macos"
version = "0.1.0" 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 = [ dependencies = [
"accesskit", "accesskit",
"accesskit_macos", "accesskit_macos",
@@ -3399,7 +3399,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_macros" name = "gpui_macros"
version = "0.1.0" 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 = [ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"proc-macro2", "proc-macro2",
@@ -3410,7 +3410,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_platform" name = "gpui_platform"
version = "0.1.0" 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 = [ dependencies = [
"console_error_panic_hook", "console_error_panic_hook",
"gpui", "gpui",
@@ -3423,7 +3423,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_shared_string" name = "gpui_shared_string"
version = "0.1.0" 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 = [ dependencies = [
"schemars", "schemars",
"serde", "serde",
@@ -3433,7 +3433,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_util" name = "gpui_util"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -3443,7 +3443,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_web" name = "gpui_web"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"console_error_panic_hook", "console_error_panic_hook",
@@ -3466,7 +3466,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_wgpu" name = "gpui_wgpu"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bytemuck", "bytemuck",
@@ -3496,7 +3496,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_windows" name = "gpui_windows"
version = "0.1.0" 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 = [ dependencies = [
"accesskit", "accesskit",
"accesskit_windows", "accesskit_windows",
@@ -3792,7 +3792,7 @@ dependencies = [
[[package]] [[package]]
name = "http_client" name = "http_client"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"async-compression", "async-compression",
@@ -4754,7 +4754,7 @@ checksum = "7ebb8d8732c6a6df3d8f032a82911cfc747e00efb95cc46e8d0acd5b5b88570c"
[[package]] [[package]]
name = "media" name = "media"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bindgen", "bindgen",
@@ -6175,7 +6175,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
[[package]] [[package]]
name = "perf" name = "perf"
version = "0.1.0" 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 = [ dependencies = [
"collections", "collections",
"serde", "serde",
@@ -7074,7 +7074,7 @@ dependencies = [
[[package]] [[package]]
name = "refineable" name = "refineable"
version = "0.1.0" 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 = [ dependencies = [
"derive_refineable", "derive_refineable",
] ]
@@ -7669,7 +7669,7 @@ dependencies = [
[[package]] [[package]]
name = "scheduler" name = "scheduler"
version = "0.1.0" 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 = [ dependencies = [
"async-task", "async-task",
"backtrace", "backtrace",
@@ -8512,7 +8512,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]] [[package]]
name = "sum_tree" name = "sum_tree"
version = "0.1.0" 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 = [ dependencies = [
"heapless", "heapless",
"log", "log",
@@ -9838,7 +9838,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]] [[package]]
name = "util_macros" name = "util_macros"
version = "0.1.0" 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 = [ dependencies = [
"perf", "perf",
"quote", "quote",
@@ -11702,7 +11702,7 @@ dependencies = [
[[package]] [[package]]
name = "zlog" name = "zlog"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@@ -11719,7 +11719,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
[[package]] [[package]]
name = "ztracing" name = "ztracing"
version = "0.1.0" 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 = [ dependencies = [
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
@@ -11730,7 +11730,7 @@ dependencies = [
[[package]] [[package]]
name = "ztracing_macro" name = "ztracing_macro"
version = "0.1.0" 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]] [[package]]
name = "zune-core" name = "zune-core"
Cargo.toml
+6 -3
View File
@@ -70,7 +70,7 @@ toml_edit = "0.24.0"
# GPUI v1.16.1 把平台启动入口拆到独立 crate。它必须与 `gpui` 使用完全相同 # GPUI v1.16.1 把平台启动入口拆到独立 crate。它必须与 `gpui` 使用完全相同
# 的 Git URL 和 rev，否则 Cargo 会把同名类型解析成两套互不兼容的 crate。 # 的 Git URL 和 rev，否则 Cargo 会把同名类型解析成两套互不兼容的 crate。
# Without font-kit, the macOS platform uses NoopTextSystem and renders no text. # 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. # TODO: Drop this pin and return to the crates.io release once the fix ships there.
[patch.crates-io] [patch.crates-io]
@@ -182,8 +182,11 @@ winit = { path = "third_party/winit-0.30.13" }
# tests/root_test_window.rs 验证以依赖方式编译的 Root 可使用虚拟窗口； # tests/root_test_window.rs 验证以依赖方式编译的 Root 可使用虚拟窗口；
# 上游提供等价的下游 headless 测试支持后撤销本补丁。 # 上游提供等价的下游 headless 测试支持后撤销本补丁。
# #
# 当前精确引用包含补丁 1-3、6 及字体内存修补；Input 补丁 4-5 仍保持独立。 # 当前精确引用包含补丁 1-3、6、字体内存修补及 Windows 彩色 emoji 枚举修复。
gpui = { git = "https://github.com/Kuddev/zed", rev = "7c662384cd77c1d1e1566206920e3a420ea6767b", version = "=0.2.2" } # 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 # 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 # 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. # consumes MouseUp or the platform reports the next move without a held button.