diff options
author | jbeich <jbeich@FreeBSD.org> | 2017-08-19 05:39:20 +0800 |
---|---|---|
committer | jbeich <jbeich@FreeBSD.org> | 2017-08-19 05:39:20 +0800 |
commit | 5f2fca9df29c5ab3295245cd2accdd84c6436816 (patch) | |
tree | db74f3cdb4acc70b424a3e2ad9ca5b46275bc3cd /mail/thunderbird | |
parent | 9b04dea0f3758c6cae85c4d284143db85a1e1d84 (diff) | |
download | freebsd-ports-gnome-5f2fca9df29c5ab3295245cd2accdd84c6436816.tar.gz freebsd-ports-gnome-5f2fca9df29c5ab3295245cd2accdd84c6436816.tar.zst freebsd-ports-gnome-5f2fca9df29c5ab3295245cd2accdd84c6436816.zip |
mail/thunderbird: unbreak with RUST=on
env CARGO_TARGET_DIR=. RUSTC=/usr/local/bin/rustc /usr/local/bin/cargo build --release --frozen --manifest-path /wrkdirs/usr/ports/mail/thunderbird/work/thunderbird-52.3.0/mozilla/toolkit/library/gtest/rust/Cargo.toml --target=x86_64-unknown-freebsd --verbose --
error: failed to load source for a dependency on `mp4parse_capi`
Caused by:
Unable to update file:///wrkdirs/usr/ports/mail/thunderbird/work/thunderbird-52.3.0/mozilla/media/libstagefright/binding/mp4parse_capi
Caused by:
failed to parse manifest at `/wrkdirs/usr/ports/mail/thunderbird/work/thunderbird-52.3.0/mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml`
Caused by:
could not parse input as TOML
Caused by:
duplicate key: `build` for key `package`
cf. https://hg.mozilla.org/releases/mozilla-esr52/shortlog/THUNDERBIRD_52_VERBRANCH
Reported by: YuryG @ forums.freebsd.org
Diffstat (limited to 'mail/thunderbird')
-rw-r--r-- | mail/thunderbird/files/patch-bug1338655 | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/mail/thunderbird/files/patch-bug1338655 b/mail/thunderbird/files/patch-bug1338655 deleted file mode 100644 index 2471ca987e12..000000000000 --- a/mail/thunderbird/files/patch-bug1338655 +++ /dev/null @@ -1,66 +0,0 @@ -commit bbd48a5613c8 -Author: Ralph Giles <giles@mozilla.com> -Date: Fri Feb 10 12:58:18 2017 -0800 - - Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj - - We use the cheddar crate to generate a C header file - for our mp4parse_capi wrapper crate. Currently we - do this at code check-in time via update-rust.sh. - - Cargo 0.18 and later will try to execute a build.rs - file in the crate source tree regardless of whether - it's specified in Cargo.toml so patching out that - line just results in 'crate cheddar not found'. - - This change restores the old behaviour by substituting - a 'build = false' line instead. - - We do have syntex vendored, but we don't currently build - it by default, so I prefer this solution to just vendoring - cheddar and generating the header at build time. The syntex - crate is quite large and adds significantly to our compile - time. - - MozReview-Commit-ID: InJRRODWAdP - - --HG-- - extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e ---- - media/libstagefright/binding/mp4parse-cargo.patch | 5 +++-- - media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++ - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git media/libstagefright/binding/mp4parse-cargo.patch media/libstagefright/binding/mp4parse-cargo.patch -index 1dd13d20472a..bfa0ab74b424 100644 ---- mozilla/media/libstagefright/binding/mp4parse-cargo.patch -+++ mozilla/media/libstagefright/binding/mp4parse-cargo.patch -@@ -25,12 +25,13 @@ diff --git a/media/libstagefright/binding/mp4parse_cap - index aeeebc65..5c0836a 100644 - --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml - +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml --@@ -18,17 +18,9 @@ exclude = [ -+@@ -18,17 +18,11 @@ exclude = [ - "*.mp4", - ] - - -build = "build.rs" --- -++build = false -+ - [dependencies] - "mp4parse" = {version = "0.6.0", path = "../mp4parse"} - -diff --git media/libstagefright/binding/mp4parse_capi/Cargo.toml media/libstagefright/binding/mp4parse_capi/Cargo.toml -index aee7ee947151..d7e3f55119d3 100644 ---- mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml -+++ mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml -@@ -18,6 +18,8 @@ exclude = [ - "*.mp4", - ] - -+build = false -+ - [dependencies] - byteorder = "1.0.0" - "mp4parse" = {version = "0.6.0", path = "../mp4parse"} |