From 06ec811e24b2a8a2539542a35d65e6d0a8561f72 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Thu, 5 Dec 2024 06:35:31 +0900 Subject: [PATCH] chore(deps): bump open_jtalk-rs (#886) Refs: VOICEVOX/open_jtalk-rs#32 --- Cargo.lock | 32 ++++++++++++-------------------- Cargo.toml | 2 +- deny.toml | 8 +++----- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 762dd3b46..2005f6ffa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -313,38 +313,37 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.62.0" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6720a8b7b2d39dd533285ed438d458f65b31b5c257e6ac7bb3d7e82844dd722" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", "log", - "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.102", + "syn 2.0.79", "which", ] [[package]] name = "bindgen" -version = "0.69.4" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", + "itertools 0.10.5", "log", "prettyplease", "proc-macro2", @@ -353,7 +352,6 @@ dependencies = [ "rustc-hash", "shlex", "syn 2.0.79", - "which", ] [[package]] @@ -2341,7 +2339,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open_jtalk" version = "0.1.25" -source = "git+https://github.com/VOICEVOX/open_jtalk-rs.git?rev=e1940f3fd61a48bed5bbec8cd2645e13923b1f80#e1940f3fd61a48bed5bbec8cd2645e13923b1f80" +source = "git+https://github.com/VOICEVOX/open_jtalk-rs.git?rev=7c87b4227bb005b439a3ad473b48ce8975829576#7c87b4227bb005b439a3ad473b48ce8975829576" dependencies = [ "camino", "open_jtalk-sys", @@ -2351,9 +2349,9 @@ dependencies = [ [[package]] name = "open_jtalk-sys" version = "0.16.111" -source = "git+https://github.com/VOICEVOX/open_jtalk-rs.git?rev=e1940f3fd61a48bed5bbec8cd2645e13923b1f80#e1940f3fd61a48bed5bbec8cd2645e13923b1f80" +source = "git+https://github.com/VOICEVOX/open_jtalk-rs.git?rev=7c87b4227bb005b439a3ad473b48ce8975829576#7c87b4227bb005b439a3ad473b48ce8975829576" dependencies = [ - "bindgen 0.62.0", + "bindgen 0.70.1", "cmake", "link-cplusplus", ] @@ -2483,12 +2481,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "1.1.0" diff --git a/Cargo.toml b/Cargo.toml index 3286b7674..a3a606317 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -103,7 +103,7 @@ rev = "17f741301db0bb08da0eafe8a338e5efd8a4b5df" [workspace.dependencies.open_jtalk] git = "https://github.com/VOICEVOX/open_jtalk-rs.git" -rev = "e1940f3fd61a48bed5bbec8cd2645e13923b1f80" +rev = "7c87b4227bb005b439a3ad473b48ce8975829576" # FIXME: iOS対応のpull request(https://github.com/wesleywiser/process_path/pull/16)がマージされる見込みが無いため [workspace.dependencies.process_path] diff --git a/deny.toml b/deny.toml index 5736a528c..ee88e083e 100644 --- a/deny.toml +++ b/deny.toml @@ -29,8 +29,8 @@ bypass = [ { name = "assert_cmd", version = "2", build-script = "367a36318cd9bb47aeb730f8a8ddad39c10b926175465393f0d5b01cbd993d44" }, # https://docs.rs/crate/assert_cmd/2.0.16/source/build.rs { name = "async-trait", version = "0.1", build-script = "b45aa3a5c177cbeaeb4847163088924491ac27b79534f8ea4c53ed3e10c163ea" }, # https://docs.rs/crate/async-trait/0.1.57/source/build.rs { name = "backtrace", version = "0.3", build-script = "8d5e860da109f86c67596b10b5613ff6d19f9d24c2970f491a55261fb1973692" }, # https://docs.rs/crate/backtrace/0.3.66/source/build.rs - { name = "bindgen", version = "0.62", build-script = "4a9c4ac3759572e17de312a9d3f4ced3b6fd3c71811729e5a8d06bfbd1ac8f82" }, # https://docs.rs/crate/bindgen/0.62.0/source/build.rs { name = "bindgen", version = "0.69", build-script = "4a9c4ac3759572e17de312a9d3f4ced3b6fd3c71811729e5a8d06bfbd1ac8f82" }, # https://docs.rs/crate/bindgen/0.69.4/source/build.rs + { name = "bindgen", version = "0.70", build-script = "4a9c4ac3759572e17de312a9d3f4ced3b6fd3c71811729e5a8d06bfbd1ac8f82" }, # https://docs.rs/crate/bindgen/0.70.1/source/build.rs { name = "camino", version = "1", build-script = "cbdfaa56ff8e211896e75fc7867e3230aa8aa09fdda901111db957c65306f1d8" }, # https://docs.rs/crate/camino/1.1.9/source/build.rs { name = "caseless", version = "0.2", build-script = "8ab1dc9ef269f28202fe1156c5c655f286cbc03b6dd4fb20a2f9f9e00763b6f5" }, # https://docs.rs/crate/caseless/0.2.1/source/src/build.rs { name = "cbindgen", version = "0.27", build-script = "f0fa57ad2c0dca5855cc2636a2e95acbadb52fa887609216022bdf71ed996dec" }, # https://docs.rs/crate/cbindgen/0.27.0/source/build.rs @@ -110,10 +110,10 @@ bypass = [ # Oniguruma is licensed under `BSD-2-Clause`: https://docs.rs/crate/onig_sys/69.8.1/source/oniguruma/COPYING { name = "onig_sys", version = "69", build-script = "c84df2a143d2ffb0fbb8f9f6102992f1b38f44037edbee74f2d364616ea4863f" }, - # https://github.com/VOICEVOX/open_jtalk-rs/blob/e1940f3fd61a48bed5bbec8cd2645e13923b1f80/crates/open_jtalk-sys/build.rs + # https://github.com/VOICEVOX/open_jtalk-rs/blob/579d52c29165654b8fc50e212bae36a61c119163/crates/open_jtalk-sys/build.rs # # Open JTalk is licensed under: https://github.com/VOICEVOX/open_jtalk/blob/1.11/src/COPYING - { name = "open_jtalk-sys", version = "=0.16.111", build-script = "0dd3780d0500bb42759eb0e6bd2d00f1d5fc92fb6f47f2abe59af135d4353ee3" }, + { name = "open_jtalk-sys", version = "=0.16.111", build-script = "d9c3766132686fb7f7bf8f138d94bb59aa09ce4af14e4bca2dad347999d30225" }, # https://docs.rs/crate/pyo3-ffi/0.20.3/source/build.rs # @@ -171,8 +171,6 @@ clarify = [ # TODO: `package.license`を書く { name = "downloader", expression = "MIT", license-files = [] }, - { name = "open_jtalk", expression = "BSD-3-Clause", license-files = [] }, - { name = "open_jtalk-sys", expression = "BSD-3-Clause", license-files = [] }, { name = "test_util", expression = "MIT", license-files = [] }, { name = "voicevox_core", expression = "MIT", license-files = [] }, { name = "voicevox_core_c_api", expression = "MIT", license-files = [] },