Skip to content
This repository was archived by the owner on May 30, 2023. It is now read-only.

Building on OSX10.10#12934

Closed
eugene1g wants to merge 1 commit intoariya:masterfrom
eugene1g:master
Closed

Building on OSX10.10#12934
eugene1g wants to merge 1 commit intoariya:masterfrom
eugene1g:master

Conversation

@eugene1g
Copy link
Copy Markdown
Contributor

@eugene1g eugene1g commented Feb 2, 2015

A quick&dirty QT to allow building on Yosemite / XCode6 as per Homebrew/legacy-homebrew#29837 (comment)

This has been patched upstream with https://qt.gitorious.org/qt/qtbase/commit/70e4428b6f1c6a4bad112203f67ee7d22107616c so if Phantom QT fork will be updated then this patch will be obsolete.

@eugene1g
Copy link
Copy Markdown
Contributor Author

eugene1g commented Feb 2, 2015

Related issues: #12630 and #12928

@MikeMcQuaid
Copy link
Copy Markdown
Contributor

@eugene1g Nice work 🤘 Maybe worth applying the upstream patch exactly as-is?

@eugene1g
Copy link
Copy Markdown
Contributor Author

eugene1g commented Feb 2, 2015

Good idea. I just updated the patch to be exactly as it is upstream, and verified by recompiling on 10.10 - the binary still works as expected.

@MikeMcQuaid
Copy link
Copy Markdown
Contributor

👍

@ariya
Copy link
Copy Markdown
Owner

ariya commented Feb 7, 2015

Looks good. I suggest squashing this into just one commit. Give me a few days to get access to Yosemite and verify the fix.

@eugene1g
Copy link
Copy Markdown
Contributor Author

eugene1g commented Feb 7, 2015

Squashed!

@reggi
Copy link
Copy Markdown

reggi commented Feb 28, 2015

Whats going on with this? It's been open a while.

@ariya
Copy link
Copy Markdown
Owner

ariya commented Mar 2, 2015

Landed on the master branch and will be backported to 2.0 branch. Thanks @eugene1g!

@ariya ariya closed this Mar 2, 2015
@mauron85
Copy link
Copy Markdown

+1

@mravery
Copy link
Copy Markdown

mravery commented Oct 14, 2015

homebrew applies this patch in their formula. Just brew install phantomjs and you'll get the patch without having to wait for it to be integrated.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants