leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update everything to gtk-rs git, relm4 next

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

12
applets/cosmic-app-list/Cargo.toml
View file

@ -5,11 +5,11 @@ 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"] }
gio = "0.15.3"
libcosmic = { git = "https://github.com/pop-os/libcosmic" }
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs", features = ["v4_4"] }
gio = { git = "https://github.com/gtk-rs/gtk-rs-core" }
libcosmic = { git = "https://github.com/pop-os/libcosmic", branch = "relm4-next" }
relm4-macros = { git = "https://github.com/Relm4/Relm4.git", branch = "next" }
serde = "1.0.136"
serde_json = "1.0.78"
@ -18,7 +18,7 @@ futures = "0.3.19"
futures-util = "0.3.19"
once_cell = "1.9.0"
xdg = "2.4.0"
gsk4 = "0.4.6"
gsk4 = { git = "https://github.com/gtk-rs/gtk4-rs" }
pretty_env_logger = "0.4"
anyhow = "1.0.50"
i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] }
@ -26,4 +26,4 @@ i18n-embed-fl = "0.6.4"
rust-embed = "6.3.0"
[build-dependencies]
gio = "0.15.10"
glib-build-tools = { git = "https://github.com/gtk-rs/gtk-rs-core" }

2
applets/cosmic-app-list/build.rs
View file

@ -1,5 +1,5 @@
fn main() {
gio::compile_resources(
glib_build_tools::compile_resources(
"data/resources",
"data/resources/resources.gresource.xml",
"compiled.gresource",

4
applets/cosmic-applet-graphics/Cargo.toml
View file

@ -6,9 +6,9 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
gtk4 = { version = "0.4.6", features = ["v4_2"] }
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs", features = ["v4_2"] }
once_cell = "1.9.0"
relm4-macros = { git = "https://github.com/Relm4/Relm4.git", branch = "next" }
tokio = { version = "1.16.1", features = ["full"] }
zbus = "2.1.1"
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"]}

6
applets/cosmic-applet-network/Cargo.toml
View file

@ -7,12 +7,12 @@ license = "GPL-3.0-or-later"
[dependencies]
cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings" }
futures-util = "0.3.21"
gtk4 = "0.4.6"
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs" }
itertools = "0.10.3"
once_cell = "1.9.0"
relm4-macros = { git = "https://github.com/Relm4/Relm4.git", branch = "next" }
slotmap = "1.0.6"
tokio = { version = "1.15.0", features = ["full"] }
zbus = "2.0.1"
libcosmic-widgets = { git = "https://github.com/pop-os/libcosmic" }
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"]}
libcosmic-widgets = { git = "https://github.com/pop-os/libcosmic", branch = "relm4-next" }
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", branch = "gtk-rs-git_nobuild", features = ["gtk4"]}

4
applets/cosmic-applet-notifications/Cargo.toml
View file

@ -7,10 +7,10 @@ license = "GPL-3.0-or-later"
[dependencies]
cascade = "1"
futures = "0.3"
gtk4 = "0.4.6"
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs" }
once_cell = "1.12"
serde = "1"
zbus = "2.0.1"
zbus_names = "2"
zvariant = "3"
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"]}

4
applets/cosmic-applet-power/Cargo.toml
View file

@ -6,11 +6,11 @@ license = "GPL-3.0-or-later"
[dependencies]
futures-util = "0.3.21"
gtk4 = "0.4.6"
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs" }
logind-zbus = "3.0.1"
nix = "0.24.1"
once_cell = "1.9.0"
relm4-macros = { git = "https://github.com/Relm4/Relm4.git", branch = "next" }
tokio = { version = "1.15.0", features = ["full"] }
zbus = "2.0.1"
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"]}

4
applets/cosmic-applet-status-area/Cargo.toml
View file

@ -7,10 +7,10 @@ license = "GPL-3.0-or-later"
[dependencies]
cascade = "1"
futures = "0.3"
gtk4 = "0.4.6"
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs" }
once_cell = "1.12"
serde = "1"
zbus = "2.0.1"
zbus_names = "2"
zvariant = "3"
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"]}

4
applets/cosmic-applet-time/Cargo.toml
View file

@ -8,10 +8,10 @@ license = "GPL-3.0-or-later"
cascade = "1"
chrono = "0.4"
futures = "0.3"
gtk4 = { version = "0.4.6", features = [ "v4_6" ] }
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs", features = [ "v4_6" ] }
once_cell = "1.12"
serde = "1"
zbus = "2.0.1"
zbus_names = "2"
zvariant = "3"
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"]}

6
applets/cosmic-applet-workspaces/Cargo.toml
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"

2
applets/cosmic-applet-workspaces/build.rs
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",

6
applets/cosmic-panel-button/Cargo.toml
View file

@ -5,9 +5,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"
@ -16,4 +16,4 @@ i18n-embed-fl = "0.6.4"
rust-embed = "6.3.0"
[build-dependencies]
gio = "0.15.10"
glib-build-tools = { git = "https://github.com/gtk-rs/gtk-rs-core" }

2
applets/cosmic-panel-button/build.rs
View file

@ -1,5 +1,5 @@
fn main() {
gio::compile_resources(
glib_build_tools::compile_resources(
"data/resources",
"data/resources/resources.gresource.xml",
"compiled.gresource",