diff options
author | Magnus Larsen <golgothasTerror101@gmail.com> | 2024-05-02 16:21:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-02 16:21:07 +0000 |
commit | 9acf2182cd440d4080bb0eb2a2fbc7238d71e953 (patch) | |
tree | af88b6ac8fb66d07f3598394d49e57da342c6f63 /components | |
parent | 556bfb7dff48f64e9e02872dba29fbdabc8c6ad0 (diff) | |
download | servo-9acf2182cd440d4080bb0eb2a2fbc7238d71e953.tar.gz servo-9acf2182cd440d4080bb0eb2a2fbc7238d71e953.zip |
servoshell: Upgrade `egui` and many other dependencies (#31278)
* servoshell: Upgrade `egui` and many other dependencies
This upgrades:
- `core-graphics`
- `core-text`
- `egui` and friends
- `font-kit`
- `glow` and friends
- `harfbuzz-sys`
- `jni`
- `nix`
- `raqote`
- `raw-window-handle`
- `winit`
* Downgrade jni until we can properly upgrade
* Update some test results
It's unclear why these are now passing, but they are.
---------
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components')
-rw-r--r-- | components/background_hang_monitor/Cargo.toml | 2 | ||||
-rw-r--r-- | components/canvas/Cargo.toml | 4 | ||||
-rw-r--r-- | components/gfx/Cargo.toml | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml index 67eafb0dc02..2e0a4630c98 100644 --- a/components/background_hang_monitor/Cargo.toml +++ b/components/background_hang_monitor/Cargo.toml @@ -28,5 +28,5 @@ lazy_static = { workspace = true } mach2 = "0.4" [target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies] -nix = "0.25" +nix = { version = "0.27", features = ["signal"] } unwind-sys = "0.1.4" diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index ce420ae0c01..46c78b8ea08 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -22,7 +22,7 @@ canvas_traits = { workspace = true } crossbeam-channel = { workspace = true } cssparser = { workspace = true } euclid = { workspace = true } -font-kit = "0.11" +font-kit = { version = "0.13" } fnv = { workspace = true } gfx = { path = "../gfx" } half = "2" @@ -32,7 +32,7 @@ lyon_geom = "1.0.4" num-traits = { workspace = true } pathfinder_geometry = "0.5" pixels = { path = "../pixels" } -raqote = "0.8.2" +raqote = "0.8.4" servo_arc = { workspace = true } sparkle = { workspace = true } style = { workspace = true } diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index bec2264c44c..06982af6aee 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -22,7 +22,7 @@ euclid = { workspace = true } fnv = { workspace = true } fontsan = { git = "https://github.com/servo/fontsan" } gfx_traits = { workspace = true } -harfbuzz-sys = "0.5" +harfbuzz-sys = "0.6" ipc-channel = { workspace = true } lazy_static = { workspace = true } libc = { workspace = true } @@ -47,19 +47,21 @@ xi-unicode = { workspace = true } [target.'cfg(target_os = "macos")'.dependencies] byteorder = { workspace = true } core-foundation = "0.9" -core-graphics = "0.22" -core-text = "19.0" +core-graphics = "0.23" +core-text = "20.1" [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] +harfbuzz-sys = { version = "0.6", features = ["bundled"] } freetype = "0.7" servo_allocator = { path = "../allocator" } [target.'cfg(target_os = "linux")'.dependencies] -fontconfig_sys = { package = "yeslogic-fontconfig-sys", version = "3" } +fontconfig_sys = { package = "yeslogic-fontconfig-sys", version = "5" } [target.'cfg(target_os = "android")'.dependencies] xml-rs = "0.8" [target.'cfg(target_os = "windows")'.dependencies] +harfbuzz-sys = { version = "0.6", features = ["bundled"] } dwrote = "0.11" truetype = { version = "0.47.3", features = ["ignore-invalid-language-ids"] } |