Skip to content

Commit 77645ed

Browse files
authored
Update to SpiderMonkey 140.5 (#644)
* fix patch Signed-off-by: sagudev <[email protected]> * Update SpiderMonkey Signed-off-by: sagudev <[email protected]> * apply patches Signed-off-by: sagudev <[email protected]> * Update COMMIT and version Signed-off-by: sagudev <[email protected]> * update bindgen this change fixes formating Signed-off-by: sagudev <[email protected]> * plz do not crash Signed-off-by: sagudev <[email protected]> --------- Signed-off-by: sagudev <[email protected]>
1 parent e89f5a3 commit 77645ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+6146
-379
lines changed

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ edition = "2021"
1010
[workspace.dependencies]
1111
cc = "1"
1212
libc = "0.2"
13-
bindgen = { version = "0.71.1", default-features = false, features = [
13+
bindgen = { version = "0.72.1", default-features = false, features = [
1414
"runtime",
15-
"which-rustfmt",
1615
] }

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ that are battle-tested in [Servo](https://servo.org/), split in two crates:
77
- `mozjs`: Higher-level bindings to the SpiderMonkey API.
88

99
Mozjs is currently tracking SpiderMonkey on [mozilla-esr140](https://searchfox.org/mozilla-esr140/source/) branch
10-
(currently version 140.0).
10+
(currently version 140.5).
1111

1212
## Building from Pre-built Archive
1313

@@ -132,8 +132,8 @@ mozjs = { path = "../mozjs/mozjs" }
132132

133133
In order to upgrade to a new version of SpiderMonkey:
134134

135-
1. Find the mozilla-release commit for the desired version of SpiderMonkey, at
136-
<https://treeherder.mozilla.org/#/jobs?repo=mozilla-release&filter-searchStr=spidermonkey%20pkg>.
135+
1. Find the mozilla-esr140 commit for the desired version of SpiderMonkey, at
136+
<https://treeherder.mozilla.org/#/jobs?repo=mozilla-esr140&filter-searchStr=spidermonkey%20pkg>.
137137
You are looking for an SM(pkg) tagged with FIREFOX_RELEASE.
138138
Take a note of the commit number to the left (a hex number such as ac4fbb7aaca0).
139139

@@ -156,7 +156,7 @@ In order to upgrade to a new version of SpiderMonkey:
156156

157157
9. Submit a PR!
158158

159-
8. Send companion PR to servo, as SpiderMonkey bump PR will not be merged
159+
10. Send companion PR to servo, as SpiderMonkey bump PR will not be merged
160160
until it's tested against servo.
161161

162162
## NixOS users

mozjs-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "mozjs_sys"
33
description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
44
repository.workspace = true
5-
version = "0.140.0-8"
5+
version = "0.140.5-0"
66
authors = ["Mozilla", "The Servo Project Developers"]
77
links = "mozjs"
88
license.workspace = true

mozjs-sys/build.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
use bindgen::callbacks::ParseCallbacks;
6-
use bindgen::{CodegenConfig, Formatter, RustTarget};
6+
use bindgen::{CodegenConfig, RustTarget};
77
use std::ffi::{OsStr, OsString};
88
use std::fmt::Write;
99
use std::path::{Path, PathBuf};
@@ -325,7 +325,6 @@ fn build_bindings(build_dir: &Path, target: BuildTarget) {
325325
.size_t_is_usize(true)
326326
.enable_cxx_namespaces()
327327
.with_codegen_config(config)
328-
.formatter(Formatter::Rustfmt)
329328
.clang_args(cc_flags(true));
330329

331330
if env::var("TARGET").unwrap().contains("wasi") {

mozjs-sys/etc/COMMIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19b003833fc9bb146efa9bc665a536765e8899d1
1+
26eff341874075f35c3daa42b8e29fa54ff62972

mozjs-sys/etc/patches/0032-macos-sdk-min-14-2.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ index 8a97d952d..5b538f0a1 100755
66
)
77

88
def mac_sdk_min_version():
9-
- return "15.4"
9+
- return "15.5"
1010
+ return "14.2"
1111

1212
@depends(

mozjs-sys/mozjs/Cargo.lock

Lines changed: 47 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mozjs-sys/mozjs/build/moz.configure/toolchain.configure

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mozjs-sys/mozjs/config/external/gkcodecs/gkcodecs.symbols

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mozjs-sys/mozjs/config/milestone.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)