From a66df3b98171eef949d47eec908576b134bc9351 Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Tue, 30 May 2023 21:49:15 +0200 Subject: [PATCH] chore: update libcosmic and cosmic-panel --- Cargo.lock | 197 +++++++++++++++++++--------------------- Cargo.toml | 7 +- app/Cargo.toml | 8 +- page/Cargo.toml | 4 +- pages/system/Cargo.toml | 2 +- 5 files changed, 106 insertions(+), 112 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92ba7ba..77b2ef8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -144,9 +144,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "ash" -version = "0.37.2+1.3.238" +version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ "libloading 0.7.4", ] @@ -253,7 +253,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -270,7 +270,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -479,7 +479,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -672,18 +672,18 @@ dependencies = [ [[package]] name = "const_format" -version = "0.2.30" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" +checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.29" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" +checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" dependencies = [ "proc-macro2", "quote", @@ -752,7 +752,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -766,7 +766,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "quote", "syn 1.0.109", @@ -775,7 +775,7 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel?branch=bg_jammy#89e47c3a57249c353dd8c4c19bea037d133f98f7" +source = "git+https://github.com/pop-os/cosmic-panel#adbe256782887cb0a15b9b421a477e70d1ca1b80" dependencies = [ "anyhow", "cosmic-config", @@ -872,7 +872,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "anyhow", "cosmic-config", @@ -1017,16 +1017,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - [[package]] name = "darling" version = "0.13.4" @@ -1038,17 +1028,13 @@ dependencies = [ ] [[package]] -name = "darling_core" -version = "0.10.2" +name = "darling" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", + "darling_core 0.20.1", + "darling_macro 0.20.1", ] [[package]] @@ -1061,19 +1047,22 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn 1.0.109", ] [[package]] -name = "darling_macro" -version = "0.10.2" +name = "darling_core" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ - "darling_core 0.10.2", + "fnv", + "ident_case", + "proc-macro2", "quote", - "syn 1.0.109", + "strsim", + "syn 2.0.18", ] [[package]] @@ -1087,6 +1076,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +dependencies = [ + "darling_core 0.20.1", + "quote", + "syn 2.0.18", +] + [[package]] name = "dashmap" version = "5.4.0" @@ -1119,14 +1119,14 @@ dependencies = [ [[package]] name = "derive_setters" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1cf41b4580a37cca5ef2ada2cc43cf5d6be3983f4522e83010d67ab6925e84b" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" dependencies = [ - "darling 0.10.2", + "darling 0.20.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -1203,7 +1203,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -1308,7 +1308,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -1586,7 +1586,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -1733,7 +1733,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -2055,8 +2055,8 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.17", + "strsim", + "syn 2.0.18", "unic-langid", ] @@ -2076,7 +2076,7 @@ dependencies = [ [[package]] name = "iced" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "iced_accessibility", "iced_core", @@ -2092,7 +2092,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "accesskit", "accesskit_unix", @@ -2101,7 +2101,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "bitflags 1.3.2", "iced_accessibility", @@ -2116,7 +2116,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.6.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "futures", "iced_core", @@ -2129,7 +2129,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.8.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2146,7 +2146,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2158,7 +2158,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "iced_accessibility", "iced_core", @@ -2170,7 +2170,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "enum-repr", "float-cmp", @@ -2191,7 +2191,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.8.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "iced_core", "once_cell", @@ -2201,7 +2201,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "bytemuck", "cosmic-text", @@ -2219,7 +2219,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2241,7 +2241,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "iced_renderer", "iced_runtime", @@ -2256,7 +2256,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.9.1" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "iced_graphics", "iced_runtime", @@ -2560,7 +2560,7 @@ checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=cosmic-advanced-text#71395b0c75bbffe1853e8f4e0189acec4c0787b1" +source = "git+https://github.com/pop-os/libcosmic?rev=f06a81c#f06a81ccf9fdeaef0033bfc07aa493ff8675f420" dependencies = [ "apply", "cosmic-config", @@ -2644,12 +2644,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "lru" @@ -2752,14 +2749,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2770,9 +2767,9 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d3edd593521f4a1dfd9b25193ed0224764572905f013d30ca5fbb85e010876" +checksum = "80cd00bd6180a8790f1c020ed258a46b8d73dd5bd6af104a238c9d71f806938e" dependencies = [ "bit-set", "bitflags 1.3.2", @@ -3101,9 +3098,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "option-ext" @@ -3334,7 +3331,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -3900,7 +3897,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -3911,7 +3908,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -4080,7 +4077,7 @@ dependencies = [ "pkg-config", "thiserror", "wayland-backend", - "wayland-client 0.30.1", + "wayland-client 0.30.2", "wayland-cursor 0.30.0", "wayland-protocols 0.30.0", "wayland-protocols-wlr", @@ -4127,7 +4124,7 @@ dependencies = [ "thiserror", "wasm-bindgen", "wayland-backend", - "wayland-client 0.30.1", + "wayland-client 0.30.2", "wayland-sys 0.30.1", "web-sys", "windows-sys 0.42.0", @@ -4174,19 +4171,13 @@ checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" [[package]] name = "strict-num" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" dependencies = [ "float-cmp", ] -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" @@ -4242,9 +4233,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45b6ddbb36c5b969c182aec3c4a0bce7df3fbad4b77114706a49aacc80567388" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -4333,7 +4324,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -4444,9 +4435,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", @@ -4523,7 +4514,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", ] [[package]] @@ -4821,7 +4812,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", "wasm-bindgen-shared", ] @@ -4855,7 +4846,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.17", + "syn 2.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4914,9 +4905,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.30.1" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bde68449abab1a808e5227b6e295f4ae3680911eb7711b4a2cb90141edb780" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" dependencies = [ "bitflags 1.3.2", "calloop", @@ -4955,7 +4946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d0c3a0d5b4b688b07b0442362d3ed6bf04724fcc16cd69ab6285b90dbc487aa" dependencies = [ "nix 0.26.2", - "wayland-client 0.30.1", + "wayland-client 0.30.2", "xcursor", ] @@ -4979,7 +4970,7 @@ checksum = "7fefbeb8a360abe67ab7c2efe1d297a1a50ee011f5460791bc18870c26bb84e2" dependencies = [ "bitflags 1.3.2", "wayland-backend", - "wayland-client 0.30.1", + "wayland-client 0.30.2", "wayland-scanner 0.30.0", "wayland-server", ] @@ -4992,7 +4983,7 @@ checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" dependencies = [ "bitflags 1.3.2", "wayland-backend", - "wayland-client 0.30.1", + "wayland-client 0.30.2", "wayland-protocols 0.30.0", "wayland-scanner 0.30.0", "wayland-server", @@ -5022,9 +5013,9 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9062def387c1b1d80e366d8243c2b3bd6d9e4f343032a3e5da8d4aa03866cf89" +checksum = "9c43c28096fe1d49fff7d1079404fdd0f669cd1a5b00c615bdfe71bb1884d23a" dependencies = [ "bitflags 1.3.2", "downcast-rs", @@ -5585,7 +5576,7 @@ dependencies = [ [[package]] name = "xdg-shell-wrapper-config" version = "0.1.0" -source = "git+https://github.com/pop-os/xdg-shell-wrapper?rev=a5bf783#a5bf7832fc091a0fcb685cd297bfa3cddcd72974" +source = "git+https://github.com/pop-os/xdg-shell-wrapper?rev=99a9cda#99a9cda4c9f56e0a5208e1a9375af93fd7040d5a" dependencies = [ "serde", "wayland-protocols-wlr", diff --git a/Cargo.toml b/Cargo.toml index adf9032..a215df0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,10 @@ default-members = ["app"] [workspace.dependencies.libcosmic] git = "https://github.com/pop-os/libcosmic" -# rev = "b85c504d72ee1c0d360c56042996474932df97cb" -branch = "cosmic-advanced-text" +rev = "f06a81c" default-features = false features = ["debug", "wayland", "tokio"] + +[workspace.dependencies.cosmic-config] +git = "https://github.com/pop-os/libcosmic" +rev = "f06a81c" \ No newline at end of file diff --git a/app/Cargo.toml b/app/Cargo.toml index 945ddb2..9054c4a 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -13,21 +13,21 @@ color-eyre = "0.6.2" cosmic-settings-page = { path = "../page" } cosmic-settings-system = { path = "../pages/system" } cosmic-settings-time = { path = "../pages/time" } -derive_setters = "0.1.5" +derive_setters = "0.1.6" dirs = "5.0.1" generator = "0.7.4" i18n-embed-fl = "0.6.7" libcosmic = {workspace = true} -once_cell = "1.17.1" +once_cell = "1.17.2" regex = "1.8.3" rkyv = { version = "0.7.42", features = ["validation"]} rust-embed = "6.6.1" slotmap = "1.0.6" -tokio = "1.28.1" +tokio = "1.28.2" downcast-rs = "1.2.0" log = "0.4" env_logger = "0.10" -cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel", branch = "bg_jammy" } +cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel" } [dependencies.i18n-embed] version = "0.13.9" diff --git a/page/Cargo.toml b/page/Cargo.toml index fa97fd7..2faf9db 100644 --- a/page/Cargo.toml +++ b/page/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" [dependencies] -derive_setters = "0.1.5" +derive_setters = "0.1.6" regex = "1.8.3" slotmap = "1.0.6" libcosmic = { workspace = true } generator = "0.7.4" downcast-rs = "1.2.0" -once_cell = "1.17.1" +once_cell = "1.17.2" diff --git a/pages/system/Cargo.toml b/pages/system/Cargo.toml index f6b5cc2..190122f 100644 --- a/pages/system/Cargo.toml +++ b/pages/system/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0-only" [dependencies] byte-unit = { version = "4.0.19", default-features = false } -const_format = "0.2.30" +const_format = "0.2.31" concat-in-place = "1.1.0" sysinfo = "0.29.0" memchr = "2.5.0"