qt5.qtwebengine: fix on darwin (again) #56440
Merged
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
GrahamcOfBorg
added
6.topic: darwin
matthewbauer
approved these changes
Feb 27, 2019
|
In the light of #56744 we don't need most of this. On master we would only need the "qt5.qtwebengine: disable platform check using patches". And, I guess, all of this can be backported to 19.03 if 10.12 SDK doesn't land there. |
The previous code using substituteInPlace was broken for both 5.9 and 5.11 (latter was broken after a minor release bump). Using patches should make things fail loudly and prevent modules/qtwebengine.nix from being littered with version checks. The patch for 5.12 is only tested to apply.
…ituteInPlace qt59.qtwebengine doesn't need those fixes (probably since the recent minor version bump)
This ports a patch that is already used in 5.11. Also one of the substituteInPlace call fails because a file doesn't exist.
veprbl
force-pushed
the
pr/qt5_qtwebengine_darwin_fix2
branch
from
561eb12
to
0624deb
Compare
veprbl
added
the
9.needs: port to stable
veprbl
added
8.has: port to stable
10 tasks
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.
This is a continuation of #53848 that fixes some of the breakage coming after #54986 and also fixes qt59.qtwebengine.
I'm trying to switch away from
substituteInPlaceto using patches to improve maintainability.Things done