diff --git a/Cargo.lock b/Cargo.lock index 5767038..9d3016e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -257,7 +257,7 @@ dependencies = [ "url", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "zbus 4.2.2", ] @@ -954,7 +954,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" dependencies = [ "objc", "objc-foundation", @@ -964,7 +964,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" dependencies = [ "dnd", "mime", @@ -974,7 +974,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" dependencies = [ "thiserror", "x11rb", @@ -1220,11 +1220,11 @@ dependencies = [ [[package]] name = "cosmic-client-toolkit" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=e4e6f8c#e4e6f8ca4d7c239c02a8cdfd48a74cb0969425eb" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=c8d3a1c#c8d3a1c3d40d16235f4720969a54ed570ec7a976" dependencies = [ "cosmic-protocols", "libc", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.1", "wayland-client", ] @@ -1241,7 +1241,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "atomicwrites", "calloop", @@ -1264,7 +1264,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "quote", "syn 1.0.109", @@ -1279,9 +1279,9 @@ dependencies = [ "cosmic-config", "ron", "serde", - "smithay-client-toolkit", + "smithay-client-toolkit 0.18.0", "tracing", - "wayland-protocols-wlr", + "wayland-protocols-wlr 0.2.0", "xdg-shell-wrapper-config", ] @@ -1293,8 +1293,8 @@ dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", "wayland-scanner", "wayland-server", ] @@ -1312,7 +1312,7 @@ dependencies = [ "tokio", "tracing", "wayland-client", - "wayland-protocols-wlr", + "wayland-protocols-wlr 0.2.0", ] [[package]] @@ -1383,7 +1383,7 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#badfc6a0bbe7c93927fe32692795699a675ae4c4" +source = "git+https://github.com/pop-os/dbus-settings-bindings#1fdfcc8045e6732fc54b2c945008e89999a6cf71" dependencies = [ "zbus 4.2.2", ] @@ -1446,19 +1446,19 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#b0a70c70ffba883ac6ff022b535db195712f552f" +source = "git+https://github.com/pop-os/cosmic-text.git#7677ba388cbce3cc1488f0cf0cc5bfe8194f55d3" dependencies = [ "bitflags 2.5.0", "fontdb", - "libm", "log", "rangemap", + "rayon", "rustc-hash", - "rustybuzz", + "rustybuzz 0.14.1", "self_cell 1.0.4", "swash", "sys-locale", - "ttf-parser", + "ttf-parser 0.21.1", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -1468,7 +1468,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "almost", "cosmic-config", @@ -1764,12 +1764,12 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" dependencies = [ "bitflags 2.5.0", "mime", "raw-window-handle", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.1", "smithay-clipboard", ] @@ -2152,7 +2152,7 @@ dependencies = [ "memmap2 0.9.4", "slotmap", "tinyvec", - "ttf-parser", + "ttf-parser 0.20.0", ] [[package]] @@ -2765,7 +2765,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "dnd", "iced_accessibility", @@ -2783,7 +2783,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "accesskit", "accesskit_unix", @@ -2792,7 +2792,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2803,7 +2803,7 @@ dependencies = [ "palette", "raw-window-handle", "serde", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.1", "smol_str", "thiserror", "web-time", @@ -2814,7 +2814,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "futures", "iced_core", @@ -2827,7 +2827,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2851,7 +2851,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2863,13 +2863,13 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "dnd", "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.1", "thiserror", "window_clipboard", ] @@ -2877,7 +2877,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "enum-repr", "float-cmp", @@ -2889,11 +2889,11 @@ dependencies = [ "itertools 0.12.1", "lazy_static", "raw-window-handle", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.1", "thiserror", "tracing", "wayland-backend", - "wayland-protocols", + "wayland-protocols 0.32.1", "window_clipboard", "xkbcommon", "xkbcommon-dl", @@ -2903,7 +2903,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "iced_core", "once_cell", @@ -2913,7 +2913,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "bytemuck", "cosmic-text", @@ -2930,7 +2930,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2945,10 +2945,10 @@ dependencies = [ "raw-window-handle", "resvg", "rustix 0.38.34", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.1", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-sys", "wgpu", ] @@ -2956,7 +2956,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "dnd", "iced_renderer", @@ -2964,7 +2964,7 @@ dependencies = [ "iced_style", "num-traits", "ouroboros", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.1", "thiserror", "unicode-segmentation", "window_clipboard", @@ -3428,7 +3428,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#f60c6893eb828f0e5c2caa8e0a96938938bb3262" +source = "git+https://github.com/pop-os/libcosmic#ebf5c2738b98ffc68f2930354949f0b0e954d861" dependencies = [ "apply", "ashpd", @@ -3770,7 +3770,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" dependencies = [ "smithay-clipboard", ] @@ -4922,14 +4922,30 @@ name = "rustybuzz" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "smallvec", + "ttf-parser 0.20.0", + "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", - "unicode-bidi-mirroring", - "unicode-ccc", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring 0.2.0", + "unicode-ccc 0.2.0", "unicode-properties", "unicode-script", ] @@ -5122,6 +5138,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" @@ -5166,8 +5192,36 @@ dependencies = [ "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", + "wayland-scanner", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "837d3067369e24aeda699a5d9fc5aa14ca14a84dd70aeed7156bfa04a5605b32" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "pkg-config", + "rustix 0.38.34", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.32.1", + "wayland-protocols-wlr 0.3.1", "wayland-scanner", "xkbcommon", "xkeysym", @@ -5176,11 +5230,11 @@ dependencies = [ [[package]] name = "smithay-clipboard" version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-4#ab422ddcc95a9a1717df094f9c8fe69e2fdb2a27" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#d099e82a4c1e7d3e88dc34b7333de21928b1b22c" dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.1", "wayland-backend", ] @@ -5349,11 +5403,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", ] @@ -5798,6 +5852,12 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + [[package]] name = "type-map" version = "0.5.0" @@ -5867,12 +5927,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" @@ -5990,7 +6062,7 @@ dependencies = [ "fontdb", "kurbo", "log", - "rustybuzz", + "rustybuzz 0.12.1", "unicode-bidi", "unicode-script", "unicode-vo", @@ -6220,6 +6292,18 @@ dependencies = [ "wayland-server", ] +[[package]] +name = "wayland-protocols" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + [[package]] name = "wayland-protocols-wlr" version = "0.2.0" @@ -6229,11 +6313,24 @@ dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-scanner", "wayland-server", ] +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.1", + "wayland-scanner", +] + [[package]] name = "wayland-scanner" version = "0.31.2" @@ -6439,7 +6536,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-7#a5be70405574e98c292537fd3b01a1352550b9bf" dependencies = [ "clipboard-win", "clipboard_macos", @@ -6729,7 +6826,7 @@ version = "0.1.0" source = "git+https://github.com/pop-os/xdg-shell-wrapper#b5480042615ecfcf30262d5a40625e8f430b474a" dependencies = [ "serde", - "wayland-protocols-wlr", + "wayland-protocols-wlr 0.2.0", ] [[package]]