diff --git a/Cargo.lock b/Cargo.lock index 0ded38d9..491efeb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -155,30 +155,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46016233fc1bb55c23b856fe556b7db6ccd05119a0a392e04f0b3b7c79058f16" -[[package]] -name = "atk" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba" -dependencies = [ - "atk-sys", - "bitflags", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - [[package]] name = "atty" version = "0.2.14" @@ -561,7 +537,7 @@ dependencies = [ "clicolors-control", "lazy_static 1.4.0", "libc", - "parking_lot 0.11.2", + "parking_lot 0.6.4", "regex", "termios", "unicode-width", @@ -1108,7 +1084,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "druid" version = "0.7.0" -source = "git+https://github.com/lapce/druid#0c01bb14cd58cbd81109507dbee8895450b10380" +source = "git+https://github.com/lapce/druid#3bdb3a21c0c14cc6c39de145977942806d04be71" dependencies = [ "console_error_panic_hook", "druid-derive", @@ -1132,7 +1108,7 @@ dependencies = [ [[package]] name = "druid-derive" version = "0.4.0" -source = "git+https://github.com/lapce/druid#0c01bb14cd58cbd81109507dbee8895450b10380" +source = "git+https://github.com/lapce/druid#3bdb3a21c0c14cc6c39de145977942806d04be71" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", @@ -1142,38 +1118,24 @@ dependencies = [ [[package]] name = "druid-shell" version = "0.7.0" -source = "git+https://github.com/lapce/druid#0c01bb14cd58cbd81109507dbee8895450b10380" +source = "git+https://github.com/lapce/druid#3bdb3a21c0c14cc6c39de145977942806d04be71" dependencies = [ "anyhow", - "bitflags", - "block", - "cairo-rs", "cfg-if 1.0.0", - "cocoa", "copypasta", - "core-graphics 0.22.2", - "foreign-types", - "gdk-sys", - "glib-sys", - "gtk", - "gtk-sys", "instant", "js-sys", "keyboard-types", "kurbo", "lazy_static 1.4.0", - "objc", "piet-common", "piet-wgpu", "raw-window-handle", - "scopeguard 1.1.0", "time 0.2.27", "tracing", "wasm-bindgen", "web-sys", - "winapi 0.3.9", "winit", - "wio", ] [[package]] @@ -1225,16 +1187,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -[[package]] -name = "field-offset" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" -dependencies = [ - "memoffset 0.6.4", - "rustc_version 0.3.3", -] - [[package]] name = "filetime" version = "0.2.15" @@ -1581,64 +1533,6 @@ dependencies = [ "ndarray", ] -[[package]] -name = "gdk" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a453eae5ec10345b3a96ca1b547328bfc94edd40aa95b08f14bb4c35863db140" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - [[package]] name = "generic-array" version = "0.12.4" @@ -1675,36 +1569,6 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" -[[package]] -name = "gio" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a4c12fcba7a6402ae843a0085ec16d3658a87901763b6a7f0a7c5d60e555a5" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi 0.3.9", -] - [[package]] name = "git2" version = "0.13.23" @@ -1841,62 +1705,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "gtk" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6603bb79ded6ac6f3bac203794383afa8b1d6a8656d34a93a88f0b22826cd46c" -dependencies = [ - "atk", - "bitflags", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk3-macros" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79" -dependencies = [ - "anyhow", - "heck", - "proc-macro-crate 1.0.0", - "proc-macro-error", - "proc-macro2 1.0.29", - "quote 1.0.9", - "syn 1.0.75", -] - [[package]] name = "hashbrown" version = "0.9.1"