From 7792ee0422dee0e58c65fa31b2270fbd023ef869 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Mon, 5 Apr 2021 12:10:28 +0200 Subject: [PATCH] Update tts from 0.14 -> 0.15 (screen reader feature) --- Cargo.lock | 199 +++++++++++++++++++++++++++--------------- egui_glium/Cargo.toml | 2 +- egui_web/Cargo.toml | 2 +- 3 files changed, 129 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c950657cd..b816dd11e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,6 +395,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "const-sha1" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" + [[package]] name = "copypasta" version = "0.7.1" @@ -1166,9 +1172,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "jni" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" dependencies = [ "cesu8", "combine", @@ -1407,7 +1413,19 @@ checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73" dependencies = [ "jni-sys", "ndk-sys", - "num_enum", + "num_enum 0.4.3", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" +dependencies = [ + "jni-sys", + "ndk-sys", + "num_enum 0.5.1", "thiserror", ] @@ -1420,7 +1438,21 @@ dependencies = [ "lazy_static", "libc", "log", - "ndk", + "ndk 0.2.1", + "ndk-macro", + "ndk-sys", +] + +[[package]] +name = "ndk-glue" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385" +dependencies = [ + "lazy_static", + "libc", + "log", + "ndk 0.3.0", "ndk-macro", "ndk-sys", ] @@ -1557,7 +1589,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4" dependencies = [ "derivative", - "num_enum_derive", + "num_enum_derive 0.4.3", +] + +[[package]] +name = "num_enum" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066" +dependencies = [ + "derivative", + "num_enum_derive 0.5.1", ] [[package]] @@ -1572,6 +1614,18 @@ dependencies = [ "syn", ] +[[package]] +name = "num_enum_derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "objc" version = "0.2.7" @@ -1579,6 +1633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", + "objc_exception", ] [[package]] @@ -1592,6 +1647,15 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + [[package]] name = "objc_id" version = "0.1.1" @@ -2019,12 +2083,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" - [[package]] name = "shared_library" version = "0.1.9" @@ -2108,6 +2166,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "squote" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fccf17fd09e2455ea796d2ad267b64fa2c5cbd8701b2a93b555d2aa73449f7d" + [[package]] name = "strsim" version = "0.8.0" @@ -2258,9 +2322,9 @@ checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" [[package]] name = "tts" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592f268a2431704677a2cfa2d712dd0518b99bd1630f5977423e76db1cc826d2" +checksum = "4fbbaa4d576f59b3a0dc385f2b216dc9e1ab219cfbaa1bd3b0e4c678aa6b7109" dependencies = [ "cocoa-foundation", "dyn-clonable", @@ -2268,23 +2332,13 @@ dependencies = [ "lazy_static", "libc", "log", - "ndk-glue", + "ndk-glue 0.3.0", "objc", "speech-dispatcher", "thiserror", - "tts_winrt_bindings", "wasm-bindgen", "web-sys", - "winrt", -] - -[[package]] -name = "tts_winrt_bindings" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cf13b200c067076f7a6001b3eac9a97d4fa0a322b10a2f958fd1176a1e1461" -dependencies = [ - "winrt", + "windows", ] [[package]] @@ -2628,81 +2682,82 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "winit" -version = "0.24.0" +name = "windows" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597" +checksum = "015de964f21e0b20b9744ebc6f3a3e4dfdd1788f133a4aeec09c035748f88a21" dependencies = [ - "bitflags", - "cocoa 0.24.0", - "core-foundation 0.9.1", - "core-graphics 0.22.2", - "core-video-sys", - "dispatch", - "instant", - "lazy_static", - "libc", - "log", - "mio", - "mio-extras", - "ndk", - "ndk-glue", - "ndk-sys", - "objc", - "parking_lot", - "percent-encoding", - "raw-window-handle", - "smithay-client-toolkit", - "wayland-client", - "winapi 0.3.9", - "x11-dl", + "const-sha1", + "windows_gen", + "windows_macros", ] [[package]] -name = "winrt" -version = "0.7.2" +name = "windows_gen" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf62b1e56a9efd6caec59a053450dd9fe5bc3d0dc28a27d3054b85b68db95a4" +checksum = "70028758c92f5ed61ce12ab8e7482dce152418bac41dbefe794511b9fb673022" dependencies = [ - "sha1", - "winrt_macros", + "proc-macro2", + "quote", + "squote", + "syn", + "windows_gen_macros", ] [[package]] -name = "winrt_gen" -version = "0.7.2" +name = "windows_gen_macros" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497492d5f30d47cb397c3d5bee37700996822311062a3a609493523ad3bb9ae" +checksum = "1a4e4aa3c108fc3112bb797662b14958d088d3b989f2560d89335775c566c88d" dependencies = [ "proc-macro2", "quote", - "serde_json", - "sha1", "syn", - "winrt_gen_macros", ] [[package]] -name = "winrt_gen_macros" -version = "0.7.2" +name = "windows_macros" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cd78ebb3f0f35f3d9b7f3272b7afac1904cc3e3f636a0a6e5877d72c78b7d8" +checksum = "87e5b872245607ec18bf35eaa7a6146831c07449c0b724afd7403d732c6da856" dependencies = [ "proc-macro2", "quote", + "squote", "syn", + "windows_gen", ] [[package]] -name = "winrt_macros" -version = "0.7.2" +name = "winit" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88594f878eee84909a5d20cad8bfef8587f9e1473ce81b74fbbd4b12748d662" +checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597" dependencies = [ - "proc-macro2", - "quote", - "syn", - "winrt_gen", + "bitflags", + "cocoa 0.24.0", + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "core-video-sys", + "dispatch", + "instant", + "lazy_static", + "libc", + "log", + "mio", + "mio-extras", + "ndk 0.2.1", + "ndk-glue 0.2.1", + "ndk-sys", + "objc", + "parking_lot", + "percent-encoding", + "raw-window-handle", + "smithay-client-toolkit", + "wayland-client", + "winapi 0.3.9", + "x11-dl", ] [[package]] diff --git a/egui_glium/Cargo.toml b/egui_glium/Cargo.toml index 8e4febf3b..630d36f39 100644 --- a/egui_glium/Cargo.toml +++ b/egui_glium/Cargo.toml @@ -34,7 +34,7 @@ ron = { version = "0.6", optional = true } serde = { version = "1", optional = true } # feature screen_reader -tts = { version = "0.14", optional = true } +tts = { version = "0.15", optional = true } # feature "time" chrono = { version = "0.4", optional = true } diff --git a/egui_web/Cargo.toml b/egui_web/Cargo.toml index f40e18542..9b03d4540 100644 --- a/egui_web/Cargo.toml +++ b/egui_web/Cargo.toml @@ -27,7 +27,7 @@ epi = { version = "0.10.0", path = "../epi" } js-sys = "0.3" ron = { version = "0.6", optional = true } serde = { version = "1", optional = true } -tts = { version = "0.14", optional = true } # feature screen_reader +tts = { version = "0.15", optional = true } # feature screen_reader wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4"