qt/5.x.x: Use xkbcommon when the qtwayland option is enabled #15116
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The xkbcommon library supports both X11 and Wayland. Qt expects xkbcommon to be available for Wayland. This PR relaxes the restriction for xkbcommon to only be included when the qtwayland option is enabled. Additional validation has been added to ensure that xkbcommon has been configured with the required options for X11 and Wayland support as needed.
ghost
mentioned this pull request
|
I detected other pull requests that are modifying qt/5.x.x recipe:
This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there. |
This was referenced Jan 4, 2023
Merged
This comment has been minimized.
This comment has been minimized.
Hooks produced the following warnings for commit d4dcb8cqt/5.15.6qt/5.15.5qt/5.15.7 |
3 tasks
ghost
mentioned this pull request
3 tasks
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
ericLemanissier
previously approved these changes
Jan 9, 2023
ericLemanissier
previously approved these changes
Jan 9, 2023
This comment has been minimized.
This comment has been minimized.
Hooks produced the following warnings for commit d9132afqt/5.15.5 |
|
@jwillikers CI does not make progress any more. you should probably close and reopen the PR |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Conan v1 pipelineAll green in build 13 ( |
Hooks produced the following warnings for commit d2865ebqt/5.15.8qt/5.15.7 |
ericLemanissier
approved these changes
Jan 16, 2023
prince-chrismc
approved these changes
Jan 17, 2023
franramirez688
pushed a commit
to franramirez688/conan-center-index
that referenced
this pull request
Jan 20, 2023
… enabled * qt/5.x.x: Use xkbcommon when the qtwayland option is enabled The xkbcommon library supports both X11 and Wayland. Qt expects xkbcommon to be available for Wayland. This PR relaxes the restriction for xkbcommon to only be included when the qtwayland option is enabled. Additional validation has been added to ensure that xkbcommon has been configured with the required options for X11 and Wayland support as needed. * Don't require X11 support when the gui option is enabled * Update license to use active SPDX identifier * Fix check to check for X11 instead of absence of qtwayland * Fix installation directory when cross-building * Remove -hostprefix option to ensure mkspec exists * Update xkbcommon to 1.5.0 * Bump glib and libpng versions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The xkbcommon library supports both X11 and Wayland. Qt expects xkbcommon to be available for Wayland.
This PR relaxes the restriction for xkbcommon to only be included when the qtwayland option is enabled. Additional validation has been added to ensure that xkbcommon has been configured with the required options for X11 and Wayland support as needed.
Fixes #15114.
Additionally, the X11 packages shouldn't be required when the
guioption is enabled as Qt supports other backends. I've added awith_x11to allow opting out of the default behavior.Fixes #14719.
One more fix I snuck in is for the installation destination when cross-building.
Setting
prefixis not enough when cross-building for a particular device as documented here.Setting
-extprefixto the package folder when cross-building ensures that Qt is installed to the correct location.These changes are ported for qt/6.x.x in #15137.
Specify library name and version: qt/5.x.x