-
Notifications
You must be signed in to change notification settings - Fork 89
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: update libcosmic #168
Conversation
Cargo.toml
Outdated
sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" } | ||
[patch.crates-io] | ||
sctk = { package = "smithay-client-toolkit", git = "https://github.com/pop-os/client-toolkit", branch = "wayland-resize" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like the function added in wayland-resize
isn't actually needed (though it looks like something that could be PRed and merged into upstream sctk?), and overriding both of these to e63ab5f
works? (Or the most recent commit could be used, but it doesn't matter much.)
Unless that breaks vendoring or something...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, that branch is sctk 0.16, not 0.18? And sctk-adwaita is using it? So I guess this does avoid duplicating that dependency. Though it's awkward.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ya, it's a bit awkward. I'll try figuring out a better solution for it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pop-os/iced#88 & pop-os/libcosmic#238 seem to fix it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Avoiding winit
when it isn't needed is definitely an improvement.
So this line can be removed, along with a cargo update
to pull in the new version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes it should be able to be removed now
3eab6a9
to
dc7327c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The last change also fixes a cargo --frozen
error I was getting building this locally with fakeroot make -f debian/rules clean binary
.
Seems to work normally, and everything here looks good.
No description provided.