Date: Sat, 11 Sep 2021 00:17:43 GMT From: Steve Wills <swills@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 086585844cb0 - main - lang/spidermonkey78: update to 78.9.0 Message-ID: <202109110017.18B0HhkM047615@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by swills: URL: https://cgit.FreeBSD.org/ports/commit/?id=086585844cb05e2f234e3205e067ae2b748a65d4 commit 086585844cb05e2f234e3205e067ae2b748a65d4 Author: Steve Wills <swills@FreeBSD.org> AuthorDate: 2021-09-11 00:16:58 +0000 Commit: Steve Wills <swills@FreeBSD.org> CommitDate: 2021-09-11 00:17:38 +0000 lang/spidermonkey78: update to 78.9.0 PR: 258127 Exp-run by: antoine --- lang/spidermonkey78/Makefile | 3 +- lang/spidermonkey78/distinfo | 6 +-- lang/spidermonkey78/files/patch-bug1684261 | 85 ------------------------------ 3 files changed, 4 insertions(+), 90 deletions(-) diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile index 0ace36ef5937..278da7724248 100644 --- a/lang/spidermonkey78/Makefile +++ b/lang/spidermonkey78/Makefile @@ -1,6 +1,5 @@ PORTNAME= spidermonkey -DISTVERSION= 78.7.0 -PORTREVISION= 7 +DISTVERSION= 78.9.0 CATEGORIES= lang MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source PKGNAMESUFFIX= ${SP_VER} diff --git a/lang/spidermonkey78/distinfo b/lang/spidermonkey78/distinfo index 7b9928c7c769..e055a8eae0e4 100644 --- a/lang/spidermonkey78/distinfo +++ b/lang/spidermonkey78/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612138148 -SHA256 (firefox-78.7.0esr.source.tar.xz) = 1aa041db28cd742e93d663a9da8defd33040b38d8b9470350538473251621643 -SIZE (firefox-78.7.0esr.source.tar.xz) = 332849732 +TIMESTAMP = 1630196184 +SHA256 (firefox-78.9.0esr.source.tar.xz) = 8e03ac1dfc5ac804c8b13a529414a9387e0425e545bb2f4462d74c3175e64864 +SIZE (firefox-78.9.0esr.source.tar.xz) = 332717100 diff --git a/lang/spidermonkey78/files/patch-bug1684261 b/lang/spidermonkey78/files/patch-bug1684261 deleted file mode 100644 index 04349bb197c1..000000000000 --- a/lang/spidermonkey78/files/patch-bug1684261 +++ /dev/null @@ -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 ---- .cargo/config.in -+++ .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 ---- Cargo.lock -+++ 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 ---- Cargo.toml -+++ 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" - -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109110017.18B0HhkM047615>