-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
qt: don't enable disabled options #23571
Conversation
This comment has been minimized.
This comment has been minimized.
🤖 Beep Boop! This pull request is making changes to 'recipes/qt//'. 👋 @ericLemanissier @jwillikers @MartinDelille @paulharris you might be interested. 😉 |
This comment has been minimized.
This comment has been minimized.
Hooks produced the following warnings for commit 83d7990qt/5.15.12@#9f89c6bee094c9fda6fef43d2cb77a02
qt/5.15.10@#2e6d4d8283e1f5dc379760ecf9e000b9
qt/5.15.11@#cef4876a6034ec74e14c111884b77807
qt/6.4.2@#94ef8f4d02f59fb95a03706fe2d75d76
qt/5.15.13@#0c46d62db114b6f966b37b5fdb1fefae
qt/6.7.0@#109f3071998a1b407968fff0d610bd44
qt/6.3.2@#2399f6489ddbb94dabe82dd8464fa9d2
qt/6.6.3@#964b605666bedfa7214fc95b3fffc66a
qt/6.6.2@#627da07a32feaa3326f9d40e32f27558
qt/5.15.9@#3a908a13a1d4fd22894dba5502068a64
qt/6.6.1@#fddcc397892167d56971267b14b96a0a
qt/6.5.3@#68b2dbe3c4da6a89d6c294b8dcd58f29
qt/6.6.0@#7634d44a24368ff1498f02ad3bc4f3d2
|
Thanks! Let's wait a day for the OP of the issue to give feedback if necessary, else I'll approve tomorrow :) |
This comment was marked as duplicate.
This comment was marked as duplicate.
This comment has been minimized.
This comment has been minimized.
xenial does not have xcb-xinput
The build is now finished. You can take a look at the results here |
This comment has been minimized.
This comment has been minimized.
Hooks produced the following warnings for commit 0ed03e4qt/5.15.13@#53a1577a33c21a52aa8e88355b738149
qt/5.15.12@#8736e785b38e9778c11696cf8488d3bc
qt/5.15.11@#16d5933a3bcc52c27e41d26c99a9584a
|
@uilianries @RubenRBS this is ready for review and merge |
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.
Thanks! Quick question, else it looks good :)
@@ -697,6 +699,8 @@ def build(self): | |||
|
|||
args.append("-feature-gssapi" if self.options.get_safe("with_gssapi", False) else "-no-feature-gssapi") | |||
|
|||
args.append("-bundled-xcb-xinput") |
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.
Can you give me a bit more insight into this one? I see the linked issue, but would appreciate more context for tracability's shake in the future :)
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.
Not specifying this argument allows qt to choose either the bundled version of xinput or the system version. Consistency is important because the system version of xinput is shared, but the bundled version is static.
We cannot force to use system version because xenial does not have a package for it, so we force the bundled version
@RubenRBS do you think it's ok ? |
@jcar87 are you OK with this PR? Do you want the default value of |
@RubenRBS is my rationale above clear ? Can we merge this PR ? |
The build is now finished. You can take a look at the results here |
Conan v1 pipeline ✔️All green in build 17 (
Conan v2 pipeline ✔️
All green in build 18 (
|
Hooks produced the following warnings for commit 52132deqt/5.15.14@#e4ef44c8ba00704b06f3879dc4616480
qt/6.7.1@#276d7b59312fe081f95c692385dcffc0
qt/6.7.0@#87a08edb0d8d73434181aada898989c7
qt/6.6.3@#3d41e0c810233470611c19f1c291901b
qt/6.5.3@#145cc94105956a9f168bd13ea638b55f
qt/6.4.2@#89cc53f862282fd4f8927b56abff3124
|
:( |
also force use of bundled xcb-xinput because xenial does not have xcb-xinput
and remove old patch versions
also, GUI does not link to freetype or fontconfig, and multimedia does not link to alsa
fixes #23567
Fixes #8081
Fixes #23568
Specify library name and version: qt/*