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
qt59, qt511, qt513, qt5, qt6: various build fixes #15454
Conversation
Notifying maintainers: |
5df3e54
to
4ddb6a5
Compare
qt59-qtlocation fails due to https://trac.macports.org/ticket/61031, |
dca68a2
to
f9acb62
Compare
Also looking into building qt511/qt513 on macOS 12 (so that 37f083d can be reverted) |
5a48d50
to
d3df59b
Compare
qt513-qtdeclarative is affected by https://trac.macports.org/ticket/62806 This is already a lot more than I intended to put in a single pull request. I would like to keep similar changes for different Qt versions together, however I know this is going to trigger a large number of builds. macOS 11/12 will be particularly busy building qt511/qt513. But as long as I don’t squash things, I don’t see why this PR should be split up when doing so would just trigger additional unnecessary builds. |
fe7e4d1
to
6046bff
Compare
Chris, do you want to go ahead and fix the merge conflicts for this PR? |
6046bff
to
9761ed7
Compare
Put changes intended to be applied simultaneously in a single patchfile See: https://trac.macports.org/ticket/62806 [skip ci]
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.
Is this ready for merge as well?
qt59-qtlocation, qt511-qtlocation, qt513-qtlocation, qt5-qtlocation, qt6-qtlocation: use
conflicts_build boost
to prevent headers in${prefix}/include/boost
from taking precedence(I only encountered a build error for qt59-qtlocation, but I suggest applying this change to all qtlocation versions containing bundled boost in bundled mapbox-gl-native.)
qt59, qt511, qt513: fix to allow building on macOS 11/12
See: https://trac.macports.org/ticket/62190
See: https://trac.macports.org/ticket/63154
qt59-qtlocation, qt511-qtlocation: fix build for Xcode ≥ 11
Fixes: https://trac.macports.org/ticket/61031
qt5-qtbase: keep Rez patch related lines together
qt513-qtdeclarative: copy build fix over from qt5
Put changes intended to be applied simultaneously in a single patchfile
See: https://trac.macports.org/ticket/62806
[skip ci]
Description
Tested on
macOS 12.5 21G72 x86_64
Xcode 14.0 14A5270f
Verification
Have you
port lint --nitpick
?sudo port test
?sudo port -vst install
?