diff --git a/Cargo.lock b/Cargo.lock index 6e16fe60..96d9e504 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1472,14 +1472,13 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "atomicwrites", "cosmic-config-derive", "cosmic-settings-daemon", "dirs", "futures-util", - "iced_futures", + "iced_futures 0.14.0-dev", "known-folders", "notify", "once_cell", @@ -1494,7 +1493,6 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "quote", "syn 1.0.109", @@ -1689,7 +1687,7 @@ source = "git+https://github.com/pop-os/cosmic-settings-subscriptions#ff9883a029 dependencies = [ "cosmic-dbus-networkmanager", "futures", - "iced_futures", + "iced_futures 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "itertools 0.13.0", "libpulse-binding", "log", @@ -1762,7 +1760,6 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "almost", "cosmic-config", @@ -3110,12 +3107,11 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "dnd", "iced_accessibility", - "iced_core", - "iced_futures", + "iced_core 0.14.0-dev", + "iced_futures 0.14.0-dev", "iced_renderer", "iced_widget", "iced_winit", @@ -3128,7 +3124,6 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "accesskit", "accesskit_winit", @@ -3137,7 +3132,6 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "bitflags 2.6.0", "bytes", @@ -3160,12 +3154,33 @@ dependencies = [ ] [[package]] -name = "iced_futures" +name = "iced_core" version = "0.14.0-dev" source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "dnd", + "glam", + "log", + "mime", + "num-traits", + "once_cell", + "palette", + "raw-window-handle", + "rustc-hash 2.0.0", + "smol_str", + "thiserror", + "web-time", + "window_clipboard", +] + +[[package]] +name = "iced_futures" +version = "0.14.0-dev" dependencies = [ "futures", - "iced_core", + "iced_core 0.14.0-dev", "log", "rustc-hash 2.0.0", "tokio", @@ -3173,6 +3188,19 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "iced_futures" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" +dependencies = [ + "futures", + "iced_core 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "log", + "rustc-hash 2.0.0", + "wasm-bindgen-futures", + "wasm-timer", +] + [[package]] name = "iced_glyphon" version = "0.6.0" @@ -3188,14 +3216,13 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "bitflags 2.6.0", "bytemuck", "cosmic-text", "half", - "iced_core", - "iced_futures", + "iced_core 0.14.0-dev", + "iced_futures 0.14.0-dev", "image 0.24.9", "kamadak-exif", "log", @@ -3210,7 +3237,6 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3222,13 +3248,12 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "bytes", "dnd", "iced_accessibility", - "iced_core", - "iced_futures", + "iced_core 0.14.0-dev", + "iced_futures 0.14.0-dev", "raw-window-handle", "smithay-client-toolkit", "thiserror", @@ -3238,7 +3263,6 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "bytemuck", "cosmic-text", @@ -3254,7 +3278,6 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -3285,7 +3308,6 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "dnd", "iced_accessibility", @@ -3304,11 +3326,10 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "dnd", "iced_accessibility", - "iced_futures", + "iced_futures 0.14.0-dev", "iced_graphics", "iced_runtime", "log", @@ -4276,7 +4297,6 @@ checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "apply", "ashpd 0.9.2", @@ -4291,8 +4311,8 @@ dependencies = [ "freedesktop-icons", "iced", "iced_accessibility", - "iced_core", - "iced_futures", + "iced_core 0.14.0-dev", + "iced_futures 0.14.0-dev", "iced_renderer", "iced_runtime", "iced_tiny_skia", diff --git a/Cargo.toml b/Cargo.toml index aebedd48..4f73e6de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,13 +47,13 @@ lto = "thin" cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "bd65e0f2d55429954839c9e6c7bc5b0d198b85f0" } # For development and testing purposes -# [patch.'https://github.com/pop-os/libcosmic'] +[patch.'https://github.com/pop-os/libcosmic'] # libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" } # cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" } # cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" } -# libcosmic = { path = "../libcosmic" } -# cosmic-config = { path = "../libcosmic/cosmic-config" } -# cosmic-theme = { path = "../libcosmic/cosmic-theme" } +libcosmic = { path = "../libcosmic" } +cosmic-config = { path = "../libcosmic/cosmic-config" } +cosmic-theme = { path = "../libcosmic/cosmic-theme" } # [patch.'https://github.com/pop-os/dbus-settings-bindings'] # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }