diff --git a/Cargo.lock b/Cargo.lock index 6d15b52..7030583 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,12 +21,12 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" version = "0.12.2" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" [[package]] name = "accesskit_consumer" version = "0.17.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" dependencies = [ "accesskit", ] @@ -34,7 +34,7 @@ dependencies = [ [[package]] name = "accesskit_macos" version = "0.11.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" dependencies = [ "accesskit", "accesskit_consumer", @@ -46,7 +46,7 @@ dependencies = [ [[package]] name = "accesskit_unix" version = "0.7.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" dependencies = [ "accesskit", "accesskit_consumer", @@ -58,13 +58,15 @@ dependencies = [ "futures-util", "once_cell", "serde", + "tokio", + "tokio-stream", "zbus 3.15.2", ] [[package]] name = "accesskit_windows" version = "0.16.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" dependencies = [ "accesskit", "accesskit_consumer", @@ -77,7 +79,7 @@ dependencies = [ [[package]] name = "accesskit_winit" version = "0.18.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" dependencies = [ "accesskit", "accesskit_macos", @@ -912,7 +914,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "objc", "objc-foundation", @@ -922,7 +924,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "dnd", "mime 0.1.0", @@ -932,7 +934,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "thiserror", "x11rb", @@ -1103,7 +1105,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1122,7 +1124,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "quote", "syn 1.0.109", @@ -1172,8 +1174,8 @@ dependencies = [ [[package]] name = "cosmic-text" -version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#8bb45d7aca5b4a109924f3162d670297b6bd4a19" +version = "0.12.0" +source = "git+https://github.com/pop-os/cosmic-text.git#a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f" dependencies = [ "bitflags 2.5.0", "fontdb", @@ -1181,11 +1183,11 @@ dependencies = [ "rangemap", "rayon", "rustc-hash", - "rustybuzz", + "rustybuzz 0.14.1", "self_cell 1.0.4", "swash", "sys-locale", - "ttf-parser 0.20.0", + "ttf-parser 0.21.1", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -1195,7 +1197,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "almost", "cosmic-config", @@ -1511,7 +1513,7 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "bitflags 2.5.0", "mime 0.1.0", @@ -2594,7 +2596,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "dnd", "iced_accessibility", @@ -2613,7 +2615,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "accesskit", "accesskit_unix", @@ -2623,7 +2625,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2645,7 +2647,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "futures", "iced_core", @@ -2658,7 +2660,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2682,7 +2684,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2694,7 +2696,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "dnd", "iced_accessibility", @@ -2708,7 +2710,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "enum-repr", "float-cmp", @@ -2735,7 +2737,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "iced_core", "once_cell", @@ -2745,7 +2747,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "bytemuck", "cosmic-text", @@ -2762,7 +2764,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2788,7 +2790,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "dnd", "iced_accessibility", @@ -2805,7 +2807,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "dnd", "iced_accessibility", @@ -3283,7 +3285,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" +source = "git+https://github.com/pop-os/libcosmic.git#bfbff0773a0a6e067c931bee0ad169b143bc45de" dependencies = [ "apply", "ashpd", @@ -3563,7 +3565,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "smithay-clipboard", ] @@ -4755,11 +4757,27 @@ checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ "bitflags 2.5.0", "bytemuck", - "libm", "smallvec", "ttf-parser 0.20.0", - "unicode-bidi-mirroring", - "unicode-ccc", + "unicode-bidi-mirroring 0.1.0", + "unicode-ccc 0.1.2", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring 0.2.0", + "unicode-ccc 0.2.0", "unicode-properties", "unicode-script", ] @@ -4938,6 +4956,16 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "skrifa" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +dependencies = [ + "bytemuck", + "read-fonts", +] + [[package]] name = "slab" version = "0.4.9" @@ -5154,11 +5182,11 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "682a612b50baf09e8a039547ecf49e6c155690dcb751b1bcb19c93cdeb3d42d4" +checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" dependencies = [ - "read-fonts", + "skrifa", "yazi", "zeno", ] @@ -5467,6 +5495,17 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.5.11" @@ -5687,12 +5726,24 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +[[package]] +name = "unicode-bidi-mirroring" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" + [[package]] name = "unicode-ccc" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +[[package]] +name = "unicode-ccc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" + [[package]] name = "unicode-ident" version = "1.0.12" @@ -5801,7 +5852,7 @@ dependencies = [ "fontdb", "kurbo", "log", - "rustybuzz", + "rustybuzz 0.12.1", "unicode-bidi", "unicode-script", "unicode-vo", @@ -6273,7 +6324,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "clipboard-win", "clipboard_macos", @@ -6852,6 +6903,7 @@ dependencies = [ "serde_repr", "sha1", "static_assertions", + "tokio", "tracing", "uds_windows", "winapi",