Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #25946 - jdm:macos-fix, r=nox

Browse source 
Update mozjs for macOS 10.15 build fix.
This commit is contained in:
bors-servo 2020-03-11 10:36:10 -04:00 • committed by GitHub
commit 4b1bb895a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -3595,7 +3595,7 @@ dependencies = [
[[package]]
name = "mozjs"
version = "0.13.0"
source = "git+https://github.com/servo/rust-mozjs?branch=smup#a09ebb19ee0f1b7d20716b60b19c590fa28a9e1b"
source = "git+https://github.com/servo/rust-mozjs#2598da7110f752d29f2beedf3e47c71f72a354a3"
dependencies = [
"cc",
"lazy_static",
@ -3607,8 +3607,8 @@ dependencies = [
[[package]]
name = "mozjs_sys"
version = "0.68.0"
source = "git+https://github.com/servo/mozjs?rev=aabcc9ba889b2755f1e4e83f28323a60415a790f#aabcc9ba889b2755f1e4e83f28323a60415a790f"
version = "0.68.1"
source = "git+https://github.com/servo/mozjs?rev=2392ebc144331184a770bee1f1ac02969946380f#2392ebc144331184a770bee1f1ac02969946380f"
dependencies = [
"bindgen",
"cc",

2
components/script/Cargo.toml
View file

@ -63,7 +63,7 @@ indexmap = "1.0.2"
ipc-channel = "0.14"
itertools = "0.8"
jstraceable_derive = {path = "../jstraceable_derive"}
js = {package = "mozjs", git = "https://github.com/servo/rust-mozjs", branch = "smup"}
js = {package = "mozjs", git = "https://github.com/servo/rust-mozjs"}
keyboard-types = "0.4.4"
lazy_static = "1"
libc = "0.2"