diff --git a/Cargo.lock b/Cargo.lock index 9ec733c4..430fbd1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -69,7 +69,7 @@ dependencies = [ "toml 0.8.8", "trash", "typed-builder", - "usvg", + "usvg 0.37.0", "winit 0.28.7", "winres", ] @@ -720,7 +720,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" dependencies = [ - "roxmltree", + "roxmltree 0.18.1", ] [[package]] @@ -737,6 +737,20 @@ dependencies = [ "ttf-parser 0.19.2", ] +[[package]] +name = "fontdb" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.2", + "slotmap", + "tinyvec", + "ttf-parser 0.20.0", +] + [[package]] name = "foreign-types" version = "0.3.2" @@ -1279,6 +1293,15 @@ dependencies = [ "libc", ] +[[package]] +name = "memmap2" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a69c7c189ae418f83003da62820aca28d15a07725ce51fb924999335d622ff" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" version = "0.6.5" @@ -1859,9 +1882,9 @@ dependencies = [ "pico-args", "png", "rgb", - "svgtypes", + "svgtypes 0.12.0", "tiny-skia 0.11.3", - "usvg", + "usvg 0.36.0", ] [[package]] @@ -1882,6 +1905,12 @@ dependencies = [ "xmlparser", ] +[[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -1917,6 +1946,22 @@ dependencies = [ "unicode-script", ] +[[package]] +name = "rustybuzz" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "smallvec", + "ttf-parser 0.20.0", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", +] + [[package]] name = "safe_arch" version = "0.5.2" @@ -2118,6 +2163,16 @@ dependencies = [ "siphasher", ] +[[package]] +name = "svgtypes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +dependencies = [ + "kurbo", + "siphasher", +] + [[package]] name = "syn" version = "1.0.109" @@ -2459,9 +2514,24 @@ dependencies = [ "base64", "log", "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", + "usvg-parser 0.36.0", + "usvg-text-layout 0.36.0", + "usvg-tree 0.36.0", + "xmlwriter", +] + +[[package]] +name = "usvg" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser 0.37.0", + "usvg-text-layout 0.37.0", + "usvg-tree 0.37.0", "xmlwriter", ] @@ -2476,11 +2546,29 @@ dependencies = [ "imagesize", "kurbo", "log", - "roxmltree", + "roxmltree 0.18.1", + "simplecss", + "siphasher", + "svgtypes 0.12.0", + "usvg-tree 0.36.0", +] + +[[package]] +name = "usvg-parser" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree 0.19.0", "simplecss", "siphasher", - "svgtypes", - "usvg-tree", + "svgtypes 0.13.0", + "usvg-tree 0.37.0", ] [[package]] @@ -2489,14 +2577,30 @@ version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593" dependencies = [ - "fontdb", + "fontdb 0.15.0", + "kurbo", + "log", + "rustybuzz 0.10.0", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree 0.36.0", +] + +[[package]] +name = "usvg-text-layout" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" +dependencies = [ + "fontdb 0.16.0", "kurbo", "log", - "rustybuzz", + "rustybuzz 0.12.1", "unicode-bidi", "unicode-script", "unicode-vo", - "usvg-tree", + "usvg-tree 0.37.0", ] [[package]] @@ -2507,7 +2611,19 @@ checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062" dependencies = [ "rctree", "strict-num", - "svgtypes", + "svgtypes 0.12.0", + "tiny-skia-path 0.11.3", +] + +[[package]] +name = "usvg-tree" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" +dependencies = [ + "rctree", + "strict-num", + "svgtypes 0.13.0", "tiny-skia-path 0.11.3", ] diff --git a/Cargo.toml b/Cargo.toml index bc338b8d..56700571 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,7 +71,7 @@ tiny-skia = "0.11" toml = "0.8" trash = { version = "3.0", default-features = false } typed-builder = "0.18" -usvg = "0.36" +usvg = "0.37" winit = "0.28" [dependencies.libavif-image]