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

wlroots: update to 0.11.0 #23598

Closed
wants to merge 6 commits into from
Closed

Conversation

ifreund
Copy link
Contributor

@ifreund ifreund commented Jul 16, 2020

This version has breaking changes, so we need to wait on new releases for the following programs and include bumps in this PR:

  • sway
  • cage
  • hikari
  • wayfire

@ericonr
Copy link
Member

ericonr commented Jul 16, 2020

Thanks for getting started on this! I'm following wayfire.

@ahesford might know something about hikari?

Not sure how it will work out for cage, we already carry a patch to make it work with 0.10.0.

@ericonr
Copy link
Member

ericonr commented Jul 16, 2020

Or well, 2h old release: https://github.com/Hjdskes/cage/releases/tag/v0.1.2.1

@ahesford
Copy link
Member

hikari seems to build against this update and runs, at least on x86_64. Please bump hikari and, if it passes CI for the other archs, I'm content.

@ahesford
Copy link
Member

Given that Wayfire #595 was merged, why not just pull the patch into Void's wayfire package and wrap up this work?

@ericonr
Copy link
Member

ericonr commented Jul 16, 2020

@ahesford that one was just being explicit about the dependencies. See WayfireWM/wayfire#596

@ifreund
Copy link
Contributor Author

ifreund commented Jul 16, 2020

I wrote a trivial patch to make wayfire 0.4.0 build with wlroots 0.11.0 as it looks like we'll be waiting a couple of weeks for a release.

As far as I know this is good to go now.

@ifreund ifreund marked this pull request as ready for review July 16, 2020 20:21
@ericonr
Copy link
Member

ericonr commented Jul 16, 2020

For wayfire:

-makedepends="xcb-util-wm-devel xcb-util-errors-devel glm cairo-devel wf-config-devel"
+makedepends="xcb-util-wm-devel xcb-util-errors-devel glm cairo-devel
+ wf-config-devel wlroots-devel"

For wf-config:

-makedepends="glm libevdev-devel wlroots-devel xcb-util-errors-devel
- xcb-util-wm-devel libxml2-devel"
+makedepends="glm libevdev-devel libxml2-devel"

@jbeich
Copy link

jbeich commented Jul 16, 2020

Did you check Wayfire for crashes on startup? Apply WayfireWM/wayfire@29dcd1387700 if you see the following:

Assertion failed: (surface), function wlr_seat_keyboard_notify_enter, file types/seat/wlr_seat_keyboard.c, line 321.

See also https://github.com/freebsd/freebsd-ports/blob/c920e5595b6/x11-wm/wayfire/files/patch-wlroots-0.11

@ifreund
Copy link
Contributor Author

ifreund commented Jul 16, 2020

I did check that it started up but didn't have any config loaded so it wasn't a great test. Thanks for the tip!

Copy link
Member

@ahesford ahesford left a comment

Choose a reason for hiding this comment

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

Please split your last commit and move the wayfire depends changes into the earlier wayfire commit, then revbump the wf-config template in the commit where you change its makedepends. It may be unlikely, but we don't want a stale build that's been influenced by those dependencies when they are no longer in the template.

@ifreund
Copy link
Contributor Author

ifreund commented Jul 16, 2020

@ahesford good point, done.

@ahesford
Copy link
Member

Closed in be4834d. I missed the hikari commit message (not an update, but a revbump) the first time around but just fixed it for you.

@ahesford ahesford closed this Jul 16, 2020
@ifreund ifreund deleted the wlroots11 branch July 17, 2020 11:34
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants