Cargo update, with patches to sdl and zbus

This commit is contained in:
Mike Dilger 2024-02-05 09:29:37 +13:00
parent 59787b0ab8
commit c09a1c8bdf
4 changed files with 342 additions and 337 deletions

665
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -15,4 +15,8 @@ overflow-checks = false
# override egui crate for egui_video dependency
egui = { git = "https://github.com/mikedilger/egui", rev = "50393e4f34ac6246b8c2424e42fbe5b95e4b4452" }
# Use the master branch of SDL2 to include a fix related to clang (and XCode after 14.2)
sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2", rev = "27cd1fd67c811e06b9d997a77bb6089a1b65070d" }
sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2", rev = "f2f1e29a416bcc22f2faf411866db2c8d9536308" }
# Patch zbus since it had a dependency options bug that isn't live yet
zbus = { git = "https://github.com/dbus2/zbus/", branch = "zbus-3" }
zbus_names = { git = "https://github.com/dbus2/zbus/", branch = "zbus-3" }

View File

@ -21,7 +21,7 @@ rustls-tls-native = [ "gossip-lib/rustls-tls-native" ]
bech32 = "0.9"
eframe = { git = "https://github.com/mikedilger/egui", rev = "50393e4f34ac6246b8c2424e42fbe5b95e4b4452", features = [ "persistence", "wayland" ] }
egui-winit = { git = "https://github.com/mikedilger/egui", rev = "50393e4f34ac6246b8c2424e42fbe5b95e4b4452", features = [ "default" ] }
egui-video = { git = "https://github.com/mikedilger/egui-video", rev = "d12a4859d383524f978a0dd29d61e1ebd281e735", features = [ "from_bytes" ], optional = true }
egui-video = { git = "https://github.com/mikedilger/egui-video", rev = "ec3ec5e8e7151fa9ecad149bd2fe0864acb28317", features = [ "from_bytes" ], optional = true }
gossip-relay-picker = { git = "https://github.com/mikedilger/gossip-relay-picker", rev = "1d13cacb0d7b32d72d0c8c27414461d5389ca2ec" }
gossip-lib = { path = "../gossip-lib" }
humansize = "2.1"
@ -33,7 +33,7 @@ paste = "1.0"
qrcode = { git = "https://github.com/mikedilger/qrcode-rust", rev = "519b77b3efa3f84961169b47d3de08c5ddd86548" }
resvg = "0.35.0"
rpassword = "7.2"
sdl2 = { version = "0.35.2", features = ["bundled"], optional = true }
sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2", rev = "f2f1e29a416bcc22f2faf411866db2c8d9536308", features = ["bundled"], optional = true }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
time = { version = "0.3", features = [ "formatting", "macros" ] }

View File

@ -48,7 +48,7 @@ filetime = "0.2"
futures = "0.3"
futures-util = "0.3"
gossip-relay-picker = { git = "https://github.com/mikedilger/gossip-relay-picker", rev = "1d13cacb0d7b32d72d0c8c27414461d5389ca2ec" }
heed = { git = "https://github.com/meilisearch/heed", rev = "8bfdf3beeda292fe166dc6b2f468cdb23af7181b" }
heed = { git = "https://github.com/meilisearch/heed", rev = "64fd6fec293c0dee94855b8267557ce03e7ce5d8" }
hex = "0.4"
http = "0.2"
image = { version = "0.24.6", features = [ "png", "jpeg" ] }
@ -64,7 +64,7 @@ regex = "1.8"
reqwest = { version = "0.11", default-features=false, features = ["brotli", "deflate", "gzip", "json"] }
resvg = "0.35.0"
rhai = { version = "1.15", features = [ "std", "sync" ]}
sdl2 = { version = "0.35.2", features = ["bundled"], optional = true }
sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2", rev = "f2f1e29a416bcc22f2faf411866db2c8d9536308", features = ["bundled"], optional = true }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
sha2 = "0.10"