Update everything to gtk-rs git, relm4 next

Now everything is in one workspace again. Hopefully this also builds on
CI.
This commit is contained in:
Ian Douglas Scott 2022-06-29 13:44:58 -07:00
parent fded103467
commit 061a891c5e
16 changed files with 329 additions and 169 deletions

View file

@ -7,9 +7,9 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
cosmic-panel-config = { git="https://github.com/pop-os/cosmic-panel/", features = ["gtk4"] }
cosmic-panel-config = { git="https://github.com/pop-os/cosmic-panel/", branch = "gtk-rs-git_nobuild", features = ["gtk4"] }
cascade = "1.0.0"
gtk4 = { version = "0.4.5", features = ["v4_4"] }
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs", features = ["v4_4"] }
once_cell = "1.9.0"
pretty_env_logger = "0.4"
anyhow = "1.0.50"
@ -21,5 +21,5 @@ wayland-client = "0.29.4"
wayland-commons = "0.29.4"
[build-dependencies]
gio = "0.15.10"
glib-build-tools = { git = "https://github.com/gtk-rs/gtk-rs-core" }
wayland-scanner = "0.29"

View file

@ -12,7 +12,7 @@ fn main() {
let git_hash = String::from_utf8(output.stdout).unwrap();
println!("cargo:rustc-env=GIT_HASH={}", git_hash);
}
gio::compile_resources(
glib_build_tools::compile_resources(
"data/resources",
"data/resources/resources.gresource.xml",
"compiled.gresource",