Skip to content

/ webrender

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

Use the core-text-rs feature to ensure OS X 10.7 build compatibility,… #1409

Merged
merged 1 commit into from Jun 22, 2017
Merged

Use the core-text-rs feature to ensure OS X 10.7 build compatibility,… #1409

merged 1 commit into from Jun 22, 2017

Conversation

@staktrace
Copy link
Contributor

staktrace commented Jun 20, 2017 •
edited by larsbergstrom

… as mozilla-central requires this

This change is Reviewable
@staktrace staktrace force-pushed the staktrace:lion branch from f4a73cc to bd0f6c7 Jun 20, 2017
@kvark
Copy link
Member

kvark commented Jun 20, 2017

I disagree on the way core-text was patched (see servo/core-text-rs#61 (comment))
Merging though, given the urgency.
@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jun 20, 2017

📌 Commit bd0f6c7 has been approved by kvark
@staktrace
Copy link
Contributor Author

staktrace commented Jun 20, 2017

Not actually that urgent right now, since I cherry-picked this change into m-c directly. If you want to do it differently we can abort this and do it better.
jryans pushed a commit to jryans/gecko-dev that referenced this pull request Jun 20, 2017
@staktrace
Bug 1373381 - Cherry-pick servo/webrender#1409 to unbreak OS X debug …
4b6b601 
…build. r=jrmuizel

MozReview-Commit-ID: 58wznVyzHnI
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Jun 21, 2017
@staktrace
Bug 1373381 - Cherry-pick servo/webrender#1409 to unbreak OS X debug …
a63cce3 
…build. r=jrmuizel

MozReview-Commit-ID: 58wznVyzHnI

--HG--
extra : rebase_source : adef9beb24615c413f3d6a5dc6ef0af4743a3f71
@staktrace staktrace force-pushed the staktrace:lion branch from bd0f6c7 to 1bafeaf Jun 21, 2017
@staktrace
Copy link
Contributor Author

staktrace commented Jun 21, 2017

Updated the PR to pull core-text 6.0.0 with default-features=false, so that it excludes the 10.8+ APIs. Note that wrench uses font-loader which still uses core-text 5.0 so now the lockfile has both 5.0.1 and 6.0.0. I can submit a PR to font-loader to bump their version if that's something we care about. Since we don't pull wrench into gecko it isn't an issue for mozilla-central.
@staktrace staktrace force-pushed the staktrace:lion branch from 1bafeaf to 92bcded Jun 21, 2017
@staktrace
Copy link
Contributor Author

staktrace commented Jun 21, 2017

Looks like the servo-tidy doesn't like having both versions of core-text in the lockfile. I'll submit a PR for font-loader.
@staktrace staktrace mentioned this pull request Jun 21, 2017
Merged
aethanyc pushed a commit to aethanyc/gecko-dev that referenced this pull request Jun 22, 2017
@staktrace
Bug 1373381 - Cherry-pick servo/webrender#1409 to unbreak OS X debug …
8f2f829 
…build. r=jrmuizel

MozReview-Commit-ID: 58wznVyzHnI
@staktrace
Update to core-text 6.0.
Loading status checks…
f6cd023 
This is needed to ensure OS X 10.7 build compatibility, for
mozilla-central. This also updates font-loader to 0.3.2 so that we can
drop core-text 5.0.
@staktrace staktrace force-pushed the staktrace:lion branch from 92bcded to f6cd023 Jun 22, 2017
@staktrace
Copy link
Contributor Author

staktrace commented Jun 22, 2017

@kvark updated patch seems to be passing tests now. Not sure if you need to r+ again or maybe homu/bors need a kick?
@kvark
Copy link
Member

kvark commented Jun 22, 2017

Thanks!
@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jun 22, 2017

📌 Commit f6cd023 has been approved by kvark
@bors-servo
Copy link
Contributor

bors-servo commented Jun 22, 2017

⌛ Testing commit f6cd023 with merge c7170f4...
bors-servo added a commit that referenced this pull request Jun 22, 2017
@bors-servo
Auto merge of #1409 - staktrace:lion, r=kvark
Loading status checks…
c7170f4 
Use the core-text-rs feature to ensure OS X 10.7 build compatibility,…

… as mozilla-central requires this

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1409)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 22, 2017

☀️ Test successful - status-travis
Approved by: kvark
Pushing c7170f4 to master...
@bors-servo bors-servo merged commit f6cd023 into servo:master Jun 22, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
This was referenced Jun 22, 2017
Merged
Merged
Manishearth pushed a commit to Manishearth/gecko-dev that referenced this pull request Jun 23, 2017
@staktrace
Bug 1373381 - Cherry-pick servo/webrender#1409 to unbreak OS X debug …
9368a0c 
…build. r=jrmuizel

MozReview-Commit-ID: 58wznVyzHnI
JerryShih pushed a commit to JerryShih/gecko-dev that referenced this pull request Jun 23, 2017
@staktrace
Bug 1373381 - Cherry-pick servo/webrender#1409 to unbreak OS X debug …
d296ce1 
…build. r=jrmuizel

MozReview-Commit-ID: 58wznVyzHnI
@staktrace staktrace deleted the staktrace:lion branch Jun 23, 2017
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 1, 2019
@marco-c
Bug 1373381 - Cherry-pick servo/webrender#1409 to unbreak OS X debug …
0e2f238 
…build. r=jrmuizel

MozReview-Commit-ID: 58wznVyzHnI

UltraBlame original commit: b1c3b719cf77e811f91b8f73923449d00350e436
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 1, 2019
@marco-c
Bug 1373381 - Cherry-pick servo/webrender#1409 to unbreak OS X debug …
26352b1 
…build. r=jrmuizel

MozReview-Commit-ID: 58wznVyzHnI

UltraBlame original commit: b1c3b719cf77e811f91b8f73923449d00350e436
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 1, 2019
@marco-c
Bug 1373381 - Cherry-pick servo/webrender#1409 to unbreak OS X debug …
f0248ff 
…build. r=jrmuizel

MozReview-Commit-ID: 58wznVyzHnI

UltraBlame original commit: b1c3b719cf77e811f91b8f73923449d00350e436
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@staktrace @kvark @bors-servo
You can’t perform that action at this time.