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.10.0, cage: revbump, wayfire: update to 0.3.1, sway: update to 1.4 #18432

Merged
merged 4 commits into from Jan 25, 2020

Conversation

ghost
Copy link

@ghost ghost commented Jan 20, 2020

No description provided.

@ghost
Copy link
Author

ghost commented Jan 20, 2020

Yes, anything else I need to do when that happens?
Edit: Nevermind, I just read the CONTRIBUTING.md file and there's a part saying I need to revbump all dependent packages, will do that

@ghost
Copy link
Author

ghost commented Jan 20, 2020

Revbumped all packages that xbps told me to when compiling with the old soname

@fosslinux
Copy link
Contributor

Please use the proper commit message format, eg

cage: bump for wlroots update or something along those lines.

See https://github.com/void-linux/void-packages/blob/master/Manual.md#contributing-via-git

@fosslinux
Copy link
Contributor

Also seems like the revbump for wayfire broke it... you'll need to look into that.

@ghost
Copy link
Author

ghost commented Jan 20, 2020

Sorry about not using the proper commit message format.
As for breaking stuff it broke sway and cage too. I managed to compile sway-1.3-rc3 but since that's an rc I can't update it yet, I think it comes down to packages adding compatibility for newer versions of wlroots so nothing I can do right now.

@ghost ghost changed the title wlroots: update to 0.9.1 [WIP] wlroots: update to 0.9.1 Jan 20, 2020
@ghost
Copy link
Author

ghost commented Jan 20, 2020

Okay, so I did my research, compiled everything a bunch of times and I can confirm that we have to wait for new versions of sway and cage. A new version of wayfire has been already released and it compiles fine with wlroots 0.9.1, the question is can I update it in this pull request or do I have to make another one? And should I close this pull request and make another one when new versions of mentioned packages will be released or just wait and update this pull request?

@fosslinux
Copy link
Contributor

Yep, do the ones you can. Leave it open so that people know it's being worked on while you wait.

However there are some patches already avaliable in master which you can add to the patches/ subdirectory for each package:

For future reference, I found these by going to the github repositories and searching for wlroots in commits.

@ghost
Copy link
Author

ghost commented Jan 21, 2020

Thank you for the patches, but it's not as easy as it seems. I had to add new packages to makedepends and also use a few more patches from upstream but I managed to compile cage using wlroots 0.9.1, I'll test compiling sway next and when everything will be good I will push those changes here.

@ghost
Copy link
Author

ghost commented Jan 21, 2020

As it turns out making sway-1.2 work (compile) with wlroots-0.9.1 is a lot more compilacted because a lot of files were changed a lot (and I really mean it) before updating it to work with newer versions of wlroots. Patching it would require me to make a frankenstein mix between sway-1.2 and sway-1.3 and I don't think that's a good option. All we need is to wait for sway-1.3 to be released and then it will work out of the box (well kinda, new makedends are required but it's not a big problem). For now I can update this pull request with new version of wayfire and patches for cage, then we have to wait for sway-1.3.

@ghost
Copy link
Author

ghost commented Jan 21, 2020

Sorry for the mess in the commits, I'll squash all of them into one when sway-1.3 will come out.

@ghost
Copy link
Author

ghost commented Jan 22, 2020

I redid all the comits to delete that empty one.
New version of sway was released but it changed the meson.build to require wlroots>0.10.0 so I patched it to work with 0.9.1 as 0.10.0 isn't released as of yet. I'd really appreciate if someone would go over this and see if everything is ok.

@ghost ghost changed the title [WIP] wlroots: update to 0.9.1 wlroots: update to 0.9.1 Jan 22, 2020
@Wychmire
Copy link
Contributor

wlroots 0.10.0 has a release now so you should be able to remove the patch.

Since you're updating sway in this PR as well, you should probably update swayidle to 1.6 and swaylock to 1.5.

@ghost
Copy link
Author

ghost commented Jan 22, 2020

Well it's a pre-release so I didn't know if I could use it or not. I'll update wlroots, swaylock and swayidle then.

@Wychmire
Copy link
Contributor

oh, sorry. Didn't check to see if it was a pre-release or not, just that it existed. Should probably stick with 0.9.1 and the patch for now I think

@ghost
Copy link
Author

ghost commented Jan 22, 2020

Ok, just swaylock and swayidle will be updated then.

Copy link
Contributor

@fosslinux fosslinux left a comment

Choose a reason for hiding this comment

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

great, only one comment

}

void
--- .builds/alpine.yml
Copy link
Contributor

Choose a reason for hiding this comment

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

You can probably remove everything from this line

+ git checkout 0.9.1
meson --prefix=/usr/local build -Drootston=false -Dexamples=false
ninja -C build
sudo ninja -C build install
Copy link
Contributor

Choose a reason for hiding this comment

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

... to this line. As this is just for the builds they use interally and dosen't impact on our builds.

Copy link
Author

Choose a reason for hiding this comment

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

Right, tested it on my side and it seems to working fine, will commit in a while.

@ghost
Copy link
Author

ghost commented Jan 22, 2020

Revised the patch.
I guess I'll ask here, what does it take to become a maintainer of a package? wlroots is currently orphaned and I'd like to take over the maintainership, thanks in advance.

@travankor
Copy link
Contributor

the freerdp stuff in makedepends is wrong. freerdp support is removed from wlroots (0.10.0).
swaylock and swayidle do not depend on wlroots, so you don't need to update them in this PR.

pretty much anyone can be maintainer of a package, but the actual "maintainership" of packages is loosely held in Void

@ghost
Copy link
Author

ghost commented Jan 23, 2020

Now (0.10.0) it's removed, but when bulding against wlroots 0.9.1 it would fail, will redo.

@ghost ghost changed the title wlroots: update to 0.9.1 (WIP) wlroots: update to 0.10.0 Jan 23, 2020
@ghost ghost changed the title (WIP) wlroots: update to 0.10.0 wlroots: update to 0.10.0 Jan 23, 2020
@ghost
Copy link
Author

ghost commented Jan 23, 2020

Everything should be good now and the pull request should be ready to merge.

@ghost ghost changed the title wlroots: update to 0.10.0 wlroots: update to 0.10.0, cage: revbump, wayfire: update to 0.3.1, sway: update to 1.4 Jan 23, 2020
@xtraeme xtraeme merged commit 8207b37 into void-linux:master Jan 25, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 13, 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

3 participants