From 7a4ab666b49bd10b5693e814d5463dfb9841b897 Mon Sep 17 00:00:00 2001 From: Magnus Larsen Date: Tue, 13 Feb 2024 01:32:18 -0800 Subject: [PATCH] Update memoffset to 0.9.0, arboard to 3.3.1, and remove egui_glow's needless dependency on pure_glow's deps (#4036) These are the latest versions of memoffset and arboard. The changes to egui_glow/pure_glow allow downstream crates to not depend on rwh 0.5, which is only needed for pure_glow (and other projects that use glutin) Thanks for your time & work --- Cargo.lock | 87 +++++++++--------------------------- crates/egui-winit/Cargo.toml | 2 +- crates/egui_glow/Cargo.toml | 18 ++++---- 3 files changed, 32 insertions(+), 75 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index beede35c9..86bb30eaf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -199,9 +199,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arboard" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" +checksum = "1faa3c733d9a3dd6fbaf85da5d162a2e03b2e0033a90dceb0e2a90fdd1e5380a" dependencies = [ "clipboard-win", "log", @@ -210,8 +210,7 @@ dependencies = [ "objc_id", "parking_lot", "thiserror", - "winapi", - "x11rb 0.12.0", + "x11rb", ] [[package]] @@ -789,13 +788,11 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "3ec832972fefb8cf9313b45a0d1945e29c9c251f1d4c6eafc5fe2124c02d2e81" dependencies = [ "error-code", - "str-buf", - "winapi", ] [[package]] @@ -1349,7 +1346,7 @@ dependencies = [ "glutin", "glutin-winit", "log", - "memoffset", + "memoffset 0.9.0", "puffin", "raw-window-handle 0.5.2", "wasm-bindgen", @@ -1510,13 +1507,9 @@ dependencies = [ [[package]] name = "error-code" -version = "2.3.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" [[package]] name = "event-listener" @@ -1731,16 +1724,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "gethostname" version = "0.4.3" @@ -2380,6 +2363,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "metal" version = "0.27.0" @@ -2501,7 +2493,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset", + "memoffset 0.7.1", ] [[package]] @@ -3527,12 +3519,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strict-num" version = "0.1.1" @@ -4375,15 +4361,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -4628,7 +4605,7 @@ dependencies = [ "web-time", "windows-sys 0.48.0", "x11-dl", - "x11rb 0.13.0", + "x11rb", "xkbcommon-dl", ] @@ -4652,19 +4629,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" -dependencies = [ - "gethostname 0.3.0", - "nix", - "winapi", - "winapi-wsapoll", - "x11rb-protocol 0.12.0", -] - [[package]] name = "x11rb" version = "0.13.0" @@ -4672,21 +4636,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "as-raw-xcb-connection", - "gethostname 0.4.3", + "gethostname", "libc", "libloading 0.8.0", "once_cell", "rustix 0.38.21", - "x11rb-protocol 0.13.0", -] - -[[package]] -name = "x11rb-protocol" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix", + "x11rb-protocol", ] [[package]] diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml index 1e6dda321..fdff0fcdc 100644 --- a/crates/egui-winit/Cargo.toml +++ b/crates/egui-winit/Cargo.toml @@ -77,4 +77,4 @@ webbrowser = { version = "0.8.3", optional = true } smithay-clipboard = { version = "0.7.0", optional = true } [target.'cfg(not(target_os = "android"))'.dependencies] -arboard = { version = "3.2", optional = true, default-features = false } +arboard = { version = "3.3", optional = true, default-features = false } diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml index 56bc1592a..1ee1f6cd9 100644 --- a/crates/egui_glow/Cargo.toml +++ b/crates/egui_glow/Cargo.toml @@ -55,11 +55,7 @@ egui = { workspace = true, default-features = false, features = ["bytemuck"] } bytemuck = "1.7" glow.workspace = true log.workspace = true -memoffset = "0.7" -# glutin stuck on old version of raw-window-handle: -rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = [ - "std", -] } +memoffset = "0.9" #! ### Optional dependencies ## Enable this when generating docs. @@ -70,7 +66,6 @@ document-features = { workspace = true, optional = true } egui-winit = { workspace = true, optional = true, default-features = false } puffin = { workspace = true, optional = true } winit = { workspace = true, optional = true, default-features = false, features = [ - "rwh_05", # glutin stuck on old version of raw-window-handle "rwh_06", # for compatibility with egui-winit ] } @@ -83,8 +78,15 @@ wasm-bindgen = "0.2" [dev-dependencies] glutin = "0.31" # examples/pure_glow glutin-winit = "0.4.0" - +# glutin stuck on old version of raw-window-handle: +rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = [ + "std", +] } [[example]] name = "pure_glow" -required-features = ["winit", "egui/default_fonts"] +required-features = [ + "winit", + "egui/default_fonts", + "winit/rwh_05", # glutin stuck on old version of raw-window-handle +]