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

Auto merge of #23562 - jdm:no-nspr, r=asajeffrey

Browse source 
Update mozjs to remove NSPR.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23562)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-06-13 11:08:44 -04:00 • committed by GitHub
commit e381cebeb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

@ -2863,20 +2863,20 @@ dependencies = [
[[package]]
name = "mozjs"
version = "0.11.0"
source = "git+https://github.com/servo/rust-mozjs#be4e35a87c4fd71db584a392edd99f428c54ccc7"
source = "git+https://github.com/servo/rust-mozjs#bea7b5cca9448ca10f8f710b7ad75567424f73b4"
dependencies = [
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mozjs_sys 0.66.1 (git+https://github.com/servo/mozjs?rev=2e00bbc9e0cfd04be08356a79cfce41e4c7f165a)",
"mozjs_sys 0.66.1 (git+https://github.com/servo/mozjs?rev=05c7d307811f88ca263f1861ccca0a81ffb0b58d)",
"num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "mozjs_sys"
version = "0.66.1"
source = "git+https://github.com/servo/mozjs?rev=2e00bbc9e0cfd04be08356a79cfce41e4c7f165a#2e00bbc9e0cfd04be08356a79cfce41e4c7f165a"
source = "git+https://github.com/servo/mozjs?rev=05c7d307811f88ca263f1861ccca0a81ffb0b58d#05c7d307811f88ca263f1861ccca0a81ffb0b58d"
dependencies = [
"bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
@ -5808,7 +5808,7 @@ dependencies = [
"checksum mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9de3eca27871df31c33b807f834b94ef7d000956f57aa25c5aed9c5f0aae8f6f"
"checksum mozangle 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1dc10080cc8b83bfb5580de720f00c768ec1b365c75fbc4c57324118a38a618d"
"checksum mozjs 0.11.0 (git+https://github.com/servo/rust-mozjs)" = "<none>"
"checksum mozjs_sys 0.66.1 (git+https://github.com/servo/mozjs?rev=2e00bbc9e0cfd04be08356a79cfce41e4c7f165a)" = "<none>"
"checksum mozjs_sys 0.66.1 (git+https://github.com/servo/mozjs?rev=05c7d307811f88ca263f1861ccca0a81ffb0b58d)" = "<none>"
"checksum msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729"
"checksum muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "451a9a05d2a32c566c897835e0ea95cf79ed2fdfe957924045a1721a36c9980f"
"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"

2
python/servo/build_commands.py
View file

@ -658,7 +658,7 @@ class MachCommands(CommandBase):
for lib in libs:
print("WARNING: could not find " + lib)
package_generated_shared_libraries(["nspr4.dll", "libEGL.dll"], build_path, servo_exe_dir)
package_generated_shared_libraries(["libEGL.dll"], build_path, servo_exe_dir)
# copy needed gstreamer DLLs in to servo.exe dir
target_triple = target or host_triple()