From 334faa6de0e5dc1062c21173a40e0419dc88e2d9 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Wed, 12 Jun 2024 14:58:06 -0400 Subject: [PATCH] update libcosmic fixes navbard dnd --- Cargo.lock | 146 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 86 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 80a76d3..ad28cdf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -903,7 +903,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", @@ -913,7 +913,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 0.1.0", @@ -923,7 +923,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", @@ -1094,7 +1094,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1113,7 +1113,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "quote", "syn 1.0.109", @@ -1164,7 +1164,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#93a7df859a4fb4f7d450f1bb5614b6d4a4a68c21" +source = "git+https://github.com/pop-os/cosmic-text.git#8bb45d7aca5b4a109924f3162d670297b6bd4a19" dependencies = [ "bitflags 2.5.0", "fontdb", @@ -1186,7 +1186,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "almost", "cosmic-config", @@ -1502,12 +1502,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 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit 0.19.1", "smithay-clipboard", ] @@ -2571,7 +2571,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "dnd", "iced_accessibility", @@ -2589,7 +2589,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "accesskit", "accesskit_winit", @@ -2598,7 +2598,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2618,7 +2618,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "futures", "iced_core", @@ -2631,7 +2631,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2655,7 +2655,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2667,7 +2667,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "dnd", "iced_core", @@ -2679,7 +2679,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "iced_core", "once_cell", @@ -2689,7 +2689,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "bytemuck", "cosmic-text", @@ -2706,7 +2706,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2721,10 +2721,10 @@ dependencies = [ "raw-window-handle", "resvg", "rustix 0.38.34", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit 0.19.1", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-sys", "wgpu", ] @@ -2732,7 +2732,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "dnd", "iced_renderer", @@ -2748,7 +2748,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "dnd", "iced_graphics", @@ -3216,7 +3216,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#f1aad68b712650b3c697834e1043f3dcc943c9e7" +source = "git+https://github.com/pop-os/libcosmic.git#d2b35319842869bfa89b1fd2fa0d3a6f7b5e8dd9" dependencies = [ "apply", "ashpd", @@ -3495,7 +3495,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", ] @@ -4882,33 +4882,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.0" -source = "git+https://github.com/smithay/client-toolkit?rev=3bed072#3bed072b966022f5f929d12f3aff089b1ace980b" -dependencies = [ - "bitflags 2.5.0", - "bytemuck", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", - "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", - "wayland-protocols-wlr", - "wayland-scanner", - "xkbcommon", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.18.1" @@ -4928,20 +4901,48 @@ 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", "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 0.13.0", + "calloop-wayland-source 0.3.0", + "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", +] + [[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 0.18.0", + "smithay-client-toolkit 0.19.1", "wayland-backend", ] @@ -5949,6 +5950,18 @@ dependencies = [ "wayland-scanner", ] +[[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-plasma" version = "0.2.0" @@ -5958,7 +5971,7 @@ dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-scanner", ] @@ -5971,7 +5984,20 @@ dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[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", ] @@ -6166,7 +6192,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", @@ -6525,7 +6551,7 @@ dependencies = [ "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-protocols-plasma", "web-sys", "web-time",