fix: depend on libcosmic-yoda under the cosmic extern name
The local libcosmic fork renamed its package to libcosmic-yoda, but this workspace still asked for `libcosmic` by path, so the whole workspace failed to resolve. Naming the dependency key `libcosmic` with `package = "libcosmic-yoda"` is not enough: a renamed dependency takes its key as the extern name, so the 67 source files that `use cosmic::` would stop compiling. Key the dependency `cosmic` instead, matching every other repo in the local stack, and update the `libcosmic/*` feature strings accordingly. Also carried in this commit, from earlier work in the tree: the sctk workspace dependency pinned back to smithay-client-toolkit 0.20.0. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
0186f5de15
commit
a44a022144
4 changed files with 30 additions and 29 deletions
|
|
@ -48,7 +48,7 @@ image.workspace = true
|
|||
indexmap = "2.13.0"
|
||||
itertools = "0.14.0"
|
||||
itoa = "1.0.17"
|
||||
libcosmic.workspace = true
|
||||
cosmic.workspace = true
|
||||
iced_winit.workspace = true
|
||||
locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
|
||||
sysinfo = { version = "=0.38.0", optional = true }
|
||||
|
|
@ -187,12 +187,12 @@ page-window-management = ["cosmic-comp-config", "dep:cosmic-settings-config"]
|
|||
page-workspaces = ["cosmic-comp-config"]
|
||||
|
||||
# Other features
|
||||
a11y = ["libcosmic/a11y"]
|
||||
a11y = ["cosmic/a11y"]
|
||||
ashpd = ["dep:ashpd"]
|
||||
cosmic-comp-config = ["dep:cosmic-comp-config"]
|
||||
dbus-config = ["libcosmic/dbus-config", "cosmic-config/dbus"]
|
||||
single-instance = ["libcosmic/single-instance"]
|
||||
dbus-config = ["cosmic/dbus-config", "cosmic-config/dbus"]
|
||||
single-instance = ["cosmic/single-instance"]
|
||||
test = []
|
||||
wayland = ["libcosmic/wayland", "dep:cosmic-panel-config", "dep:cosmic-randr", "iced_winit/cctk"]
|
||||
wgpu = ["libcosmic/wgpu"]
|
||||
xdg-portal = ["ashpd", "libcosmic/xdg-portal"]
|
||||
wayland = ["cosmic/wayland", "dep:cosmic-panel-config", "dep:cosmic-randr", "iced_winit/cctk"]
|
||||
wgpu = ["cosmic/wgpu"]
|
||||
xdg-portal = ["ashpd", "cosmic/xdg-portal"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue