diff --git a/Cargo.lock b/Cargo.lock index 441d867..1140ab9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,7 +223,7 @@ dependencies = [ "url", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "zbus 4.2.2", ] @@ -522,9 +522,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -766,7 +766,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", @@ -776,7 +776,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", @@ -786,7 +786,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", @@ -956,7 +956,7 @@ dependencies = [ [[package]] name = "cosmic-bg-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-bg#633b6310309c728051df62b754514b4bf175dfc8" +source = "git+https://github.com/pop-os/cosmic-bg#2259f5ac81099a8215d5ff69cba1ec0d1fd850d1" dependencies = [ "colorgrad", "cosmic-config", @@ -970,7 +970,7 @@ 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", @@ -981,7 +981,7 @@ dependencies = [ [[package]] name = "cosmic-comp-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-comp#036ca84829689843f86b50ea30d873b41a73b052" +source = "git+https://github.com/pop-os/cosmic-comp#fb88f389c38f6d3981341317af157576127e1cfe" dependencies = [ "cosmic-config", "input", @@ -991,7 +991,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "atomicwrites", "calloop", @@ -1011,7 +1011,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "quote", "syn 1.0.109", @@ -1020,12 +1020,13 @@ dependencies = [ [[package]] name = "cosmic-protocols" 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 = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.32.1", + "wayland-protocols-wlr", "wayland-scanner", "wayland-server", ] @@ -1033,7 +1034,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#a3a6262e5d654bf6d110f18e6b7b8a31a764e64f" +source = "git+https://github.com/pop-os/cosmic-text.git#a46e992396343575748209831202dded4d54ec0f" dependencies = [ "bitflags 2.5.0", "fontdb", @@ -1055,7 +1056,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "almost", "cosmic-config", @@ -1096,7 +1097,7 @@ dependencies = [ "rust-embed", "rustix 0.38.34", "tokio", - "wayland-protocols", + "wayland-protocols 0.32.1", "zbus 4.2.2", ] @@ -1383,7 +1384,7 @@ 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", @@ -2383,7 +2384,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "dnd", "iced_accessibility", @@ -2401,7 +2402,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "accesskit", "accesskit_unix", @@ -2410,7 +2411,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2432,7 +2433,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "futures", "iced_core", @@ -2445,7 +2446,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2469,7 +2470,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2481,7 +2482,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "dnd", "iced_accessibility", @@ -2495,7 +2496,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "enum-repr", "float-cmp", @@ -2511,7 +2512,7 @@ dependencies = [ "thiserror", "tracing", "wayland-backend", - "wayland-protocols", + "wayland-protocols 0.32.1", "window_clipboard", "xkbcommon", "xkbcommon-dl", @@ -2521,7 +2522,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "iced_core", "once_cell", @@ -2531,7 +2532,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "bytemuck", "cosmic-text", @@ -2548,7 +2549,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2566,7 +2567,7 @@ dependencies = [ "smithay-client-toolkit", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-sys", "wgpu", ] @@ -2574,7 +2575,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "dnd", "iced_renderer", @@ -2967,7 +2968,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#7abcec759101c624329cccb1b63924a748ed04ae" +source = "git+https://github.com/pop-os/libcosmic#cbf9252b9d31d7ed50457aea5040d06696cb8321" dependencies = [ "apply", "ashpd", @@ -3233,7 +3234,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", ] @@ -3455,9 +3456,9 @@ dependencies = [ [[package]] name = "object" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -4329,8 +4330,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.18.0" -source = "git+https://github.com/smithay/client-toolkit?rev=3bed072#3bed072b966022f5f929d12f3aff089b1ace980b" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "837d3067369e24aeda699a5d9fc5aa14ca14a84dd70aeed7156bfa04a5605b32" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -4347,7 +4349,7 @@ dependencies = [ "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-protocols-wlr", "wayland-scanner", "xkbcommon", @@ -4357,7 +4359,7 @@ 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#ab1750a028b486548b9c1f57820c21564a8bd0ac" dependencies = [ "libc", "raw-window-handle", @@ -5188,6 +5190,18 @@ name = "wayland-protocols" version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "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", @@ -5198,15 +5212,16 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-scanner", + "wayland-server", ] [[package]] @@ -5416,7 +5431,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", diff --git a/Cargo.toml b/Cargo.toml index 87c0c62..15a5745 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ freedesktop-icons = "0.2.4" memmap2 = "0.9.0" tokio = "1.23.0" -wayland-protocols = "0.31.0" +wayland-protocols = "0.32.1" zbus = { version = "4.0.0", default-features = false, features = ["tokio"] } once_cell = "1.18.0" delegate = "0.12.0"