chore: use local COSMIC support crates
This commit is contained in:
parent
d6c245d809
commit
36ade6cf65
2 changed files with 26 additions and 171 deletions
184
Cargo.lock
generated
184
Cargo.lock
generated
|
|
@ -992,7 +992,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "clipboard_macos"
|
||||
version = "0.1.0"
|
||||
source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
|
||||
dependencies = [
|
||||
"objc",
|
||||
"objc-foundation",
|
||||
|
|
@ -1002,22 +1001,12 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "clipboard_wayland"
|
||||
version = "0.2.2"
|
||||
source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
|
||||
dependencies = [
|
||||
"dnd",
|
||||
"mime 0.1.0",
|
||||
"smithay-clipboard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clipboard_x11"
|
||||
version = "0.4.2"
|
||||
source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
|
||||
dependencies = [
|
||||
"thiserror 1.0.69",
|
||||
"x11rb",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cmov"
|
||||
version = "0.5.3"
|
||||
|
|
@ -1326,23 +1315,9 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cosmic-client-toolkit"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/pop-os/cosmic-protocols?rev=160b086#160b086abe03cd34a8a375d7fbe47b24308d1f38"
|
||||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"cosmic-protocols 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)",
|
||||
"libc",
|
||||
"smithay-client-toolkit",
|
||||
"wayland-client",
|
||||
"wayland-protocols",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cosmic-client-toolkit"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1#c253ec1d6804afbcdf250f5cc37ae1194bba7bd2"
|
||||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"cosmic-protocols 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1)",
|
||||
"cosmic-protocols",
|
||||
"libc",
|
||||
"smithay-client-toolkit",
|
||||
"wayland-client",
|
||||
|
|
@ -1354,11 +1329,11 @@ name = "cosmic-config"
|
|||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"atomicwrites",
|
||||
"cosmic-config-derive 1.0.0",
|
||||
"cosmic-config-derive",
|
||||
"cosmic-settings-daemon",
|
||||
"dirs 6.0.0",
|
||||
"futures-util",
|
||||
"iced_futures 0.14.0",
|
||||
"iced_futures",
|
||||
"known-folders",
|
||||
"notify",
|
||||
"ron 0.12.1",
|
||||
|
|
@ -1369,23 +1344,6 @@ dependencies = [
|
|||
"zbus 5.15.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cosmic-config"
|
||||
version = "1.0.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#8fa6a01d049905ce99eb9adf8415b2fa73611818"
|
||||
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"
|
||||
|
|
@ -1394,15 +1352,6 @@ dependencies = [
|
|||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cosmic-config-derive"
|
||||
version = "1.0.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#8fa6a01d049905ce99eb9adf8415b2fa73611818"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cosmic-files"
|
||||
version = "1.0.13"
|
||||
|
|
@ -1412,7 +1361,7 @@ dependencies = [
|
|||
"bstr",
|
||||
"bzip2",
|
||||
"compio",
|
||||
"cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)",
|
||||
"cosmic-client-toolkit",
|
||||
"cosmic-mime-apps",
|
||||
"dirs 6.0.0",
|
||||
"fastrand",
|
||||
|
|
@ -1508,21 +1457,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cosmic-protocols"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/pop-os/cosmic-protocols?rev=160b086#160b086abe03cd34a8a375d7fbe47b24308d1f38"
|
||||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"wayland-backend",
|
||||
"wayland-client",
|
||||
"wayland-protocols",
|
||||
"wayland-protocols-wlr",
|
||||
"wayland-scanner",
|
||||
"wayland-server",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cosmic-protocols"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1#c253ec1d6804afbcdf250f5cc37ae1194bba7bd2"
|
||||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"wayland-backend",
|
||||
|
|
@ -1536,9 +1470,8 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cosmic-settings-config"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47"
|
||||
dependencies = [
|
||||
"cosmic-config 1.0.0 (git+https://github.com/pop-os/libcosmic)",
|
||||
"cosmic-config",
|
||||
"ron 0.11.0",
|
||||
"serde",
|
||||
"serde_with",
|
||||
|
|
@ -1582,7 +1515,7 @@ version = "1.0.0"
|
|||
dependencies = [
|
||||
"almost",
|
||||
"configparser",
|
||||
"cosmic-config 1.0.0",
|
||||
"cosmic-config",
|
||||
"csscolorparser",
|
||||
"dirs 6.0.0",
|
||||
"palette",
|
||||
|
|
@ -1964,7 +1897,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "dnd"
|
||||
version = "0.1.0"
|
||||
source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
|
||||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"mime 0.1.0",
|
||||
|
|
@ -2563,16 +2495,6 @@ dependencies = [
|
|||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gethostname"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
|
||||
dependencies = [
|
||||
"rustix 1.1.4",
|
||||
"windows-link 0.2.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.17"
|
||||
|
|
@ -3060,9 +2982,9 @@ version = "0.14.0"
|
|||
dependencies = [
|
||||
"dnd",
|
||||
"iced_accessibility",
|
||||
"iced_core 0.14.0",
|
||||
"iced_core",
|
||||
"iced_debug",
|
||||
"iced_futures 0.14.0",
|
||||
"iced_futures",
|
||||
"iced_program",
|
||||
"iced_renderer",
|
||||
"iced_runtime",
|
||||
|
|
@ -3088,7 +3010,7 @@ version = "0.14.0"
|
|||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"bytes",
|
||||
"cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)",
|
||||
"cosmic-client-toolkit",
|
||||
"dnd",
|
||||
"glam",
|
||||
"lilt",
|
||||
|
|
@ -3105,35 +3027,12 @@ dependencies = [
|
|||
"window_clipboard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "iced_core"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#8fa6a01d049905ce99eb9adf8415b2fa73611818"
|
||||
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",
|
||||
"unicode-segmentation",
|
||||
"web-time",
|
||||
"window_clipboard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "iced_debug"
|
||||
version = "0.14.0"
|
||||
dependencies = [
|
||||
"iced_core 0.14.0",
|
||||
"iced_futures 0.14.0",
|
||||
"iced_core",
|
||||
"iced_futures",
|
||||
"log",
|
||||
]
|
||||
|
||||
|
|
@ -3142,7 +3041,7 @@ name = "iced_futures"
|
|||
version = "0.14.0"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_core 0.14.0",
|
||||
"iced_core",
|
||||
"log",
|
||||
"rustc-hash 2.1.2",
|
||||
"tokio",
|
||||
|
|
@ -3150,19 +3049,6 @@ dependencies = [
|
|||
"wasmtimer",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "iced_futures"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#8fa6a01d049905ce99eb9adf8415b2fa73611818"
|
||||
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"
|
||||
|
|
@ -3171,8 +3057,8 @@ dependencies = [
|
|||
"bytemuck",
|
||||
"cosmic-text",
|
||||
"half",
|
||||
"iced_core 0.14.0",
|
||||
"iced_futures 0.14.0",
|
||||
"iced_core",
|
||||
"iced_futures",
|
||||
"image",
|
||||
"kamadak-exif",
|
||||
"log",
|
||||
|
|
@ -3207,10 +3093,10 @@ name = "iced_runtime"
|
|||
version = "0.14.0"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)",
|
||||
"cosmic-client-toolkit",
|
||||
"dnd",
|
||||
"iced_core 0.14.0",
|
||||
"iced_futures 0.14.0",
|
||||
"iced_core",
|
||||
"iced_futures",
|
||||
"raw-window-handle",
|
||||
"thiserror 2.0.18",
|
||||
"window_clipboard",
|
||||
|
|
@ -3238,7 +3124,7 @@ version = "0.14.0"
|
|||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"bytemuck",
|
||||
"cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)",
|
||||
"cosmic-client-toolkit",
|
||||
"cryoglyph",
|
||||
"futures",
|
||||
"glam",
|
||||
|
|
@ -3263,7 +3149,7 @@ dependencies = [
|
|||
name = "iced_widget"
|
||||
version = "0.14.2"
|
||||
dependencies = [
|
||||
"cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)",
|
||||
"cosmic-client-toolkit",
|
||||
"dnd",
|
||||
"iced_renderer",
|
||||
"iced_runtime",
|
||||
|
|
@ -3280,11 +3166,11 @@ dependencies = [
|
|||
name = "iced_winit"
|
||||
version = "0.14.0"
|
||||
dependencies = [
|
||||
"cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)",
|
||||
"cosmic-client-toolkit",
|
||||
"cursor-icon",
|
||||
"dnd",
|
||||
"iced_debug",
|
||||
"iced_futures 0.14.0",
|
||||
"iced_futures",
|
||||
"iced_graphics",
|
||||
"iced_program",
|
||||
"iced_runtime",
|
||||
|
|
@ -4404,8 +4290,8 @@ dependencies = [
|
|||
"apply",
|
||||
"ashpd 0.12.3",
|
||||
"auto_enums",
|
||||
"cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1)",
|
||||
"cosmic-config 1.0.0",
|
||||
"cosmic-client-toolkit",
|
||||
"cosmic-config",
|
||||
"cosmic-freedesktop-icons",
|
||||
"cosmic-settings-config",
|
||||
"cosmic-settings-daemon",
|
||||
|
|
@ -4418,8 +4304,8 @@ dependencies = [
|
|||
"i18n-embed",
|
||||
"i18n-embed-fl",
|
||||
"iced",
|
||||
"iced_core 0.14.0",
|
||||
"iced_futures 0.14.0",
|
||||
"iced_core",
|
||||
"iced_futures",
|
||||
"iced_renderer",
|
||||
"iced_runtime",
|
||||
"iced_tiny_skia",
|
||||
|
|
@ -4745,7 +4631,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "mime"
|
||||
version = "0.1.0"
|
||||
source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
|
||||
dependencies = [
|
||||
"smithay-clipboard",
|
||||
]
|
||||
|
|
@ -8112,12 +7997,10 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
|||
[[package]]
|
||||
name = "window_clipboard"
|
||||
version = "0.4.1"
|
||||
source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
|
||||
dependencies = [
|
||||
"clipboard-win",
|
||||
"clipboard_macos",
|
||||
"clipboard_wayland",
|
||||
"clipboard_x11",
|
||||
"dnd",
|
||||
"mime 0.1.0",
|
||||
"raw-window-handle",
|
||||
|
|
@ -8937,23 +8820,6 @@ dependencies = [
|
|||
"either",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "x11rb"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
|
||||
dependencies = [
|
||||
"gethostname",
|
||||
"rustix 1.1.4",
|
||||
"x11rb-protocol",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "x11rb-protocol"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
|
||||
|
||||
[[package]]
|
||||
name = "xattr"
|
||||
version = "1.6.1"
|
||||
|
|
|
|||
13
Cargo.toml
13
Cargo.toml
|
|
@ -11,7 +11,7 @@ anyhow = "1"
|
|||
jiff = "0.2"
|
||||
jiff-icu = "0.2"
|
||||
icu = { version = "2.2.0", features = ["compiled_data"] }
|
||||
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "160b086", optional = true }
|
||||
cctk = { path = "../cosmic-protocols/client-toolkit", package = "cosmic-client-toolkit", optional = true }
|
||||
cosmic-mime-apps = { git = "https://github.com/pop-os/cosmic-mime-apps.git", optional = true }
|
||||
dirs = "6.0.0"
|
||||
gio = { version = "0.21", optional = true }
|
||||
|
|
@ -150,17 +150,6 @@ tokio = { version = "1", features = ["rt", "macros"] }
|
|||
# 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.
|
||||
|
||||
# Yoda wayland cut: redirect window_clipboard (x11 gated behind opt-in
|
||||
# feature) to our public Forgejo fork and cosmic-text to the local checkout
|
||||
# carrying PR#503 plus the EAW monospace width fix. The window_clipboard patch
|
||||
# is needed to consolidate the
|
||||
# upstream pop-os/libcosmic chain (pulled by cosmic-settings-daemon) onto
|
||||
# the same fork iced uses, otherwise cargo compiles two versions.
|
||||
[patch.'https://github.com/pop-os/window_clipboard.git']
|
||||
window_clipboard = { git = "https://forge.aditua.com/leyoda/window_clipboard.git", branch = "yoda-x11-optional" }
|
||||
dnd = { git = "https://forge.aditua.com/leyoda/window_clipboard.git", branch = "yoda-x11-optional" }
|
||||
mime = { git = "https://forge.aditua.com/leyoda/window_clipboard.git", branch = "yoda-x11-optional" }
|
||||
|
||||
[patch.'https://github.com/pop-os/cosmic-text.git']
|
||||
cosmic-text = { path = "../cosmic-text" }
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue