Skip to content
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

Merged
merged 2 commits into from
Dec 11, 2023
Merged

chore: update libcosmic #168

merged 2 commits into from
Dec 11, 2023

Conversation

wash2
Copy link
Contributor

@wash2 wash2 commented Dec 8, 2023

No description provided.

@wash2 wash2 requested a review from a team December 8, 2023 22:20
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" }
Copy link
Member

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...

Copy link
Member

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.

Copy link
Contributor Author

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.

Copy link
Contributor Author

@wash2 wash2 Dec 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

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?

Copy link
Contributor Author

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

Copy link
Member

@ids1024 ids1024 left a 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.

@wash2 wash2 merged commit e5db5ab into master_jammy Dec 11, 2023
7 checks passed
@wash2 wash2 deleted the update-libcosmic_jammy branch January 17, 2024 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants