diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-23 19:22:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-23 19:22:47 -0500 |
| commit | ba30d72679f59fbabef9dbaa107d756903dde2af (patch) | |
| tree | d39dde473a381e15cc474205c8ff47838be2cc8d | |
| parent | 32f2ab70889a757cc89ef07f050dfed09a671224 (diff) | |
| parent | 67ee096b18b3e5a9ec1b45f1aa1a5d9612349032 (diff) | |
| download | servo-ba30d72679f59fbabef9dbaa107d756903dde2af.tar.gz servo-ba30d72679f59fbabef9dbaa107d756903dde2af.zip | |
Auto merge of #11845 - metajack:updates-for-cef, r=jdm
Update angle and rust-mozjs to fix linking symbols for CEF
<!-- Please describe your changes on the following line: -->
CEF linking is currently failing. This makes linking work. This is a partial fix for #8883.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because no tests exist yet
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11845)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 4 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index eff5e11ef3b..f5e2d6152c3 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -65,7 +65,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "angle" version = "0.1.0" -source = "git+https://github.com/servo/angle?branch=servo#eefe3506ae13e8ace811ca544fd6b4a5f0db0a04" +source = "git+https://github.com/servo/angle?branch=servo#d0a2db05d1ada8e38b0143a5846f68089f332e9e" dependencies = [ "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1066,7 +1066,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.3" -source = "git+https://github.com/servo/rust-mozjs#a5ec009853a6bd1c57d9c909a0d2994bc015cee2" +source = "git+https://github.com/servo/rust-mozjs#28f9fb0625a798ad53abf7edeb3e8b7bc0007dc3" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 361af4adda4..3497e7a8fd3 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -39,7 +39,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "angle" version = "0.1.0" -source = "git+https://github.com/servo/angle?branch=servo#eefe3506ae13e8ace811ca544fd6b4a5f0db0a04" +source = "git+https://github.com/servo/angle?branch=servo#d0a2db05d1ada8e38b0143a5846f68089f332e9e" dependencies = [ "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -975,7 +975,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.3" -source = "git+https://github.com/servo/rust-mozjs#a5ec009853a6bd1c57d9c909a0d2994bc015cee2" +source = "git+https://github.com/servo/rust-mozjs#28f9fb0625a798ad53abf7edeb3e8b7bc0007dc3" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", |