diff --git a/Cargo.lock b/Cargo.lock index 2d0afd6..ae07066 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -878,7 +878,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-5#12a1a20dde4403ee37d44a2a2575a2eeb4c1d5b4" dependencies = [ "objc", "objc-foundation", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-5#12a1a20dde4403ee37d44a2a2575a2eeb4c1d5b4" dependencies = [ "dnd", "mime 0.1.0", @@ -898,7 +898,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-5#12a1a20dde4403ee37d44a2a2575a2eeb4c1d5b4" dependencies = [ "thiserror", "x11rb", @@ -1069,7 +1069,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "quote", "syn 1.0.109", @@ -1156,7 +1156,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "almost", "cosmic-config", @@ -1475,12 +1475,12 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-5#12a1a20dde4403ee37d44a2a2575a2eeb4c1d5b4" dependencies = [ "bitflags 2.5.0", "mime 0.1.0", "raw-window-handle 0.6.1", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit 0.18.0 (git+https://github.com/smithay/client-toolkit?rev=3bed072)", "smithay-clipboard", ] @@ -2613,7 +2613,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -2628,7 +2628,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "dnd", "iced_accessibility", @@ -2646,7 +2646,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "accesskit", "accesskit_winit", @@ -2655,7 +2655,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2675,7 +2675,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "futures", "iced_core", @@ -2688,7 +2688,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2712,7 +2712,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2724,7 +2724,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "dnd", "iced_core", @@ -2736,7 +2736,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "iced_core", "once_cell", @@ -2746,7 +2746,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "bytemuck", "cosmic-text", @@ -2763,7 +2763,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2782,7 +2782,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "dnd", "iced_renderer", @@ -2798,7 +2798,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "dnd", "iced_graphics", @@ -3124,7 +3124,7 @@ checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#8cbf6ad56356af3209e8fb335298072ced6cdcbc" +source = "git+https://github.com/pop-os/libcosmic.git#7a964772c2970d9e6976cbc86df260931de2e83a" dependencies = [ "apply", "ashpd 0.7.0", @@ -3386,7 +3386,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-5#12a1a20dde4403ee37d44a2a2575a2eeb4c1d5b4" dependencies = [ "smithay-clipboard", ] @@ -4787,6 +4787,30 @@ dependencies = [ "xkeysym", ] +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" +source = "git+https://github.com/Smithay/client-toolkit#18070ad8e0675bdf555e6099bf90e3a92adc01b0" +dependencies = [ + "bitflags 2.5.0", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix 0.38.34", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] + [[package]] name = "smithay-client-toolkit" version = "0.18.1" @@ -4815,11 +4839,11 @@ dependencies = [ [[package]] name = "smithay-clipboard" version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-3#2f2430bec35f0adb9cb93e85e648ff8449d44dad" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-4#eefa50c3df5135d98df7f4192e2e9b07eeafe56b" dependencies = [ "libc", "raw-window-handle 0.6.1", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit 0.18.0 (git+https://github.com/Smithay/client-toolkit)", "wayland-backend", ] @@ -5348,9 +5372,9 @@ dependencies = [ [[package]] name = "trash" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1a7a9a17d3b004898be42be29a4c18d5a4cf008b5cdf72d69b1945dfcb158a" +checksum = "c254b119cf49bdde3dfef21b1dc492dc8026b75566ca24aa77993eccd7cbc1b5" dependencies = [ "chrono", "libc", @@ -5359,7 +5383,7 @@ dependencies = [ "once_cell", "scopeguard", "url", - "windows 0.44.0", + "windows 0.56.0", ] [[package]] @@ -5986,7 +6010,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-5#12a1a20dde4403ee37d44a2a2575a2eeb4c1d5b4" dependencies = [ "clipboard-win", "clipboard_macos", @@ -5998,23 +6022,14 @@ dependencies = [ "thiserror", ] -[[package]] -name = "windows" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.48.0", + "windows-interface 0.48.0", "windows-targets 0.48.5", ] @@ -6024,7 +6039,17 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", + "windows-core 0.52.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", "windows-targets 0.52.5", ] @@ -6037,6 +6062,18 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface 0.56.0", + "windows-result", + "windows-targets 0.52.5", +] + [[package]] name = "windows-implement" version = "0.48.0" @@ -6048,6 +6085,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "windows-interface" version = "0.48.0" @@ -6059,6 +6107,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -6342,9 +6410,9 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", "gethostname", @@ -6357,9 +6425,9 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor"