From 88a745179d9c32190593913a7fffbaac36d5df2e Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 4 Feb 2023 11:24:38 +0100 Subject: [PATCH 1/7] Remove native screen reader support Use the "accesskit" feature flag to `eframe` instead. [AccessKit](https://github.com/AccessKit/accesskit) is the future. `tts` was a mess to compile on many platforms, so I no longer want the native `tts` dependency. --- crates/eframe/Cargo.toml | 6 ++- crates/egui-winit/Cargo.toml | 6 --- crates/egui-winit/src/lib.rs | 8 ---- crates/egui-winit/src/screen_reader.rs | 49 ----------------------- crates/egui/src/memory.rs | 10 ++++- crates/egui_demo_app/Cargo.toml | 2 +- crates/egui_demo_app/src/backend_panel.rs | 2 + crates/egui_glium/Cargo.toml | 3 -- crates/egui_glow/Cargo.toml | 3 -- 9 files changed, 15 insertions(+), 74 deletions(-) delete mode 100644 crates/egui-winit/src/screen_reader.rs diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index f26a5b1ce8c..d870f2f19c8 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -55,8 +55,10 @@ persistence = [ ## `eframe` will call `puffin::GlobalProfiler::lock().new_frame()` for you puffin = ["dep:puffin", "egui_glow?/puffin", "egui-wgpu?/puffin"] -## Enable screen reader support (requires `ctx.options_mut(|o| o.screen_reader = true);`) -screen_reader = ["egui-winit/screen_reader", "tts"] +## Enable screen reader support (requires `ctx.options_mut(|o| o.screen_reader = true);`) on web. +## +## For other platforms, use the "accesskit" feature instead. +web_screen_reader = ["tts"] ## If set, eframe will look for the env-var `EFRAME_SCREENSHOT_TO` and write a screenshot to that location, and then quit. ## This is used to generate images for the examples. diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml index 64c9ec7d0b5..754f4883c55 100644 --- a/crates/egui-winit/Cargo.toml +++ b/crates/egui-winit/Cargo.toml @@ -37,9 +37,6 @@ links = ["webbrowser"] ## Enable profiling with the [`puffin`](https://docs.rs/puffin) crate. puffin = ["dep:puffin"] -## Experimental support for a screen reader. -screen_reader = ["tts"] - ## Allow serialization of [`WindowSettings`] using [`serde`](https://docs.rs/serde). serde = ["egui/serde", "dep:serde"] @@ -67,9 +64,6 @@ accesskit_winit = { version = "0.8.1", optional = true } puffin = { version = "0.14", optional = true } serde = { version = "1.0", optional = true, features = ["derive"] } -# feature screen_reader -tts = { version = "0.24", optional = true } - webbrowser = { version = "0.8.3", optional = true } [target.'cfg(any(target_os="linux", target_os="dragonfly", target_os="freebsd", target_os="netbsd", target_os="openbsd"))'.dependencies] diff --git a/crates/egui-winit/src/lib.rs b/crates/egui-winit/src/lib.rs index 07c5766e254..4eaffad52d0 100644 --- a/crates/egui-winit/src/lib.rs +++ b/crates/egui-winit/src/lib.rs @@ -19,7 +19,6 @@ use egui::accesskit; pub use winit; pub mod clipboard; -pub mod screen_reader; mod window_settings; pub use window_settings::WindowSettings; @@ -75,7 +74,6 @@ pub struct State { current_pixels_per_point: f32, clipboard: clipboard::Clipboard, - screen_reader: screen_reader::ScreenReader, /// If `true`, mouse inputs will be treated as touches. /// Useful for debugging touch support in egui. @@ -115,7 +113,6 @@ impl State { current_pixels_per_point: 1.0, clipboard: clipboard::Clipboard::new(wayland_display), - screen_reader: screen_reader::ScreenReader::default(), simulate_touch_screen: false, pointer_touch_id: None, @@ -615,11 +612,6 @@ impl State { egui_ctx: &egui::Context, platform_output: egui::PlatformOutput, ) { - if egui_ctx.options(|o| o.screen_reader) { - self.screen_reader - .speak(&platform_output.events_description()); - } - let egui::PlatformOutput { cursor_icon, open_url, diff --git a/crates/egui-winit/src/screen_reader.rs b/crates/egui-winit/src/screen_reader.rs deleted file mode 100644 index 058407b740c..00000000000 --- a/crates/egui-winit/src/screen_reader.rs +++ /dev/null @@ -1,49 +0,0 @@ -pub struct ScreenReader { - #[cfg(feature = "tts")] - tts: Option, -} - -#[cfg(not(feature = "tts"))] -#[allow(clippy::derivable_impls)] // False positive -impl Default for ScreenReader { - fn default() -> Self { - Self {} - } -} - -#[cfg(feature = "tts")] -impl Default for ScreenReader { - fn default() -> Self { - let tts = match tts::Tts::default() { - Ok(screen_reader) => { - tracing::debug!("Initialized screen reader."); - Some(screen_reader) - } - Err(err) => { - tracing::warn!("Failed to load screen reader: {}", err); - None - } - }; - Self { tts } - } -} - -impl ScreenReader { - #[cfg(not(feature = "tts"))] - #[allow(clippy::unused_self)] - pub fn speak(&mut self, _text: &str) {} - - #[cfg(feature = "tts")] - pub fn speak(&mut self, text: &str) { - if text.is_empty() { - return; - } - if let Some(tts) = &mut self.tts { - tracing::debug!("Speaking: {:?}", text); - let interrupt = true; - if let Err(err) = tts.speak(text, interrupt) { - tracing::warn!("Failed to read: {}", err); - } - } - } -} diff --git a/crates/egui/src/memory.rs b/crates/egui/src/memory.rs index 749ee6ca585..c4299ed8338 100644 --- a/crates/egui/src/memory.rs +++ b/crates/egui/src/memory.rs @@ -103,9 +103,15 @@ pub struct Options { /// Controls the tessellator. pub tessellation_options: epaint::TessellationOptions, - /// This does not at all change the behavior of egui, - /// but is a signal to any backend that we want the [`crate::PlatformOutput::events`] read out loud. + /// This is a signal to any backend that we want the [`crate::PlatformOutput::events`] read out loud. + /// + /// The only change to egui is that labels can be focused by pressing tab. + /// /// Screen readers is an experimental feature of egui, and not supported on all platforms. + /// + /// `eframe` supports it only on web, using the `web_screen_reader` feature flag, + /// but you should consider using [AccessKit](https://github.com/AccessKit/accesskit) instead, + /// which `eframe` supports. pub screen_reader: bool, /// If true, the most common glyphs (ASCII) are pre-rendered to the texture atlas. diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml index 529a572d8ad..b1b9461297f 100644 --- a/crates/egui_demo_app/Cargo.toml +++ b/crates/egui_demo_app/Cargo.toml @@ -20,7 +20,7 @@ default = ["glow", "persistence"] http = ["ehttp", "image", "poll-promise", "egui_extras/image"] persistence = ["eframe/persistence", "egui/persistence", "serde"] -screen_reader = ["eframe/screen_reader"] # experimental +web_screen_reader = ["eframe/web_screen_reader"] # experimental serde = ["dep:serde", "egui_demo_lib/serde", "egui/serde"] syntax_highlighting = ["egui_demo_lib/syntax_highlighting"] diff --git a/crates/egui_demo_app/src/backend_panel.rs b/crates/egui_demo_app/src/backend_panel.rs index 65bb1030104..d71538cf296 100644 --- a/crates/egui_demo_app/src/backend_panel.rs +++ b/crates/egui_demo_app/src/backend_panel.rs @@ -130,6 +130,8 @@ impl BackendPanel { ui.separator(); + #[cfg(target_arch = "wasm32")] + #[cfg(feature = "web_screen-reader")] { let mut screen_reader = ui.ctx().options(|o| o.screen_reader); ui.checkbox(&mut screen_reader, "🔈 Screen reader").on_hover_text("Experimental feature: checking this will turn on the screen reader on supported platforms"); diff --git a/crates/egui_glium/Cargo.toml b/crates/egui_glium/Cargo.toml index 46e18496c99..e31a6c75826 100644 --- a/crates/egui_glium/Cargo.toml +++ b/crates/egui_glium/Cargo.toml @@ -35,9 +35,6 @@ clipboard = ["egui-winit/clipboard"] ## Enable opening links in a browser when an egui hyperlink is clicked. links = ["egui-winit/links"] -## Experimental support for a screen reader. -screen_reader = ["egui-winit/screen_reader"] - [dependencies] egui = { version = "0.20.0", path = "../egui", default-features = false, features = [ diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml index 22e12c09708..cd0244c1368 100644 --- a/crates/egui_glow/Cargo.toml +++ b/crates/egui_glow/Cargo.toml @@ -37,9 +37,6 @@ clipboard = ["egui-winit?/clipboard"] ## enable opening links in a browser when an egui hyperlink is clicked. links = ["egui-winit?/links"] -## Experimental support for a screen reader. -screen_reader = ["egui-winit?/screen_reader"] - ## Enable profiling with the [`puffin`](https://docs.rs/puffin) crate. puffin = ["dep:puffin", "egui-winit?/puffin"] From cd460049d6cc6270fec05f7db9655b327ad434fc Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 4 Feb 2023 11:25:45 +0100 Subject: [PATCH 2/7] Update tts to 0.25 --- Cargo.lock | 125 +++++++-------------------------------- crates/eframe/Cargo.toml | 2 +- 2 files changed, 22 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a6ddc72db4..4d4532d1fb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1255,17 +1255,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" -[[package]] -name = "displaydoc" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "dlib" version = "0.5.0" @@ -1432,7 +1421,6 @@ dependencies = [ "serde", "smithay-clipboard", "tracing", - "tts", "webbrowser", "winit", ] @@ -2291,20 +2279,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - [[package]] name = "jni" version = "0.20.0" @@ -2573,19 +2547,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys 0.3.0", - "num_enum", - "thiserror", -] - [[package]] name = "ndk" version = "0.7.0" @@ -2594,7 +2555,7 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ "bitflags", "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", + "ndk-sys", "num_enum", "raw-window-handle 0.5.0", "thiserror", @@ -2606,21 +2567,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk 0.6.0", - "ndk-context", - "ndk-macro", - "ndk-sys 0.3.0", -] - [[package]] name = "ndk-glue" version = "0.7.0" @@ -2629,10 +2575,10 @@ checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" dependencies = [ "libc", "log", - "ndk 0.7.0", + "ndk", "ndk-context", "ndk-macro", - "ndk-sys 0.4.1+23.1.7779620", + "ndk-sys", "once_cell", "parking_lot", ] @@ -2650,15 +2596,6 @@ dependencies = [ "syn", ] -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - [[package]] name = "ndk-sys" version = "0.4.1+23.1.7779620" @@ -2899,6 +2836,12 @@ dependencies = [ "ttf-parser 0.17.1", ] +[[package]] +name = "oxilangtag" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d91edf4fbb970279443471345a4e8c491bf05bb283b3e6c88e4e606fd8c181b" + [[package]] name = "pango-sys" version = "0.15.10" @@ -3649,9 +3592,9 @@ dependencies = [ [[package]] name = "speech-dispatcher" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d62720b035474bccfd208cb85b1772adfae4b3450c743853e2e7b9c67e441e" +checksum = "5727d53c474ba5ada07784ad7d203cf896a74854cfee0eb32376b00759eb2972" dependencies = [ "lazy_static", "libc", @@ -3937,15 +3880,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "tinystr" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2" -dependencies = [ - "displaydoc", -] - [[package]] name = "tinytemplate" version = "1.2.1" @@ -4063,25 +3997,26 @@ checksum = "375812fa44dab6df41c195cd2f7fecb488f6c09fbaafb62807488cefab642bff" [[package]] name = "tts" -version = "0.24.3" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810084d246c730f3cadc70fb74ceb4d1abf84d8bcdb7dc81e55ac808992da2c8" +checksum = "b7d2f3540357cbcd1d3f16aefc6357ba2fb3960591d1468eb951c9021f854338" dependencies = [ "cocoa-foundation", "core-foundation", "dyn-clonable", - "jni 0.19.0", + "jni", "lazy_static", "libc", "log", - "ndk-glue 0.6.2", + "ndk-context", + "ndk-glue", "objc", + "oxilangtag", "speech-dispatcher", "thiserror", - "unic-langid", "wasm-bindgen", "web-sys", - "windows 0.42.0", + "windows 0.43.0", ] [[package]] @@ -4119,24 +4054,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "unic-langid" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" -dependencies = [ - "tinystr", -] - [[package]] name = "unicode-bidi" version = "0.3.8" @@ -4489,7 +4406,7 @@ checksum = "769f1a8831de12cad7bd6f9693b15b1432d93a151557810f617f626af823acae" dependencies = [ "core-foundation", "dirs", - "jni 0.20.0", + "jni", "log", "ndk-context", "objc", @@ -4889,8 +4806,8 @@ dependencies = [ "libc", "log", "mio", - "ndk 0.7.0", - "ndk-glue 0.7.0", + "ndk", + "ndk-glue", "objc", "once_cell", "parking_lot", diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index d870f2f19c8..bb047864c66 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -173,5 +173,5 @@ web-sys = { version = "0.3.58", features = [ # optional web: egui-wgpu = { version = "0.20.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit -tts = { version = "0.24", optional = true } +tts = { version = "0.25", optional = true, default-features = false } wgpu = { version = "0.15.0", optional = true, features = ["webgl"] } From 73a5a3eb4f5bc021bc16ff52d6fba7e2a885bf85 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 4 Feb 2023 11:28:38 +0100 Subject: [PATCH 3/7] Update changelogs --- crates/eframe/CHANGELOG.md | 3 ++- crates/egui-winit/CHANGELOG.md | 1 + crates/egui_glium/CHANGELOG.md | 1 + crates/egui_glow/CHANGELOG.md | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/eframe/CHANGELOG.md b/crates/eframe/CHANGELOG.md index 9dfbb6fc728..1c8201c5d38 100644 --- a/crates/eframe/CHANGELOG.md +++ b/crates/eframe/CHANGELOG.md @@ -5,7 +5,8 @@ NOTE: [`egui-winit`](../egui-winit/CHANGELOG.md), [`egui_glium`](../egui_glium/C ## Unreleased -* ⚠️ BREAKING: `App::clear_color` now expects you to return a raw float array ([#2666](https://github.com/emilk/egui/pull/2666)): +* ⚠️ BREAKING: `App::clear_color` now expects you to return a raw float array ([#2666](https://github.com/emilk/egui/pull/2666)). +* The `screen_reader` feature has now been renamed `web_screen_reader` and only work on web. On other platforms, use the `accesskit` feature flag instead ([#2669](https://github.com/emilk/egui/pull/2669)). #### Desktop/Native: * `eframe::run_native` now returns a `Result` ([#2433](https://github.com/emilk/egui/pull/2433)). diff --git a/crates/egui-winit/CHANGELOG.md b/crates/egui-winit/CHANGELOG.md index c9bada00509..803688fc3c0 100644 --- a/crates/egui-winit/CHANGELOG.md +++ b/crates/egui-winit/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to the `egui-winit` integration will be noted in this file. ## Unreleased +* Remove the `screen_reader` feature. Use the `accesskit` feature flag instead ([#2669](https://github.com/emilk/egui/pull/2669)). ## 0.20.1 - 2022-12-11 diff --git a/crates/egui_glium/CHANGELOG.md b/crates/egui_glium/CHANGELOG.md index e1db208b0e3..5e27204e736 100644 --- a/crates/egui_glium/CHANGELOG.md +++ b/crates/egui_glium/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to the `egui_glium` integration will be noted in this file. ## Unreleased +* Remove the `screen_reader` feature ([#2669](https://github.com/emilk/egui/pull/2669)). ## 0.20.1 - 2022-12-11 diff --git a/crates/egui_glow/CHANGELOG.md b/crates/egui_glow/CHANGELOG.md index 975aa13f098..7b7d7182018 100644 --- a/crates/egui_glow/CHANGELOG.md +++ b/crates/egui_glow/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to the `egui_glow` integration will be noted in this file. ## Unreleased +* Remove the `screen_reader` feature ([#2669](https://github.com/emilk/egui/pull/2669)). ## 0.20.1 - 2022-12-11 From 953cd6f1d39de630544c7433589c604ce004b00f Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 4 Feb 2023 11:29:51 +0100 Subject: [PATCH 4/7] Turn on all feature flags for package.metadata.docs.rs --- crates/eframe/Cargo.toml | 4 +--- crates/egui-winit/Cargo.toml | 3 +-- crates/egui_glium/Cargo.toml | 3 +-- crates/egui_glow/Cargo.toml | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index bb047864c66..54d9b1ee3a9 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -14,9 +14,7 @@ keywords = ["egui", "gui", "gamedev"] include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] [package.metadata.docs.rs] -# Avoid speech-dispatcher dependencies - see https://docs.rs/crate/eframe/0.20.0/builds/695200 -no-default-features = true -features = ["document-features", "glow", "wgpu", "persistence", "wgpu"] +all-features = true targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"] [lib] diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml index 754f4883c55..1a55250d7a0 100644 --- a/crates/egui-winit/Cargo.toml +++ b/crates/egui-winit/Cargo.toml @@ -14,8 +14,7 @@ keywords = ["winit", "egui", "gui", "gamedev"] include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] [package.metadata.docs.rs] -# Avoid speech-dispatcher dependencies - see https://docs.rs/crate/egui-winit/0.20.0/builds/695196 -features = ["document-features"] +all-features = true [features] diff --git a/crates/egui_glium/Cargo.toml b/crates/egui_glium/Cargo.toml index e31a6c75826..279618d7340 100644 --- a/crates/egui_glium/Cargo.toml +++ b/crates/egui_glium/Cargo.toml @@ -20,8 +20,7 @@ include = [ ] [package.metadata.docs.rs] -# Avoid speech-dispatcher dependencies - see https://docs.rs/crate/egui_glium/0.20.0/builds/695197 -features = ["document-features"] +all-features = true [features] diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml index cd0244c1368..f8ae3656c0d 100644 --- a/crates/egui_glow/Cargo.toml +++ b/crates/egui_glow/Cargo.toml @@ -20,8 +20,7 @@ include = [ ] [package.metadata.docs.rs] -# Avoid speech-dispatcher dependencies - see https://docs.rs/crate/egui_glow/0.20.0/builds/695194 -features = ["document-features"] +all-features = true [features] From 1aa13e2285355074a01849d2890b39f8931fc6fc Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 4 Feb 2023 11:31:20 +0100 Subject: [PATCH 5/7] remove tts from deny.toml skip-tree --- deny.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/deny.toml b/deny.toml index d0ca868b9c1..0d44ef9786e 100644 --- a/deny.toml +++ b/deny.toml @@ -43,7 +43,6 @@ skip-tree = [ { name = "criterion" }, # dev-dependency { name = "rfd" }, # example dependency { name = "three-d" }, # example dependency - { name = "tts" }, # we are migrating away from tts to accesskit ] From 00be15f2c544f097b758b1b2f3f231345eb73595 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 4 Feb 2023 11:34:34 +0100 Subject: [PATCH 6/7] Update web build scripts --- sh/build_demo_web.sh | 2 +- sh/wasm_bindgen_check.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sh/build_demo_web.sh b/sh/build_demo_web.sh index af54906ae72..8e26751d9ad 100755 --- a/sh/build_demo_web.sh +++ b/sh/build_demo_web.sh @@ -5,7 +5,7 @@ cd "$script_path/.." CRATE_NAME="egui_demo_app" # NOTE: persistence use up about 400kB (10%) of the WASM! -FEATURES="glow,http,persistence,screen_reader" +FEATURES="glow,http,persistence,web_screen_reader" OPEN=false OPTIMIZE=false diff --git a/sh/wasm_bindgen_check.sh b/sh/wasm_bindgen_check.sh index 9cf9108d939..9e3ba0af968 100755 --- a/sh/wasm_bindgen_check.sh +++ b/sh/wasm_bindgen_check.sh @@ -12,7 +12,7 @@ else fi CRATE_NAME="egui_demo_app" -FEATURES="glow,http,persistence,screen_reader" +FEATURES="glow,http,persistence,web_screen_reader" # This is required to enable the web_sys clipboard API which eframe web uses # https://rustwasm.github.io/wasm-bindgen/api/web_sys/struct.Clipboard.html From f3a0e94064ef3f76125e596d1e3abb1c4353c987 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 4 Feb 2023 11:36:23 +0100 Subject: [PATCH 7/7] Update deny.toml --- deny.toml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/deny.toml b/deny.toml index 0d44ef9786e..b9147a2724b 100644 --- a/deny.toml +++ b/deny.toml @@ -29,20 +29,24 @@ deny = [ ] skip = [ - { name = "ahash" }, # old version via dark-light - { name = "arrayvec" }, # old version via tiny-skiaz - { name = "hashbrown" }, # old version via dark-light - { name = "nix" }, # old version via winit - { name = "time" }, # old version pulled in by unmaintianed crate 'chrono' - { name = "tiny-skia" }, # winit uses a different version from egui_extras (TODO(emilk): update egui_extras!) - { name = "ttf-parser" }, # different versions pulled in by ab_glyph and usvg - { name = "wayland-sys" }, # old version via winit - { name = "windows-sys" }, # old version via glutin + { name = "ahash" }, # old version via dark-light + { name = "arrayvec" }, # old version via tiny-skiaz + { name = "hashbrown" }, # old version via dark-light + { name = "nix" }, # old version via winit + { name = "time" }, # old version pulled in by unmaintianed crate 'chrono' + { name = "tiny-skia" }, # winit uses a different version from egui_extras (TODO(emilk): update egui_extras!) + { name = "ttf-parser" }, # different versions pulled in by ab_glyph and usvg + { name = "wayland-sys" }, # old version via winit + { name = "windows_x86_64_msvc" }, # old version via glutin + { name = "windows-sys" }, # old version via glutin + { name = "windows" }, # old version via accesskit ] skip-tree = [ - { name = "criterion" }, # dev-dependency - { name = "rfd" }, # example dependency - { name = "three-d" }, # example dependency + { name = "criterion" }, # dev-dependency + { name = "darling" }, # old version via tts + { name = "foreign-types" }, # old version from wgpu + { name = "rfd" }, # example dependency + { name = "three-d" }, # example dependency ]