From 974aef7476cb12ec1eb1023147663e6bc1fa0117 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Tue, 3 Oct 2023 13:28:32 -0700 Subject: [PATCH] Update dependencies Updating `renderdoc` fixes a segfault running with the `debug` feature. --- Cargo.lock | 156 ++++++++++++++++++++++------------------------------- Cargo.toml | 18 +++---- 2 files changed, 73 insertions(+), 101 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ca60ab1..6b68af60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -523,7 +523,7 @@ dependencies = [ "cosmic-protocols", "edid-rs", "egui", - "glow 0.11.2", + "glow", "i18n-embed", "i18n-embed-fl", "iced_tiny_skia", @@ -541,7 +541,7 @@ dependencies = [ "puffin_egui", "regex", "renderdoc", - "ron 0.7.1", + "ron", "rust-embed", "sendfd", "serde", @@ -557,7 +557,7 @@ dependencies = [ "wayland-scanner 0.31.0", "xcursor", "xdg", - "xkbcommon", + "xkbcommon 0.7.0", ] [[package]] @@ -579,7 +579,7 @@ dependencies = [ "dirs 5.0.1", "iced_futures", "notify", - "ron 0.8.1", + "ron", "serde", ] @@ -634,7 +634,7 @@ dependencies = [ "csscolorparser", "lazy_static", "palette", - "ron 0.8.1", + "ron", "serde", ] @@ -986,7 +986,7 @@ checksum = "1f8c2752cdf1b0ef5fcda59a898cacabad974d4f5880e92a420b2c917022da64" dependencies = [ "bytemuck", "egui", - "glow 0.12.3", + "glow", "log", "memoffset 0.6.5", "wasm-bindgen", @@ -1213,19 +1213,13 @@ dependencies = [ [[package]] name = "float-cmp" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ "num-traits", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - [[package]] name = "float_next_after" version = "0.1.5" @@ -1567,18 +1561,6 @@ version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" -[[package]] -name = "glow" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "glow" version = "0.12.3" @@ -1752,15 +1734,15 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "toml 0.8.1", + "toml 0.8.2", "unic-langid", ] [[package]] name = "i18n-embed" -version = "0.13.9" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" dependencies = [ "arc-swap", "fluent", @@ -1780,9 +1762,9 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.6.7" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" +checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" dependencies = [ "dashmap", "find-crate", @@ -2331,14 +2313,14 @@ dependencies = [ [[package]] name = "libsystemd" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8144587c71c16756b1055d3dcb0c75cb605a10ecd6523cc33702d5f90902bf6d" +checksum = "88b9597a67aa1c81a6624603e6bd0bcefb9e0f94c9c54970ec53771082104b4e" dependencies = [ "hmac", "libc", "log", - "nix 0.23.2", + "nix 0.26.4", "nom", "once_cell", "serde", @@ -2526,6 +2508,15 @@ dependencies = [ "libc", ] +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" version = "0.6.5" @@ -2671,19 +2662,6 @@ dependencies = [ "jni-sys", ] -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.24.3" @@ -3005,9 +2983,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.9.1" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" +checksum = "e3a540f3e3b3d7929c884e46d093d344e4e5bdeed54d08bf007df50c93cc85d5" dependencies = [ "num-traits", ] @@ -3549,25 +3527,19 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "renderdoc" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42e14087d51efd3b42eb341e37b6f320af2b0750519ea849cb68bb7289643ed" +checksum = "272da9ec1e28b0ef17df4dcefad820b13f098ebe9c82697111fc57ccff621e12" dependencies = [ "bitflags 1.3.2", - "float-cmp 0.8.0", + "float-cmp", "libloading 0.7.4", "once_cell", - "renderdoc-sys 0.7.1", + "renderdoc-sys", "winapi", "wio", ] -[[package]] -name = "renderdoc-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" - [[package]] name = "renderdoc-sys" version = "1.0.0" @@ -3614,17 +3586,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "ron" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" -dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", - "serde", -] - [[package]] name = "ron" version = "0.8.1" @@ -3657,9 +3618,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "6.8.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -3668,9 +3629,9 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.8.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" dependencies = [ "proc-macro2", "quote", @@ -3681,9 +3642,9 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "7.8.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" dependencies = [ "sha2", "walkdir", @@ -3942,7 +3903,7 @@ dependencies = [ "encoding", "gbm", "gl_generator", - "glow 0.12.3", + "glow", "indexmap 2.0.2", "input", "lazy_static", @@ -3970,7 +3931,7 @@ dependencies = [ "wayland-sys 0.31.1", "winit", "x11rb 0.12.0", - "xkbcommon", + "xkbcommon 0.6.0", ] [[package]] @@ -4005,7 +3966,7 @@ dependencies = [ "log", "memoffset 0.9.0", "smithay", - "xkbcommon", + "xkbcommon 0.6.0", ] [[package]] @@ -4072,7 +4033,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" dependencies = [ - "float-cmp 0.9.0", + "float-cmp", ] [[package]] @@ -4156,7 +4117,7 @@ dependencies = [ [[package]] name = "taffy" version = "0.3.11" -source = "git+https://github.com/DioxusLabs/taffy#65bedf128ec8cef40c1a21b6f141f2c771842cca" +source = "git+https://github.com/DioxusLabs/taffy#120bb7a2e501822b324fd48de955450ebbba1c1a" dependencies = [ "arrayvec", "grid", @@ -4308,9 +4269,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07bb54ef1f8ff27564b08b861144d3b8d40263efe07684f64987f4c0d044e3e" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" dependencies = [ "displaydoc", ] @@ -4341,14 +4302,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc1433177506450fe920e46a4f9812d0c211f5dd556da10e731a0a3dfa151f0" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.1", + "toml_edit 0.20.2", ] [[package]] @@ -4373,9 +4334,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca676d9ba1a322c1b64eb8045a5ec5c0cfb0c9d08e15e9ff622589ad5221c8fe" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap 2.0.2", "serde", @@ -4706,9 +4667,9 @@ dependencies = [ [[package]] name = "uuid" -version = "0.8.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "serde", ] @@ -5135,7 +5096,7 @@ dependencies = [ "core-graphics-types", "d3d12", "foreign-types", - "glow 0.12.3", + "glow", "gpu-alloc", "gpu-allocator", "gpu-descriptor", @@ -5152,7 +5113,7 @@ dependencies = [ "profiling", "range-alloc", "raw-window-handle", - "renderdoc-sys 1.0.0", + "renderdoc-sys", "rustc-hash", "smallvec", "thiserror", @@ -5511,6 +5472,17 @@ dependencies = [ "xkeysym", ] +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + [[package]] name = "xkeysym" version = "0.2.0" diff --git a/Cargo.toml b/Cargo.toml index c2dcc9db..75570489 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" sendfd = "0.4.1" egui = { version = "0.22.0", optional = true } -renderdoc = { version = "0.10.1", optional = true } +renderdoc = { version = "0.11.0", optional = true } edid-rs = { version = "0.1" } png = "0.17.5" lazy_static = "1.4.0" @@ -27,11 +27,11 @@ log-panics = { version = "2", features = ["with-backtrace"] } thiserror = "1.0.26" regex = "1" xcursor = "0.3.3" -xkbcommon = "0.6" +xkbcommon = "0.7" indexmap = "2.0" xdg = "^2.1" -ron = "0.7" -libsystemd = { version = "0.5", optional = true } +ron = "0.8" +libsystemd = { version = "0.6", optional = true } wayland-backend = "0.3.0" wayland-scanner = "0.31.0" cosmic-comp-config = { path = "cosmic-comp-config" } @@ -40,8 +40,8 @@ cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", branch libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "f91287d", default-features = false } iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic/", rev = "f91287d" } tiny-skia = "0.10" -ordered-float = "3.0" -glow = "0.11.2" +ordered-float = "4.0" +glow = "0.12.0" tracing-subscriber = { version = "0.3.16", features = ["env-filter", "tracing-log"] } tracing-journald = "0.3.0" tracing = { version = "0.1.37", features = ["max_level_debug", "release_max_level_info"] } @@ -49,9 +49,9 @@ puffin = { version = "0.14.3", optional = true } puffin_egui = { version = "0.22.0", optional = true } keyframe = "1.1.1" once_cell = "1.18.0" -i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6" -rust-embed = "6.6" +i18n-embed = { version = "0.14", features = ["fluent-system", "desktop-requester"] } +i18n-embed-fl = "0.7" +rust-embed = "8.0" [dependencies.id_tree] git = "https://github.com/Drakulix/id-tree.git"