Merge pull request #774 from Rob2309/dependency-fixes

Finally fixed dependency hell
imgui-rs · May 5, 2024 · 1ff1679 · 1ff1679
2 parents cd97e17 + e4d10ca
commit 1ff1679
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,3 @@ members = [
 
 package.rust-version = "1.70"
 resolver = "2"
-
-[patch.crates-io]
-glium = { git="https://github.com/glium/glium" }
diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 
 [dev-dependencies]
 copypasta = "0.8"
-glium = { version = "0.33.0", default-features = true }
+glium = { version = "0.34.0", default-features = true }
 image = "0.23"
 imgui = { path = "../imgui", features = ["tables-api"] }
 imgui-glium-renderer = { path = "../imgui-glium-renderer" }

diff --git a/imgui-glium-renderer/Cargo.toml b/imgui-glium-renderer/Cargo.toml
@@ -10,11 +10,11 @@ license = "MIT OR Apache-2.0"
 categories = ["gui", "rendering"]
 
 [dependencies]
-glium = { version = "0.33.0", default-features = false }
+glium = { version = "0.34.0", default-features = false }
 imgui = { version = "0.11.0", path = "../imgui" }
 
 [dev-dependencies]
-glium = { version = "0.33.0", default-features = false, features = ["glutin_backend"] }
+glium = { version = "0.34.0", default-features = false, features = ["glutin_backend"] }
 imgui-winit-support = {path = "../imgui-winit-support"}
 glutin = "0.31.1"
 glutin-winit = "0.4.2"

diff --git a/imgui-glow-renderer/Cargo.toml b/imgui-glow-renderer/Cargo.toml
@@ -10,7 +10,7 @@ categories = ["gui", "rendering"]
 
 [dependencies]
 imgui = { version = "0.11.0", path = "../imgui" }
-glow = "0.12.0"
+glow = "0.13.1"
 memoffset = "0.9"
 
 [dev-dependencies]

diff --git a/imgui-sdl2-support/Cargo.toml b/imgui-sdl2-support/Cargo.toml
@@ -15,6 +15,6 @@ imgui = { version = "0.11.0", path = "../imgui" }
 sdl2 = "0.34.5"
 
 [dev-dependencies]
-glow = "0.12.0"
+glow = "0.13.1"
 imgui-glow-renderer = { version = "0.11.0", path = "../imgui-glow-renderer" }
 sdl2 = { version = "0.34.5", features = ["bundled", "static-link"] }
diff --git a/imgui-winit-glow-renderer-viewports/Cargo.toml b/imgui-winit-glow-renderer-viewports/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 imgui = { version = "0.11.0", path="../imgui", features=["docking"] }
 
-glow = "0.12.0"
+glow = "0.13.1"
 glutin = "0.31.1"
 glutin-winit = "0.4.2"
 raw-window-handle = "0.5.0"

diff --git a/imgui-winit-support/src/lib.rs b/imgui-winit-support/src/lib.rs
@@ -483,8 +483,6 @@ impl WinitPlatform {
                 // https://github.com/ocornut/imgui/issues/5047
                 handle_key_modifier(io, &key, pressed);
 
-                println!("KEY EVENT: {event:?}");
-
                 // Add main key event
                 if let Some(key) = to_imgui_key(key, event.location) {
                     io.add_key_event(key, pressed);