diff --git a/Cargo.lock b/Cargo.lock index 9606a19..f88b504 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -127,6 +127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom", "once_cell", "serde", "version_check", @@ -232,7 +233,7 @@ dependencies = [ "parking_lot", "thiserror", "winapi", - "x11rb", + "x11rb 0.12.0", ] [[package]] @@ -241,6 +242,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + [[package]] name = "async-broadcast" version = "0.7.1" @@ -784,8 +791,7 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "ecolor" version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d72e9c39f6e11a2e922d04a34ec5e7ef522ea3f5a1acfca7a19d16ad5fe50f5" +source = "git+https://github.com/emilk/egui?rev=13742f7bc67007343359e296d2d858b22f292868#13742f7bc67007343359e296d2d858b22f292868" dependencies = [ "bytemuck", "emath", @@ -795,8 +801,7 @@ dependencies = [ [[package]] name = "eframe" version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2f2d9e7ea2d11ec9e98a8683b6eb99f9d7d0448394ef6e0d6d91bd4eb817220" +source = "git+https://github.com/emilk/egui?rev=13742f7bc67007343359e296d2d858b22f292868#13742f7bc67007343359e296d2d858b22f292868" dependencies = [ "ahash", "bytemuck", @@ -846,8 +851,7 @@ dependencies = [ [[package]] name = "egui" version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252d52224d35be1535d7fd1d6139ce071fb42c9097773e79f7665604f5596b5e" +source = "git+https://github.com/emilk/egui?rev=13742f7bc67007343359e296d2d858b22f292868#13742f7bc67007343359e296d2d858b22f292868" dependencies = [ "accesskit", "ahash", @@ -863,8 +867,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e84c2919cd9f3a38a91e8f84ac6a245c19251fd95226ed9fae61d5ea564fce3" +source = "git+https://github.com/emilk/egui?rev=13742f7bc67007343359e296d2d858b22f292868#13742f7bc67007343359e296d2d858b22f292868" dependencies = [ "accesskit_winit", "ahash", @@ -883,8 +886,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eaf6264cc7608e3e69a7d57a6175f438275f1b3889c1a551b418277721c95e6" +source = "git+https://github.com/emilk/egui?rev=13742f7bc67007343359e296d2d858b22f292868#13742f7bc67007343359e296d2d858b22f292868" dependencies = [ "ahash", "bytemuck", @@ -900,8 +902,7 @@ dependencies = [ [[package]] name = "emath" version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fe73c1207b864ee40aa0b0c038d6092af1030744678c60188a05c28553515d" +source = "git+https://github.com/emilk/egui?rev=13742f7bc67007343359e296d2d858b22f292868#13742f7bc67007343359e296d2d858b22f292868" dependencies = [ "bytemuck", "serde", @@ -971,8 +972,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5666f8d25236293c966fbb3635eac18b04ad1914e3bab55bc7d44b9980cafcac" +source = "git+https://github.com/emilk/egui?rev=13742f7bc67007343359e296d2d858b22f292868#13742f7bc67007343359e296d2d858b22f292868" dependencies = [ "ab_glyph", "ahash", @@ -990,8 +990,7 @@ dependencies = [ [[package]] name = "epaint_default_fonts" version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66f6ddac3e6ac6fd4c3d48bb8b1943472f8da0f43a4303bcd8a18aa594401c80" +source = "git+https://github.com/emilk/egui?rev=13742f7bc67007343359e296d2d858b22f292868#13742f7bc67007343359e296d2d858b22f292868" [[package]] name = "equivalent" @@ -1219,6 +1218,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + [[package]] name = "getrandom" version = "0.2.11" @@ -1265,6 +1274,7 @@ dependencies = [ "core-foundation", "dispatch", "glutin_egl_sys", + "glutin_glx_sys", "glutin_wgl_sys", "libloading", "objc2", @@ -1272,7 +1282,9 @@ dependencies = [ "objc2-foundation", "once_cell", "raw-window-handle", + "wayland-sys", "windows-sys 0.52.0", + "x11-dl", ] [[package]] @@ -1297,6 +1309,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "glutin_glx_sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2b2d3918e76e18e08796b55eb64e8fe6ec67d5a6b2e2a7e2edce224ad24c63" +dependencies = [ + "gl_generator", + "x11-dl", +] + [[package]] name = "glutin_wgl_sys" version = "0.6.0" @@ -2670,6 +2692,19 @@ dependencies = [ "wayland-scanner", ] +[[package]] +name = "wayland-protocols-plasma" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + [[package]] name = "wayland-protocols-wlr" version = "0.3.4" @@ -3068,10 +3103,12 @@ version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" dependencies = [ + "ahash", "android-activity", "atomic-waker", "bitflags 2.6.0", "block2", + "bytemuck", "calloop", "cfg_aliases", "concurrent-queue", @@ -3081,24 +3118,33 @@ dependencies = [ "dpi", "js-sys", "libc", + "memmap2", "ndk", "objc2", "objc2-app-kit", "objc2-foundation", "objc2-ui-kit", "orbclient", + "percent-encoding", "pin-project", "raw-window-handle", "redox_syscall", "rustix", + "smithay-client-toolkit", "smol_str", "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", "web-sys", "web-time", "windows-sys 0.52.0", + "x11-dl", + "x11rb 0.13.1", "xkbcommon-dl", ] @@ -3120,17 +3166,43 @@ dependencies = [ "memchr", ] +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + [[package]] name = "x11rb" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" dependencies = [ - "gethostname", + "gethostname 0.3.0", "nix 0.26.4", "winapi", "winapi-wsapoll", - "x11rb-protocol", + "x11rb-protocol 0.12.0", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname 0.4.3", + "libc", + "libloading", + "once_cell", + "rustix", + "x11rb-protocol 0.13.1", ] [[package]] @@ -3142,6 +3214,12 @@ dependencies = [ "nix 0.26.4", ] +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + [[package]] name = "xcursor" version = "0.3.5" diff --git a/Cargo.toml b/Cargo.toml index 29b22fd..5b2a981 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,8 +43,8 @@ opt-level = 2 [patch.crates-io] # If you want to use the bleeding edge version of egui and eframe: -# egui = { git = "https://github.com/emilk/egui", branch = "master" } -# eframe = { git = "https://github.com/emilk/egui", branch = "master" } +egui = { git = "https://github.com/emilk/egui", rev = "13742f7bc67007343359e296d2d858b22f292868" } # DONT MERGE +eframe = { git = "https://github.com/emilk/egui", rev = "13742f7bc67007343359e296d2d858b22f292868" } # DONT MERGE # If you fork https://github.com/emilk/egui you can test with: # egui = { path = "../egui/crates/egui" }