From 04ebd7a603debc95afa92b116f4c0da3dfe5e31b Mon Sep 17 00:00:00 2001 From: Robin Quint Date: Wed, 24 Apr 2024 15:04:39 +0200 Subject: [PATCH] Hopefully finally fixed dependency hell --- Cargo.toml | 3 --- imgui-examples/Cargo.toml | 2 +- imgui-glium-renderer/Cargo.toml | 4 ++-- imgui-glow-renderer/Cargo.toml | 2 +- imgui-sdl2-support/Cargo.toml | 2 +- imgui-winit-glow-renderer-viewports/Cargo.toml | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0f2bb30..f0438d1 100644 --- 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 index 09db78b..6accc2e 100644 --- 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 index 8122719..f838071 100644 --- 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 index df00871..6ca3fad 100644 --- 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 index 5c26b98..4969bf6 100644 --- 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 index ea2cb12..e57305b 100644 --- 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"