From 061a891c5eb429543951ce5db2ac2d6862951b7c Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Wed, 29 Jun 2022 13:44:58 -0700 Subject: [PATCH] Update everything to gtk-rs git, relm4 next Now everything is in one workspace again. Hopefully this also builds on CI. --- Cargo.lock | 425 ++++++++++++------ Cargo.toml | 7 +- applets/cosmic-app-list/Cargo.toml | 12 +- applets/cosmic-app-list/build.rs | 2 +- applets/cosmic-applet-graphics/Cargo.toml | 4 +- applets/cosmic-applet-network/Cargo.toml | 6 +- .../cosmic-applet-notifications/Cargo.toml | 4 +- applets/cosmic-applet-power/Cargo.toml | 4 +- applets/cosmic-applet-status-area/Cargo.toml | 4 +- applets/cosmic-applet-time/Cargo.toml | 4 +- applets/cosmic-applet-workspaces/Cargo.toml | 6 +- applets/cosmic-applet-workspaces/build.rs | 2 +- applets/cosmic-panel-button/Cargo.toml | 6 +- applets/cosmic-panel-button/build.rs | 2 +- debian/rules | 4 +- justfile | 6 +- 16 files changed, 329 insertions(+), 169 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3e0d674..d857ee83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,17 +38,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" -[[package]] -name = "async-broadcast" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90622698a1218e0b2fb846c97b5f19a0831f6baddee73d9454156365ccfa473b" -dependencies = [ - "easy-parallel", - "event-listener", - "futures-core", -] - [[package]] name = "async-broadcast" version = "0.4.0" @@ -221,24 +210,23 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "cairo-rs" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62be3562254e90c1c6050a72aa638f6315593e98c5cdaba9017cedbabf0a5dee" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" dependencies = [ "bitflags", "cairo-sys-rs", - "glib", + "glib 0.16.0", "libc", + "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" dependencies = [ - "glib-sys", + "glib-sys 0.16.0", "libc", "system-deps", ] @@ -325,6 +313,7 @@ dependencies = [ "futures", "futures-util", "gio", + "glib-build-tools", "gsk4", "gtk4", "i18n-embed", @@ -332,7 +321,7 @@ dependencies = [ "libcosmic", "once_cell", "pretty_env_logger", - "relm4-macros 0.5.0-beta.1", + "relm4-macros", "rust-embed", "serde", "serde_json", @@ -340,6 +329,37 @@ dependencies = [ "xdg", ] +[[package]] +name = "cosmic-applet-audio" +version = "0.1.0" +dependencies = [ + "async-io", + "freedesktop-desktop-entry", + "futures", + "futures-util", + "gtk4", + "libcosmic-widgets", + "libpulse-binding", + "libpulse-glib-binding", + "mpris2-zbus", + "once_cell", + "relm4", + "relm4-macros", + "tokio", + "tracker", + "zbus", +] + +[[package]] +name = "cosmic-applet-battery" +version = "0.1.0" +dependencies = [ + "futures", + "gtk4", + "relm4", + "zbus", +] + [[package]] name = "cosmic-applet-graphics" version = "0.1.0" @@ -347,7 +367,7 @@ dependencies = [ "cosmic-panel-config", "gtk4", "once_cell", - "relm4-macros 0.5.0-beta.1", + "relm4-macros", "tokio", "zbus", ] @@ -363,7 +383,7 @@ dependencies = [ "itertools", "libcosmic-widgets", "once_cell", - "relm4-macros 0.5.0-beta.1", + "relm4-macros", "slotmap", "tokio", "zbus", @@ -394,7 +414,7 @@ dependencies = [ "logind-zbus", "nix 0.24.1", "once_cell", - "relm4-macros 0.5.0-beta.1", + "relm4-macros", "tokio", "zbus", ] @@ -437,7 +457,7 @@ dependencies = [ "anyhow", "cascade", "cosmic-panel-config", - "gio", + "glib-build-tools", "gtk4", "i18n-embed", "i18n-embed-fl", @@ -470,7 +490,7 @@ dependencies = [ "anyhow", "cascade", "cosmic-panel-config", - "gio", + "glib-build-tools", "gtk4", "i18n-embed", "i18n-embed-fl", @@ -482,7 +502,7 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#231dc1ec0656840458d9f0d3468d9c7ea5c2a98c" +source = "git+https://github.com/pop-os/cosmic-panel?branch=gtk-rs-git_nobuild#49b8d8c84f9db93c72ef06778b76ccb38329a8c4" dependencies = [ "anyhow", "gtk4", @@ -601,6 +621,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs" version = "4.0.0" @@ -817,10 +846,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "fragile" -version = "1.2.0" +name = "freedesktop-desktop-entry" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d758e60b45e8d749c89c1b389ad8aee550f86aa12e2b9298b546dda7a82ab1" +checksum = "45157175a725e81f3f594382430b6b78af5f8f72db9bd51b94f0785f80fc6d29" +dependencies = [ + "dirs 3.0.2", + "gettext-rs", + "memchr", + "thiserror", + "xdg", +] [[package]] name = "futures" @@ -937,57 +973,53 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" dependencies = [ "bitflags", "gdk-pixbuf-sys", "gio", - "glib", + "glib 0.16.0", "libc", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" dependencies = [ "gio-sys", - "glib-sys", - "gobject-sys", + "glib-sys 0.16.0", + "gobject-sys 0.16.0", "libc", "system-deps", ] [[package]] name = "gdk4" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabb7cf843c26b085a5d68abb95d0c0bf27a9ae2eeff9c4adb503a1eb580876" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d8577963559ce9ef8" dependencies = [ "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", "gio", - "glib", + "glib 0.16.0", "libc", "pango", ] [[package]] name = "gdk4-sys" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efe7dcb44f5c00aeabff3f69abfc5673de46559070f89bd3fbb7b66485d9cef2" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d8577963559ce9ef8" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", - "glib-sys", - "gobject-sys", + "glib-sys 0.16.0", + "gobject-sys 0.16.0", "libc", "pango-sys", "pkg-config", @@ -996,26 +1028,24 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be84e388c6b74cce3f9232904ce87ae1857ee3a41a20d9d8a16ae8792799b27c" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d8577963559ce9ef8" dependencies = [ "gdk4", "gdk4-x11-sys", "gio", - "glib", + "glib 0.16.0", "libc", "x11", ] [[package]] name = "gdk4-x11-sys" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f85f9dabcc847c0733246822bebb476dcbb93f5a964d561b46b69f00fdbbf44" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d8577963559ce9ef8" dependencies = [ "gdk4-sys", - "glib-sys", + "glib-sys 0.16.0", "libc", "system-deps", ] @@ -1044,17 +1074,37 @@ dependencies = [ ] [[package]] -name = "gio" -version = "0.15.11" +name = "gettext-rs" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f132be35e05d9662b9fa0fee3f349c6621f7782e0105917f4cc73c1bf47eceb" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gio" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-io", + "futures-util", "gio-sys", - "glib", + "glib 0.16.0", "libc", "once_cell", "thiserror", @@ -1062,12 +1112,11 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.16.0", + "gobject-sys 0.16.0", "libc", "system-deps", "winapi", @@ -1086,24 +1135,49 @@ dependencies = [ [[package]] name = "glib" -version = "0.15.11" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124026a2fa8c33a3d17a3fe59c103f2d9fa5bd92c19e029e037736729abeab" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-executor", "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", + "glib-macros 0.15.11", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "once_cell", "smallvec", "thiserror", ] +[[package]] +name = "glib" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "glib-macros 0.16.0", + "glib-sys 0.16.0", + "gobject-sys 0.16.0", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-build-tools" +version = "0.1.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" + [[package]] name = "glib-macros" version = "0.15.11" @@ -1119,6 +1193,20 @@ dependencies = [ "syn", ] +[[package]] +name = "glib-macros" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" +dependencies = [ + "anyhow", + "heck", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "glib-sys" version = "0.15.10" @@ -1129,35 +1217,52 @@ dependencies = [ "system-deps", ] +[[package]] +name = "glib-sys" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" +dependencies = [ + "libc", + "system-deps", +] + [[package]] name = "gobject-sys" version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ - "glib-sys", + "glib-sys 0.15.10", + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" +dependencies = [ + "glib-sys 0.16.0", "libc", "system-deps", ] [[package]] name = "graphene-rs" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" dependencies = [ - "glib", + "glib 0.16.0", "graphene-sys", "libc", ] [[package]] name = "graphene-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa691fc7337ba1df599afb55c3bcb85c04f1b3f17362570e9bb0ff0d1bc3028a" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" dependencies = [ - "glib-sys", + "glib-sys 0.16.0", "libc", "pkg-config", "system-deps", @@ -1165,14 +1270,13 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e9020d333280b3aa38d496495bfa9b50712eebf1ad63f0ec5bcddb5eb61be4" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d8577963559ce9ef8" dependencies = [ "bitflags", "cairo-rs", "gdk4", - "glib", + "glib 0.16.0", "graphene-rs", "gsk4-sys", "libc", @@ -1181,14 +1285,13 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add39ccf60078508c838643a2dcc91f045c46ed63b5ea6ab701b2e25bda3fea" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d8577963559ce9ef8" dependencies = [ "cairo-sys-rs", "gdk4-sys", - "glib-sys", - "gobject-sys", + "glib-sys 0.16.0", + "gobject-sys 0.16.0", "graphene-sys", "libc", "pango-sys", @@ -1197,9 +1300,8 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d8577963559ce9ef8" dependencies = [ "bitflags", "cairo-rs", @@ -1208,7 +1310,7 @@ dependencies = [ "gdk-pixbuf", "gdk4", "gio", - "glib", + "glib 0.16.0", "graphene-rs", "gsk4", "gtk4-macros", @@ -1220,9 +1322,8 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d8577963559ce9ef8" dependencies = [ "anyhow", "proc-macro-crate", @@ -1235,16 +1336,15 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc8006eea634b7c72da3ff79e24606e45f21b3b832a3c5a1f543f5f97eb0f63" +version = "0.5.0" +source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d8577963559ce9ef8" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", "gio-sys", - "glib-sys", - "gobject-sys", + "glib-sys 0.16.0", + "gobject-sys 0.16.0", "graphene-sys", "gsk4-sys", "libc", @@ -1447,13 +1547,13 @@ checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d004d686bd83e55f8f5058700941284ca84dc579" +source = "git+https://github.com/pop-os/libcosmic?branch=relm4-next#851449c3ef8fc7c209ca857ec8645160d055c9ae" dependencies = [ "cascade", "gdk4", "gdk4-x11", "gio", - "gobject-sys", + "gobject-sys 0.16.0", "gtk4", "libcosmic-widgets", "once_cell", @@ -1463,10 +1563,10 @@ dependencies = [ [[package]] name = "libcosmic-widgets" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d004d686bd83e55f8f5058700941284ca84dc579" +source = "git+https://github.com/pop-os/libcosmic?branch=relm4-next#851449c3ef8fc7c209ca857ec8645160d055c9ae" dependencies = [ "relm4", - "relm4-macros 0.4.1", + "relm4-macros", "tracker", ] @@ -1480,6 +1580,56 @@ dependencies = [ "winapi", ] +[[package]] +name = "libpulse-binding" +version = "2.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17be42160017e0ae993c03bfdab4ecb6f82ce3f8d515bd8da8fdf18d10703663" +dependencies = [ + "bitflags", + "libc", + "libpulse-sys", + "num-derive", + "num-traits", + "winapi", +] + +[[package]] +name = "libpulse-glib-binding" +version = "2.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0e7a964c9f7e95d4f073affc19adfda009fa0d55e8831dbb66c78be1d0e6e5" +dependencies = [ + "glib 0.15.12", + "glib-sys 0.15.10", + "libpulse-binding", + "libpulse-mainloop-glib-sys", +] + +[[package]] +name = "libpulse-mainloop-glib-sys" +version = "1.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f61c4064926cc77ea14bb206a21ce1d5a06e175e5c0ce078804bb6c4527b28" +dependencies = [ + "glib-sys 0.15.10", + "libpulse-sys", + "pkg-config", +] + +[[package]] +name = "libpulse-sys" +version = "1.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "991e6bd0efe2a36e6534e136e7996925e4c1a8e35b7807fe533f2beffff27c30" +dependencies = [ + "libc", + "num-derive", + "num-traits", + "pkg-config", + "winapi", +] + [[package]] name = "locale_config" version = "0.3.0" @@ -1574,6 +1724,18 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "mpris2-zbus" +version = "0.1.0" +source = "git+https://github.com/pop-os/mpris2-zbus#bcc8481ea7ccfc08aa870f28272d9093db3b1ba9" +dependencies = [ + "serde", + "thiserror", + "time 0.3.9", + "zbus", + "zvariant", +] + [[package]] name = "nanorand" version = "0.7.0" @@ -1631,6 +1793,17 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -1722,12 +1895,11 @@ dependencies = [ [[package]] name = "pango" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" dependencies = [ "bitflags", - "glib", + "glib 0.16.0", "libc", "once_cell", "pango-sys", @@ -1735,12 +1907,11 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.16.0", + "gobject-sys 0.16.0", "libc", "system-deps", ] @@ -2024,34 +2195,24 @@ checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" [[package]] name = "relm4" -version = "0.4.1" -source = "git+https://github.com/AaronErhardt/relm4?rev=7404ad64ca8763f6629cadcd743947cd29e1538a#7404ad64ca8763f6629cadcd743947cd29e1538a" +version = "0.5.0-beta.1" +source = "git+https://github.com/relm4/relm4?branch=next#d85111b03ba80e5132f79e2fa21b69899aab4c46" dependencies = [ - "async-broadcast 0.3.4", + "async-broadcast", "async-oneshot", "flume", - "fragile", "futures", "gtk4", "log", "once_cell", + "relm4-macros", "tokio", ] -[[package]] -name = "relm4-macros" -version = "0.4.1" -source = "git+https://github.com/AaronErhardt/relm4?branch=new-approach#f8efd12fffb4c581fc41d2781202282bdfbf7e04" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "relm4-macros" version = "0.5.0-beta.1" -source = "git+https://github.com/Relm4/Relm4.git?branch=next#d85111b03ba80e5132f79e2fa21b69899aab4c46" +source = "git+https://github.com/relm4/relm4?branch=next#d85111b03ba80e5132f79e2fa21b69899aab4c46" dependencies = [ "proc-macro2", "quote", @@ -2424,6 +2585,12 @@ dependencies = [ "version-compare", ] +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + [[package]] name = "tempfile" version = "3.3.0" @@ -2921,7 +3088,7 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" dependencies = [ - "dirs", + "dirs 4.0.0", ] [[package]] @@ -2965,7 +3132,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53819092b9db813b2c6168b097b4b13ad284d81c9f2b0165a0a1b190e505a1f3" dependencies = [ - "async-broadcast 0.4.0", + "async-broadcast", "async-channel", "async-executor", "async-io", diff --git a/Cargo.toml b/Cargo.toml index 02de8a98..2be22a96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,7 @@ [workspace] members = [ + "applets/cosmic-applet-audio", + "applets/cosmic-applet-battery", "applets/cosmic-applet-graphics", "applets/cosmic-applet-network", "applets/cosmic-applet-notifications", @@ -10,8 +12,3 @@ members = [ "applets/cosmic-app-list", "applets/cosmic-panel-button", ] - -exclude = [ - "applets/cosmic-applet-audio", - "applets/cosmic-applet-battery", -] diff --git a/applets/cosmic-app-list/Cargo.toml b/applets/cosmic-app-list/Cargo.toml index ae582b00..f6f47982 100644 --- a/applets/cosmic-app-list/Cargo.toml +++ b/applets/cosmic-app-list/Cargo.toml @@ -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" } diff --git a/applets/cosmic-app-list/build.rs b/applets/cosmic-app-list/build.rs index 7c42fb5e..534daf98 100644 --- a/applets/cosmic-app-list/build.rs +++ b/applets/cosmic-app-list/build.rs @@ -1,5 +1,5 @@ fn main() { - gio::compile_resources( + glib_build_tools::compile_resources( "data/resources", "data/resources/resources.gresource.xml", "compiled.gresource", diff --git a/applets/cosmic-applet-graphics/Cargo.toml b/applets/cosmic-applet-graphics/Cargo.toml index 19e80c2c..f79c532c 100644 --- a/applets/cosmic-applet-graphics/Cargo.toml +++ b/applets/cosmic-applet-graphics/Cargo.toml @@ -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"]} diff --git a/applets/cosmic-applet-network/Cargo.toml b/applets/cosmic-applet-network/Cargo.toml index ad1ae1bb..d94a8a3f 100644 --- a/applets/cosmic-applet-network/Cargo.toml +++ b/applets/cosmic-applet-network/Cargo.toml @@ -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"]} diff --git a/applets/cosmic-applet-notifications/Cargo.toml b/applets/cosmic-applet-notifications/Cargo.toml index 5ac15b82..759ff299 100644 --- a/applets/cosmic-applet-notifications/Cargo.toml +++ b/applets/cosmic-applet-notifications/Cargo.toml @@ -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"]} diff --git a/applets/cosmic-applet-power/Cargo.toml b/applets/cosmic-applet-power/Cargo.toml index 4afae05e..1a1d08ad 100644 --- a/applets/cosmic-applet-power/Cargo.toml +++ b/applets/cosmic-applet-power/Cargo.toml @@ -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"]} diff --git a/applets/cosmic-applet-status-area/Cargo.toml b/applets/cosmic-applet-status-area/Cargo.toml index 5dada3c7..82858bb8 100644 --- a/applets/cosmic-applet-status-area/Cargo.toml +++ b/applets/cosmic-applet-status-area/Cargo.toml @@ -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"]} diff --git a/applets/cosmic-applet-time/Cargo.toml b/applets/cosmic-applet-time/Cargo.toml index 7fb7aaa5..ba03486b 100644 --- a/applets/cosmic-applet-time/Cargo.toml +++ b/applets/cosmic-applet-time/Cargo.toml @@ -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"]} diff --git a/applets/cosmic-applet-workspaces/Cargo.toml b/applets/cosmic-applet-workspaces/Cargo.toml index c0f1291f..743705d5 100644 --- a/applets/cosmic-applet-workspaces/Cargo.toml +++ b/applets/cosmic-applet-workspaces/Cargo.toml @@ -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" diff --git a/applets/cosmic-applet-workspaces/build.rs b/applets/cosmic-applet-workspaces/build.rs index 040a9eef..3d8c16e0 100644 --- a/applets/cosmic-applet-workspaces/build.rs +++ b/applets/cosmic-applet-workspaces/build.rs @@ -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", diff --git a/applets/cosmic-panel-button/Cargo.toml b/applets/cosmic-panel-button/Cargo.toml index 99cc6880..12a64a6e 100644 --- a/applets/cosmic-panel-button/Cargo.toml +++ b/applets/cosmic-panel-button/Cargo.toml @@ -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" } diff --git a/applets/cosmic-panel-button/build.rs b/applets/cosmic-panel-button/build.rs index 7c42fb5e..534daf98 100644 --- a/applets/cosmic-panel-button/build.rs +++ b/applets/cosmic-panel-button/build.rs @@ -1,5 +1,5 @@ fn main() { - gio::compile_resources( + glib_build_tools::compile_resources( "data/resources", "data/resources/resources.gresource.xml", "compiled.gresource", diff --git a/debian/rules b/debian/rules index 11deba6b..132eb933 100755 --- a/debian/rules +++ b/debian/rules @@ -13,13 +13,11 @@ override_dh_shlibdeps: override_dh_auto_clean: if test "${CLEAN}" = "1"; then \ cargo clean; \ - cargo clean --manifest-path applets/cosmic-applet-audio/Cargo.toml; \ - cargo clean --manifest-path applets/cosmic-applet-battery/Cargo.toml; \ fi if ! ischroot && test "${VENDOR}" = "1"; then \ mkdir -p .cargo; \ - cargo vendor --sync Cargo.toml --sync applets/cosmic-applet-audio/Cargo.toml applets/cosmic-applet-battery/Cargo.toml | head -n -1 > .cargo/config; \ + cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \ echo 'directory = "vendor"' >> .cargo/config; \ tar pcf vendor.tar vendor; \ rm -rf vendor; \ diff --git a/justfile b/justfile index 3d147263..758e2895 100644 --- a/justfile +++ b/justfile @@ -28,8 +28,6 @@ workspaces_button_id := 'com.system76.CosmicPanelWorkspacesButton' all: _extract_vendor cargo build {{cargo_args}} - cargo build --manifest-path applets/cosmic-applet-audio/Cargo.toml {{cargo_args}} - cargo build --manifest-path applets/cosmic-applet-battery/Cargo.toml {{cargo_args}} # Installs files into the system install: @@ -43,12 +41,12 @@ install: # audio install -Dm0644 applets/cosmic-applet-audio/data/icons/{{audio_id}}.svg {{iconsdir}}/{{audio_id}}.svg install -Dm0644 applets/cosmic-applet-audio/data/{{audio_id}}.desktop {{sharedir}}/applications/{{audio_id}}.desktop - install -Dm0755 applets/cosmic-applet-audio/target/release/cosmic-applet-audio {{bindir}}/cosmic-applet-audio + install -Dm0755 target/release/cosmic-applet-audio {{bindir}}/cosmic-applet-audio # battery install -Dm0644 applets/cosmic-applet-battery/data/icons/{{battery_id}}.svg {{iconsdir}}/{{battery_id}}.svg install -Dm0644 applets/cosmic-applet-battery/data/{{battery_id}}.desktop {{sharedir}}/applications/{{battery_id}}.desktop - install -Dm0755 applets/cosmic-applet-battery/target/release/cosmic-applet-battery {{bindir}}/cosmic-applet-battery + install -Dm0755 target/release/cosmic-applet-battery {{bindir}}/cosmic-applet-battery # graphics install -Dm0644 applets/cosmic-applet-graphics/data/icons/{{graphics_id}}.svg {{iconsdir}}/{{graphics_id}}.svg