mozjs78: update to 78.8.0
This commit is contained in:
parent
ff1e593014
commit
7bbb8af461
@ -1,6 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/ccoSBtn4KYTPBLzwmDfCYMVnhLsoTajvGYksLJ+VeBBkdBOzm5hYCIwWc7NPKbPr5EJY7tufO7D/tAHtBbVrwk=
|
||||
SHA256 (Pkgfile) = a6c103f607bbbbde76564aeef50c467d5ee299e0c317927a35894b4717cb9237
|
||||
RWSE3ohX2g5d/WPVi5Va/gVe/DuCwnmGFECrxnBDyh/zLSFV51+sx0fYky50hMf0+dh40mmOlvzaIxUT9+bBokA+Ri2c9QzpqAc=
|
||||
SHA256 (Pkgfile) = cc17d9c82261230cd8202b95b6d8acdf4732742fe05f66c1332b3baa317262a1
|
||||
SHA256 (.footprint) = d5e6d4fae4cf0868a1ed63ab5a563a193cafd89dcdfd2406494847987fb83d82
|
||||
SHA256 (firefox-78.7.1esr.source.tar.xz) = 5042783e2cf94d21dd990d2083800f05bc32f8ba65532a715c7be3cb7716b837
|
||||
SHA256 (rust-1.5.0-build.patch) = b011f4a092420f1744d7b2b53e73e95dc3f09a83c236c0b8850aacbc01ebbdba
|
||||
SHA256 (firefox-78.8.0esr.source.tar.xz) = 1cf2dfdee2e31fd0a5ecced6275a33fa11bee1d2a7c65e23350b26992584a110
|
||||
|
@ -1,20 +1,16 @@
|
||||
# Description: Mozilla's JavaScript engine
|
||||
# URL: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
|
||||
# Maintainer: Juergen Daubert, jue at crux dot nu
|
||||
# Depends on: autoconf-2.13 readline zlib nspr python3 rust
|
||||
# URL: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
|
||||
# Maintainer: Juergen Daubert, jue at crux dot nu
|
||||
# Depends on: autoconf-2.13 readline zlib nspr python3 rust
|
||||
|
||||
name=mozjs78
|
||||
version=78.7.1
|
||||
version=78.8.0
|
||||
release=1
|
||||
source=(https://archive.mozilla.org/pub/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz
|
||||
rust-1.5.0-build.patch)
|
||||
source=(https://archive.mozilla.org/pub/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz)
|
||||
|
||||
build() {
|
||||
cd firefox-$version
|
||||
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1684261
|
||||
patch -p1 -i $SRC/rust-1.5.0-build.patch
|
||||
|
||||
export CC=gcc CXX=g++
|
||||
|
||||
mkdir obj ; cd obj
|
||||
|
@ -1,85 +0,0 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User Emilio Cobos Álvarez <emilio@crisal.io>
|
||||
# Date 1609006565 0
|
||||
# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
|
||||
# Parent 55097a5cf353f1b2a2228820bdf26bb69a1372a0
|
||||
Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
|
||||
|
||||
Fixes errors like:
|
||||
|
||||
dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
|
||||
|
||||
I've left the most specific dependency, but for wgpu the rev is not
|
||||
right, so I've kept the branch which effectively preserves behavior.
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D100485
|
||||
|
||||
diff --git a/.cargo/config.in b/.cargo/config.in
|
||||
--- a/.cargo/config.in
|
||||
+++ b/.cargo/config.in
|
||||
@@ -1,16 +1,16 @@
|
||||
# This file contains vendoring instructions for cargo.
|
||||
# It was generated by `mach vendor rust`.
|
||||
# Please do not edit.
|
||||
|
||||
[source."https://github.com/shravanrn/nix/"]
|
||||
-branch = "r0.13.1"
|
||||
git = "https://github.com/shravanrn/nix/"
|
||||
replace-with = "vendored-sources"
|
||||
+rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
|
||||
|
||||
[source."https://github.com/mozilla/rkv"]
|
||||
git = "https://github.com/mozilla/rkv"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
|
||||
|
||||
[source."https://github.com/mozilla/neqo"]
|
||||
git = "https://github.com/mozilla/neqo"
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -3195,17 +3195,17 @@ source = "registry+https://github.com/ru
|
||||
checksum = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
|
||||
dependencies = [
|
||||
"unreachable",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.13.1"
|
||||
-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
|
||||
+source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cc",
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"void",
|
||||
]
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -63,18 +63,18 @@ opt-level = 2
|
||||
rpath = false
|
||||
debug-assertions = false
|
||||
panic = "abort"
|
||||
|
||||
[patch.crates-io]
|
||||
libudev-sys = { path = "dom/webauthn/libudev-sys" }
|
||||
packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
|
||||
rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
|
||||
-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
|
||||
-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
|
||||
+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
|
||||
+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
|
||||
# failure's backtrace feature might break our builds, see bug 1608157.
|
||||
failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
|
||||
failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
|
||||
|
||||
[patch.crates-io.cranelift-codegen]
|
||||
git = "https://github.com/bytecodealliance/wasmtime"
|
||||
rev = "b7cfd39b531680217537cfcf5294a22077a0a58d"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user