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

qt59, qt511, qt513, qt5, qt6: various build fixes #15454

Merged
merged 5 commits into from Jul 24, 2022

Conversation

chrstphrchvz
Copy link
Contributor

@chrstphrchvz chrstphrchvz commented Jul 21, 2022

  • 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

  • followed our Commit Message Guidelines?
  • squashed and minimized your commits?
  • checked that there aren't other open pull requests for the same change?
  • referenced existing tickets on Trac with full URL?
  • checked your Portfile with port lint --nitpick?
  • tried existing tests with sudo port test?
  • tried a full install with sudo port -vst install?
  • tested basic functionality of all binary files?

@macportsbot
Copy link

Notifying maintainers:
@MarcusCalhoun-Lopez for port qt59.

@macportsbot macportsbot added the maintainer: open Affects an openmaintainer port label Jul 21, 2022
@chrstphrchvz
Copy link
Contributor Author

chrstphrchvz commented Jul 21, 2022

qt59-qtlocation fails due to https://trac.macports.org/ticket/61031, that will likely need known_fail yes for now edit: fix added

@chrstphrchvz chrstphrchvz marked this pull request as draft July 22, 2022 12:23
@chrstphrchvz chrstphrchvz force-pushed the qt59-macos12 branch 4 times, most recently from dca68a2 to f9acb62 Compare July 22, 2022 13:23
@chrstphrchvz
Copy link
Contributor Author

Also looking into building qt511/qt513 on macOS 12 (so that 37f083d can be reverted)

@chrstphrchvz chrstphrchvz force-pushed the qt59-macos12 branch 5 times, most recently from 5a48d50 to d3df59b Compare July 22, 2022 19:54
@chrstphrchvz chrstphrchvz changed the title qt59: fix to allow building on macOS 12 qt59, qt511, qt513, qt5, qt6: various build fixes Jul 22, 2022
@chrstphrchvz chrstphrchvz marked this pull request as ready for review July 22, 2022 20:12
@chrstphrchvz chrstphrchvz marked this pull request as draft July 22, 2022 20:28
@chrstphrchvz
Copy link
Contributor Author

chrstphrchvz commented Jul 22, 2022

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.

@chrstphrchvz chrstphrchvz marked this pull request as ready for review July 22, 2022 22:39
@mascguy
Copy link
Member

mascguy commented Jul 24, 2022

Chris, do you want to go ahead and fix the merge conflicts for this PR?

@chrstphrchvz chrstphrchvz marked this pull request as ready for review July 24, 2022 16:58
Copy link
Member

@mascguy mascguy left a 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?

@mascguy mascguy merged commit 6d02bcf into macports:master Jul 24, 2022
@chrstphrchvz chrstphrchvz deleted the qt59-macos12 branch July 24, 2022 23:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintainer: open Affects an openmaintainer port
4 participants