From 2e1280b61ef9422c76491ab718ad8da105657097 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sun, 3 Jul 2022 18:49:07 +0200 Subject: [PATCH] Update tts to 0.22 --- Cargo.lock | 98 +++++++++++++++++++++++++++---------------- eframe/Cargo.toml | 2 +- egui-winit/Cargo.toml | 2 +- 3 files changed, 64 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b157c49f6..1bee98d4e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3456,9 +3456,9 @@ dependencies = [ [[package]] name = "speech-dispatcher" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbab517fe176eb95d9bcc23c5ba75500fc5157d13a6978cfe135395fa149e151" +checksum = "6666f544c544d04049f40dfaebd4e3246ce9add2b7ad69c5cf89459492f01346" dependencies = [ "lazy_static", "speech-dispatcher-sys", @@ -3734,6 +3734,12 @@ dependencies = [ "safe_arch", ] +[[package]] +name = "tinystr" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29738eedb4388d9ea620eeab9384884fc3f06f586a2eddb56bedc5885126c7c1" + [[package]] name = "tinytemplate" version = "1.2.1" @@ -3845,11 +3851,12 @@ checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "tts" -version = "0.20.4" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f14cef4d39fc1b2a69d163772c9015d6e33d694a1f1e2047ec32274675a17cb" +checksum = "128fb87ca7bc6ec96794e040d4d776a9678d9663c25cea8c8432bbd59607f816" dependencies = [ "cocoa-foundation", + "core-foundation 0.9.3", "dyn-clonable", "jni", "lazy_static", @@ -3859,9 +3866,10 @@ dependencies = [ "objc", "speech-dispatcher", "thiserror", + "unic-langid", "wasm-bindgen", "web-sys", - "windows 0.33.0", + "windows 0.38.0", ] [[package]] @@ -3893,6 +3901,24 @@ dependencies = [ "winapi", ] +[[package]] +name = "unic-langid" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73328fcd730a030bdb19ddf23e192187a6b01cd98be6d3140622a89129459ce5" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a4a8eeaf0494862c1404c95ec2f4c33a2acff5076f64314b465e3ddae1b934d" +dependencies = [ + "tinystr", +] + [[package]] name = "unicode-bidi" version = "0.3.8" @@ -4431,19 +4457,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0128fa8e65e0616e45033d68dc0b7fbd521080b7844e5cad3a4a4d201c4b2bd2" -dependencies = [ - "windows_aarch64_msvc 0.33.0", - "windows_i686_gnu 0.33.0", - "windows_i686_msvc 0.33.0", - "windows_x86_64_gnu 0.33.0", - "windows_x86_64_msvc 0.33.0", -] - [[package]] name = "windows" version = "0.37.0" @@ -4457,6 +4470,19 @@ dependencies = [ "windows_x86_64_msvc 0.37.0", ] +[[package]] +name = "windows" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c47017195a790490df51a3e27f669a7d4f285920d90d03ef970c5d886ef0af1" +dependencies = [ + "windows_aarch64_msvc 0.38.0", + "windows_i686_gnu 0.38.0", + "windows_i686_msvc 0.38.0", + "windows_x86_64_gnu 0.38.0", + "windows_x86_64_msvc 0.38.0", +] + [[package]] name = "windows-sys" version = "0.36.1" @@ -4470,12 +4496,6 @@ dependencies = [ "windows_x86_64_msvc 0.36.1", ] -[[package]] -name = "windows_aarch64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" - [[package]] name = "windows_aarch64_msvc" version = "0.36.1" @@ -4489,10 +4509,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" [[package]] -name = "windows_i686_gnu" -version = "0.33.0" +name = "windows_aarch64_msvc" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" +checksum = "b12add87e2fb192fff3f4f7e4342b3694785d79f3a64e2c20d5ceb5ccbcfc3cd" [[package]] name = "windows_i686_gnu" @@ -4507,10 +4527,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" [[package]] -name = "windows_i686_msvc" -version = "0.33.0" +name = "windows_i686_gnu" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" +checksum = "4c98f2db372c23965c5e0f43896a8f0316dc0fbe48d1aa65bea9bdd295d43c15" [[package]] name = "windows_i686_msvc" @@ -4525,10 +4545,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" [[package]] -name = "windows_x86_64_gnu" -version = "0.33.0" +name = "windows_i686_msvc" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" +checksum = "cdf0569be0f2863ab6a12a6ba841fcfa7d107cbc7545a3ebd57685330db0a3ff" [[package]] name = "windows_x86_64_gnu" @@ -4543,10 +4563,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" [[package]] -name = "windows_x86_64_msvc" -version = "0.33.0" +name = "windows_x86_64_gnu" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" +checksum = "905858262c8380a36f32cb8c1990d7e7c3b7a8170e58ed9a98ca6d940b7ea9f1" [[package]] name = "windows_x86_64_msvc" @@ -4560,6 +4580,12 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" +[[package]] +name = "windows_x86_64_msvc" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "890c3c6341d441ffb38f705f47196e3665dc6dd79f6d72fa185d937326730561" + [[package]] name = "winit" version = "0.26.1" diff --git a/eframe/Cargo.toml b/eframe/Cargo.toml index 11d449751..a9641579a 100644 --- a/eframe/Cargo.toml +++ b/eframe/Cargo.toml @@ -143,4 +143,4 @@ web-sys = { version = "0.3.52", features = [ # optional # feature screen_reader -tts = { version = "0.20", optional = true } # stuck on old version due to compilation problems on linux +tts = { version = "0.22", optional = true } diff --git a/egui-winit/Cargo.toml b/egui-winit/Cargo.toml index 8a7bbaa4b..489fddb50 100644 --- a/egui-winit/Cargo.toml +++ b/egui-winit/Cargo.toml @@ -58,7 +58,7 @@ puffin = { version = "0.13", optional = true } serde = { version = "1.0", optional = true, features = ["derive"] } # feature screen_reader -tts = { version = "0.20", optional = true } # stuck on old version due to compilation problems on linux +tts = { version = "0.22", optional = true } webbrowser = { version = "0.7", optional = true }