From 5a15ef8d7f4e305f56a1c0efb2f885d2690c96db Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Thu, 15 Jun 2023 15:03:06 -0400 Subject: [PATCH] update libcosmic --- Cargo.lock | 205 ++++++++++-------------- applet/Cargo.toml | 4 +- applet/src/lib.rs | 4 +- cosmic-app-list/Cargo.toml | 2 +- cosmic-applet-audio/Cargo.toml | 4 +- cosmic-applet-audio/src/main.rs | 4 +- cosmic-applet-battery/Cargo.toml | 4 +- cosmic-applet-battery/src/app.rs | 4 +- cosmic-applet-bluetooth/Cargo.toml | 2 +- cosmic-applet-bluetooth/src/app.rs | 4 +- cosmic-applet-graphics/Cargo.toml | 2 +- cosmic-applet-network/Cargo.toml | 4 +- cosmic-applet-network/src/app.rs | 9 +- cosmic-applet-notifications/Cargo.toml | 4 +- cosmic-applet-notifications/src/main.rs | 4 +- cosmic-applet-power/Cargo.toml | 2 +- cosmic-applet-time/Cargo.toml | 4 +- cosmic-applet-workspaces/Cargo.toml | 2 +- cosmic-panel-button/Cargo.toml | 2 +- 19 files changed, 124 insertions(+), 146 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 800be260..afbc830b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -138,9 +138,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "8868f09ff8cea88b079da74ae569d9b8c62a23c68c746240b704ee6f7525c89c" [[package]] name = "ash" @@ -212,7 +212,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.19", + "rustix 0.37.20", "slab", "socket2", "waker-fn", @@ -240,7 +240,7 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix 0.37.19", + "rustix 0.37.20", "signal-hook", "windows-sys 0.48.0", ] @@ -285,7 +285,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" dependencies = [ - "rustix 0.37.19", + "rustix 0.37.20", "tempfile", "windows-sys 0.48.0", ] @@ -390,9 +390,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" +checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded" [[package]] name = "block" @@ -610,12 +610,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "const_panic" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" - [[package]] name = "core-foundation" version = "0.9.3" @@ -834,7 +828,7 @@ dependencies = [ "cosmic-applet", "icon-loader", "libcosmic", - "nix 0.24.3", + "nix 0.26.2", ] [[package]] @@ -873,7 +867,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -887,7 +881,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "quote", "syn 1.0.109", @@ -918,7 +912,7 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel?rev=a47c24d#a47c24d020887170f75ae1269874f1ea117ffb0f" +source = "git+https://github.com/pop-os/cosmic-panel#2d57cec0d1d835f70e1348175ee2ceae6242e739" dependencies = [ "anyhow", "cosmic-config", @@ -964,7 +958,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "anyhow", "cosmic-config", @@ -979,7 +973,7 @@ dependencies = [ [[package]] name = "cosmic-time" version = "0.2.0" -source = "git+https://github.com/pop-os/cosmic-time?rev=07f9372#07f93721ac04765f2f9caf15f0d5b458f3fd9828" +source = "git+https://github.com/pop-os/cosmic-time?rev=39c96ac#39c96ac8b3c11aeb5a4fe8bc962a89013f3f27b7" dependencies = [ "libcosmic", "once_cell", @@ -1026,22 +1020,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -1392,38 +1386,6 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" -[[package]] -name = "encase" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a516181e9a36e8982cb37933c5e7dba638c42938cacde46ee4e5b4156f881b9" -dependencies = [ - "const_panic", - "encase_derive", - "glam", - "thiserror", -] - -[[package]] -name = "encase_derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5b802412eea315f29f2bb2da3a5963cd6121f56eaa06aebcdc0c54eea578f22" -dependencies = [ - "encase_derive_impl", -] - -[[package]] -name = "encase_derive_impl" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enum-repr" version = "0.2.6" @@ -1544,6 +1506,12 @@ dependencies = [ "zune-inflate", ] +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + [[package]] name = "fastrand" version = "1.9.0" @@ -1926,15 +1894,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "glam" -version = "0.21.3" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815" +checksum = "ad83ab008a4fa3b31dfa713dd41b5a9bdea1e94e4cf1e2fc274ffbd49b0271d3" [[package]] name = "glib" @@ -1998,7 +1966,7 @@ dependencies = [ [[package]] name = "glyphon" version = "0.2.0" -source = "git+https://github.com/hecrj/glyphon.git?rev=f145067d292082abdd1f2b2481812d4a52c394ec#f145067d292082abdd1f2b2481812d4a52c394ec" +source = "git+https://github.com/hecrj/glyphon.git?rev=26f92369da3704988e3e27f0b35e705c6b2de203#26f92369da3704988e3e27f0b35e705c6b2de203" dependencies = [ "cosmic-text", "etagere", @@ -2283,7 +2251,7 @@ dependencies = [ [[package]] name = "iced" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_accessibility", "iced_core", @@ -2298,7 +2266,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "accesskit", "accesskit_unix", @@ -2307,7 +2275,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "bitflags 1.3.2", "iced_accessibility", @@ -2322,7 +2290,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.6.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "futures", "iced_core", @@ -2335,7 +2303,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.8.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2352,7 +2320,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2364,7 +2332,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_accessibility", "iced_core", @@ -2376,7 +2344,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "enum-repr", "float-cmp", @@ -2386,18 +2354,19 @@ dependencies = [ "iced_runtime", "iced_style", "itertools", - "log", "raw-window-handle", "smithay-client-toolkit 0.17.0", "smithay-clipboard", "thiserror", + "tracing", "wayland-backend", + "wayland-protocols 0.30.0", ] [[package]] name = "iced_style" version = "0.8.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_core", "once_cell", @@ -2407,7 +2376,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "bytemuck", "cosmic-text", @@ -2425,11 +2394,10 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "bitflags 1.3.2", "bytemuck", - "encase", "futures", "glam", "glyphon", @@ -2447,7 +2415,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "iced_renderer", "iced_runtime", @@ -2588,7 +2556,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix 0.37.19", + "rustix 0.37.20", "windows-sys 0.48.0", ] @@ -2618,9 +2586,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2695,7 +2663,7 @@ checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=6699aa4#6699aa475646fd044b5233dc918e3b0e3604c8ed" +source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" dependencies = [ "apply", "cosmic-config", @@ -2710,12 +2678,14 @@ dependencies = [ "iced_runtime", "iced_sctk", "iced_style", + "iced_tiny_skia", "iced_widget", "lazy_static", "palette", "slotmap", "smithay-client-toolkit 0.17.0", "tokio", + "tracing", ] [[package]] @@ -2840,15 +2810,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "logind-zbus" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2cfc54565c8d002ad7344ec08ce512c269b2de56dea59850708691e4b18fe3" +checksum = "14b36b364be05220b24411a1c1a1ee4df0ba77b09c9880e70e5f4c16ebdec157" dependencies = [ "serde", "zbus", @@ -2913,9 +2883,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -3299,12 +3269,12 @@ dependencies = [ [[package]] name = "palette" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49" +checksum = "e1641aee47803391405d0a1250e837d2336fdddd18b27f3ddb8c1d80ce8d7f43" dependencies = [ "approx", - "num-traits", + "fast-srgb8", "palette_derive", "phf", "serde", @@ -3312,14 +3282,13 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427" +checksum = "3c02bfa6b3ba8af5434fa0531bf5701f750d983d4260acd6867faca51cdc4484" dependencies = [ - "find-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -3470,9 +3439,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.8" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -3878,9 +3847,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ "bitflags 1.3.2", "errno", @@ -4010,9 +3979,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -4361,7 +4330,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.19", + "rustix 0.37.20", "windows-sys 0.48.0", ] @@ -4812,9 +4781,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.3.3" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" dependencies = [ "getrandom", ] @@ -4867,9 +4836,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4877,9 +4846,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", @@ -4892,9 +4861,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -4904,9 +4873,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4914,9 +4883,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", @@ -4927,9 +4896,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-timer" @@ -5124,9 +5093,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -5170,7 +5139,7 @@ checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.3.1", + "bitflags 2.3.2", "codespan-reporting", "log", "naga", @@ -5195,7 +5164,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.3.1", + "bitflags 2.3.2", "block", "core-graphics-types", "d3d12", @@ -5233,7 +5202,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bd33a976130f03dcdcd39b3810c0c3fc05daf86f0aaf867db14bfb7c4a9a32b" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.3.2", "js-sys", "web-sys", ] diff --git a/applet/Cargo.toml b/applet/Cargo.toml index c961eb8e..4d0b990b 100644 --- a/applet/Cargo.toml +++ b/applet/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] } ron = { version = "0.8" } serde = { version = "1.0" } -cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel", rev = "a47c24d" } +cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel" } log = { version = "0.4" } \ No newline at end of file diff --git a/applet/src/lib.rs b/applet/src/lib.rs index a6a5fa44..146261f9 100644 --- a/applet/src/lib.rs +++ b/applet/src/lib.rs @@ -31,11 +31,11 @@ const APPLET_PADDING: u32 = 8; pub fn applet_button_theme() -> Button { Button::Custom { active: Box::new(|t| iced_style::button::Appearance { - border_radius: 0.0, + border_radius: 0.0.into(), ..t.active(&Button::Text) }), hover: Box::new(|t| iced_style::button::Appearance { - border_radius: 0.0, + border_radius: 0.0.into(), ..t.hovered(&Button::Text) }), } diff --git a/cosmic-app-list/Cargo.toml b/cosmic-app-list/Cargo.toml index a258604a..28e94974 100644 --- a/cosmic-app-list/Cargo.toml +++ b/cosmic-app-list/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "f0cfe09" } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "f0cfe09" } -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["wayland", "tokio"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["wayland", "tokio"] } cosmic-applet = { path = "../applet" } # libcosmic = { path = "../../libcosmic", default-features = false, features = ["wayland", "tokio"] } ron = "0.8" diff --git a/cosmic-applet-audio/Cargo.toml b/cosmic-applet-audio/Cargo.toml index 1987b51b..62d5f2d6 100644 --- a/cosmic-applet-audio/Cargo.toml +++ b/cosmic-applet-audio/Cargo.toml @@ -10,8 +10,8 @@ icon-loader = { version = "0.3.6", features = ["gtk"] } libpulse-binding = "2.26.0" libpulse-glib-binding = "2.25.0" tokio = { version = "1.20.1", features=["full"] } -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] } -cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "07f9372", default-features = false, features = ["libcosmic", "once_cell"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] } +cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] } cosmic-applet = { path = "../applet" } log = "0.4.14" pretty_env_logger = "0.4.0" diff --git a/cosmic-applet-audio/src/main.rs b/cosmic-applet-audio/src/main.rs index aca8d9ef..757b10b6 100644 --- a/cosmic-applet-audio/src/main.rs +++ b/cosmic-applet-audio/src/main.rs @@ -288,7 +288,9 @@ impl Application for Audio { Subscription::batch(vec![ self.applet_helper.theme_subscription(0).map(Message::Theme), pulse::connect().map(Message::Pulse), - self.timeline.as_subscription().map(Message::Frame), + self.timeline + .as_subscription() + .map(|(_, now)| Message::Frame(now)), ]) } diff --git a/cosmic-applet-battery/Cargo.toml b/cosmic-applet-battery/Cargo.toml index 9d06819d..9c06a149 100644 --- a/cosmic-applet-battery/Cargo.toml +++ b/cosmic-applet-battery/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" [dependencies] once_cell = "1.16.0" -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] } -cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "07f9372", default-features = false, features = ["libcosmic", "once_cell"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] } +cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] } cosmic-applet = { path = "../applet" } futures = "0.3" zbus = { version = "3.13", default-features = false, features = ["tokio"] } diff --git a/cosmic-applet-battery/src/app.rs b/cosmic-applet-battery/src/app.rs index 02e9d9b6..fe225096 100644 --- a/cosmic-applet-battery/src/app.rs +++ b/cosmic-applet-battery/src/app.rs @@ -418,7 +418,9 @@ impl Application for CosmicBatteryApplet { (_, PowerProfileUpdate::Init(tx, p)) => Message::InitProfile(p, tx), (_, PowerProfileUpdate::Error(e)) => Message::Errored(e), // TODO: handle error }), - self.timeline.as_subscription().map(Message::Frame), + self.timeline + .as_subscription() + .map(|(_, now)| Message::Frame(now)), ]) } diff --git a/cosmic-applet-bluetooth/Cargo.toml b/cosmic-applet-bluetooth/Cargo.toml index d7e78a9b..89482b09 100644 --- a/cosmic-applet-bluetooth/Cargo.toml +++ b/cosmic-applet-bluetooth/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0-or-later" once_cell = "1.16.0" bluer = { version = "0.15", features = ["bluetoothd", "id"] } futures-util = "0.3.21" -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["wayland", "tokio"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["wayland", "tokio"] } cosmic-applet = { path = "../applet" } futures = "0.3" log = "0.4" diff --git a/cosmic-applet-bluetooth/src/app.rs b/cosmic-applet-bluetooth/src/app.rs index 2fac47a8..b05c1924 100644 --- a/cosmic-applet-bluetooth/src/app.rs +++ b/cosmic-applet-bluetooth/src/app.rs @@ -281,11 +281,11 @@ impl Application for CosmicBluetoothApplet { fn view(&self, id: window::Id) -> Element { let button_style = || Button::Custom { active: Box::new(|t| iced_style::button::Appearance { - border_radius: 0.0, + border_radius: 0.0.into(), ..t.active(&Button::Text) }), hover: Box::new(|t| iced_style::button::Appearance { - border_radius: 0.0, + border_radius: 0.0.into(), ..t.hovered(&Button::Text) }), }; diff --git a/cosmic-applet-graphics/Cargo.toml b/cosmic-applet-graphics/Cargo.toml index ba16b499..321fe987 100644 --- a/cosmic-applet-graphics/Cargo.toml +++ b/cosmic-applet-graphics/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] zbus = "3.13" -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] } cosmic-applet = { path = "../applet" } once_cell = "1" # Application i18n diff --git a/cosmic-applet-network/Cargo.toml b/cosmic-applet-network/Cargo.toml index 342de0ae..01bf6760 100644 --- a/cosmic-applet-network/Cargo.toml +++ b/cosmic-applet-network/Cargo.toml @@ -8,8 +8,8 @@ license = "GPL-3.0-or-later" cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings", branch = "main" } # cosmic-dbus-networkmanager = { path = "../../../dbus-settings-bindings/networkmanager" } futures-util = "0.3.21" -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] } -cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "07f9372", default-features = false, features = ["libcosmic", "once_cell"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] } +cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] } cosmic-applet = { path = "../applet" } futures = "0.3" zbus = { version = "3.13", default-features = false } diff --git a/cosmic-applet-network/src/app.rs b/cosmic-applet-network/src/app.rs index 4a8f85a9..c44b9c1c 100644 --- a/cosmic-applet-network/src/app.rs +++ b/cosmic-applet-network/src/app.rs @@ -385,11 +385,11 @@ impl Application for CosmicNetworkApplet { fn view(&self, id: window::Id) -> Element { let button_style = || Button::Custom { active: Box::new(|t| iced_style::button::Appearance { - border_radius: 0.0, + border_radius: 0.0.into(), ..t.active(&Button::Text) }), hover: Box::new(|t| iced_style::button::Appearance { - border_radius: 0.0, + border_radius: 0.0.into(), ..t.hovered(&Button::Text) }), }; @@ -729,7 +729,10 @@ impl Application for CosmicNetworkApplet { fn subscription(&self) -> Subscription { let network_sub = network_manager_subscription(0).map(|e| Message::NetworkManagerEvent(e.1)); - let timeline = self.timeline.as_subscription().map(Message::Frame); + let timeline = self + .timeline + .as_subscription() + .map(|(_, now)| Message::Frame(now)); if let Some(conn) = self.conn.as_ref() { Subscription::batch(vec![ diff --git a/cosmic-applet-notifications/Cargo.toml b/cosmic-applet-notifications/Cargo.toml index 9fbb595a..7f37d3fd 100644 --- a/cosmic-applet-notifications/Cargo.toml +++ b/cosmic-applet-notifications/Cargo.toml @@ -6,7 +6,7 @@ license = "GPL-3.0-or-later" [dependencies] icon-loader = { version = "0.3.6", features = ["gtk"] } -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] } -cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "07f9372", default-features = false, features = ["libcosmic", "once_cell"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] } +cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] } cosmic-applet = { path = "../applet" } nix = "0.24.1" diff --git a/cosmic-applet-notifications/src/main.rs b/cosmic-applet-notifications/src/main.rs index 481050a0..0c6cc98e 100644 --- a/cosmic-applet-notifications/src/main.rs +++ b/cosmic-applet-notifications/src/main.rs @@ -87,7 +87,9 @@ impl Application for Notifications { fn subscription(&self) -> Subscription { Subscription::batch(vec![ self.applet_helper.theme_subscription(0).map(Message::Theme), - self.timeline.as_subscription().map(Message::Frame), + self.timeline + .as_subscription() + .map(|(_, now)| Message::Frame(now)), ]) } diff --git a/cosmic-applet-power/Cargo.toml b/cosmic-applet-power/Cargo.toml index 404de211..493cd476 100644 --- a/cosmic-applet-power/Cargo.toml +++ b/cosmic-applet-power/Cargo.toml @@ -9,7 +9,7 @@ icon-loader = { version = "0.3.6", features = ["gtk"] } libpulse-binding = "2.26.0" libpulse-glib-binding = "2.25.0" tokio = { version = "1.20.1", features=["full"] } -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] } cosmic-applet = { path = "../applet" } nix = "0.26.2" zbus = "3.13" diff --git a/cosmic-applet-time/Cargo.toml b/cosmic-applet-time/Cargo.toml index dba4f9b3..7f8eea54 100644 --- a/cosmic-applet-time/Cargo.toml +++ b/cosmic-applet-time/Cargo.toml @@ -6,7 +6,7 @@ license = "GPL-3.0-or-later" [dependencies] icon-loader = { version = "0.3.6", features = ["gtk"] } -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] } cosmic-applet = { path = "../applet" } -nix = "0.24.1" +nix = "0.26.2" chrono = { version = "0.4.23", features = ["clock"] } diff --git a/cosmic-applet-workspaces/Cargo.toml b/cosmic-applet-workspaces/Cargo.toml index c0fa2daf..d859a6fb 100644 --- a/cosmic-applet-workspaces/Cargo.toml +++ b/cosmic-applet-workspaces/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Ashley Wulber "] edition = "2021" [dependencies] -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] } cosmic-applet = { path = "../applet" } cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, rev = "f0cfe09" } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "f0cfe09" } diff --git a/cosmic-panel-button/Cargo.toml b/cosmic-panel-button/Cargo.toml index 2e226b10..b65a6d52 100644 --- a/cosmic-panel-button/Cargo.toml +++ b/cosmic-panel-button/Cargo.toml @@ -6,5 +6,5 @@ license = "GPL-3.0-or-later" [dependencies] freedesktop-desktop-entry = "0.5.0" -libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "6699aa4", default-features = false, features = ["tokio", "wayland"] } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] } cosmic-applet = { path = "../applet" }