diff --git a/Cargo.lock b/Cargo.lock index 0084c8d..f307246 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1314,14 +1314,13 @@ dependencies = [ [[package]] name = "cosmic-config" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "atomicwrites", - "cosmic-config-derive", + "cosmic-config-derive 1.0.0", "cosmic-settings-daemon", "dirs 6.0.0", "futures-util", - "iced_futures", + "iced_futures 0.14.0", "known-folders", "notify", "ron 0.12.1", @@ -1332,10 +1331,35 @@ dependencies = [ "zbus 5.14.0", ] +[[package]] +name = "cosmic-config" +version = "1.0.0" +source = "git+https://github.com/pop-os/libcosmic#dad5f1e2731dbdccb3044f136a81f18dfead9de4" +dependencies = [ + "atomicwrites", + "cosmic-config-derive 1.0.0 (git+https://github.com/pop-os/libcosmic)", + "dirs 6.0.0", + "iced_futures 0.14.0 (git+https://github.com/pop-os/libcosmic)", + "known-folders", + "notify", + "ron 0.12.1", + "serde", + "tracing", + "xdg", +] + [[package]] name = "cosmic-config-derive" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "cosmic-config-derive" +version = "1.0.0" +source = "git+https://github.com/pop-os/libcosmic#dad5f1e2731dbdccb3044f136a81f18dfead9de4" dependencies = [ "quote", "syn", @@ -1368,7 +1392,7 @@ dependencies = [ "jiff-icu", "jxl-oxide", "libc", - "libcosmic", + "libcosmic-yoda", "log", "lzma-rust2", "md-5", @@ -1461,7 +1485,7 @@ name = "cosmic-settings-config" version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-settings-daemon#716da6d6af0b252e2f78aba2ad72ee19ae0241e0" dependencies = [ - "cosmic-config", + "cosmic-config 1.0.0 (git+https://github.com/pop-os/libcosmic)", "ron 0.11.0", "serde", "serde_with", @@ -1503,11 +1527,10 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "almost", "configparser", - "cosmic-config", + "cosmic-config 1.0.0", "csscolorparser", "dirs 6.0.0", "palette", @@ -2988,13 +3011,12 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "dnd", "iced_accessibility", - "iced_core", + "iced_core 0.14.0", "iced_debug", - "iced_futures", + "iced_futures 0.14.0", "iced_program", "iced_renderer", "iced_runtime", @@ -3009,7 +3031,6 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "accesskit", "accesskit_winit", @@ -3018,7 +3039,6 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "bitflags 2.11.1", "bytes", @@ -3039,23 +3059,43 @@ dependencies = [ "window_clipboard", ] +[[package]] +name = "iced_core" +version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#dad5f1e2731dbdccb3044f136a81f18dfead9de4" +dependencies = [ + "bitflags 2.11.1", + "bytes", + "dnd", + "glam", + "lilt", + "log", + "mime 0.1.0", + "num-traits", + "palette", + "raw-window-handle", + "rustc-hash 2.1.2", + "smol_str", + "thiserror 2.0.18", + "web-time", + "window_clipboard", +] + [[package]] name = "iced_debug" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ - "iced_core", - "iced_futures", + "iced_core 0.14.0", + "iced_futures 0.14.0", "log", ] [[package]] name = "iced_futures" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "futures", - "iced_core", + "iced_core 0.14.0", "log", "rustc-hash 2.1.2", "tokio", @@ -3063,17 +3103,29 @@ dependencies = [ "wasmtimer", ] +[[package]] +name = "iced_futures" +version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#dad5f1e2731dbdccb3044f136a81f18dfead9de4" +dependencies = [ + "futures", + "iced_core 0.14.0 (git+https://github.com/pop-os/libcosmic)", + "log", + "rustc-hash 2.1.2", + "wasm-bindgen-futures", + "wasmtimer", +] + [[package]] name = "iced_graphics" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "bitflags 2.11.1", "bytemuck", "cosmic-text", "half", - "iced_core", - "iced_futures", + "iced_core 0.14.0", + "iced_futures 0.14.0", "image", "kamadak-exif", "log", @@ -3087,7 +3139,6 @@ dependencies = [ [[package]] name = "iced_program" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "iced_graphics", "iced_runtime", @@ -3096,7 +3147,6 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3108,13 +3158,12 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "bytes", "cosmic-client-toolkit", "dnd", - "iced_core", - "iced_futures", + "iced_core 0.14.0", + "iced_futures 0.14.0", "raw-window-handle", "thiserror 2.0.18", "window_clipboard", @@ -3123,7 +3172,6 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "bytemuck", "cosmic-text", @@ -3140,7 +3188,6 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "as-raw-xcb-connection", "bitflags 2.11.1", @@ -3171,7 +3218,6 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.2" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3189,13 +3235,12 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "cosmic-client-toolkit", "cursor-icon", "dnd", "iced_debug", - "iced_futures", + "iced_futures 0.14.0", "iced_graphics", "iced_program", "iced_runtime", @@ -4309,15 +4354,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" [[package]] -name = "libcosmic" -version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#c423ad1bfc25057922406c687f2ddc75ead5ab67" +name = "libcosmic-yoda" +version = "0.1.0-yoda" dependencies = [ "apply", "ashpd 0.12.3", "auto_enums", "cosmic-client-toolkit", - "cosmic-config", + "cosmic-config 1.0.0", "cosmic-freedesktop-icons", "cosmic-settings-config", "cosmic-settings-daemon", @@ -4330,8 +4374,8 @@ dependencies = [ "i18n-embed", "i18n-embed-fl", "iced", - "iced_core", - "iced_futures", + "iced_core 0.14.0", + "iced_futures 0.14.0", "iced_renderer", "iced_runtime", "iced_tiny_skia", diff --git a/Cargo.toml b/Cargo.toml index 8f81194..aa69d13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,8 +72,9 @@ version = "0.18" default-features = false features = ["fs", "io", "macros", "polling", "runtime"] -[dependencies.libcosmic] -git = "https://github.com/pop-os/libcosmic.git" +# Yoda fork — depend on libcosmic-yoda directly by path (no git/no patch). +[dependencies.libcosmic-yoda] +path = "../libcosmic" default-features = false #TODO: a11y feature crashes features = [ @@ -82,7 +83,7 @@ features = [ "autosize", "multi-window", "tokio", - "winit", + "wayland", "surface-message", ] @@ -110,15 +111,15 @@ default = [ "wayland", "wgpu", ] -dbus-config = ["libcosmic/dbus-config"] -desktop = ["libcosmic/desktop", "dep:cosmic-mime-apps", "dep:xdg"] +dbus-config = ["libcosmic-yoda/dbus-config"] +desktop = ["libcosmic-yoda/desktop", "dep:cosmic-mime-apps", "dep:xdg"] desktop-applet = [] gvfs = ["dep:gio", "dep:glib"] io-uring = ["compio/io-uring"] jemalloc = ["dep:tikv-jemallocator"] notify = ["dep:notify-rust"] -wayland = ["libcosmic/wayland", "dep:cctk", "dep:wayland-client"] -wgpu = ["libcosmic/wgpu"] +wayland = ["libcosmic-yoda/wayland", "dep:cctk", "dep:wayland-client"] +wgpu = ["libcosmic-yoda/wgpu"] [profile.dev] opt-level = 1 @@ -144,19 +145,9 @@ fastrand = "2" test-log = "0.2" tokio = { version = "1", features = ["rt", "macros"] } -# [patch.'https://github.com/pop-os/cosmic-text'] -# cosmic-text = { path = "../cosmic-text" } - -[patch.'https://github.com/pop-os/libcosmic'] -libcosmic = { path = "../libcosmic" } -cosmic-config = { path = "../libcosmic/cosmic-config" } -cosmic-theme = { path = "../libcosmic/cosmic-theme" } -iced_futures = { path = "../libcosmic/iced/futures" } -iced_winit = { path = "../libcosmic/iced/winit" } - - -# [patch.'https://github.com/pop-os/smithay-clipboard'] -# smithay-clipboard = { path = "../smithay-clipboard" } +# Yoda fork — libcosmic dep is now a direct path dep (libcosmic-yoda above), +# no [patch] block needed anymore. Keeping the block below would be a no-op +# since nothing in the dep graph still asks for pop-os/libcosmic.git. [workspace] members = ["cosmic-files-applet"]