diff options
author | Andreas Grapentin <andreas@grapentin.org> | 2019-03-10 11:33:27 +0100 |
---|---|---|
committer | Andreas Grapentin <andreas@grapentin.org> | 2019-03-10 11:39:00 +0100 |
commit | 1c4db552865a01f756bc821139525fb61b0c7ae7 (patch) | |
tree | 3b1fccc5eaeb573b55f77f65a9dc6107a707a6a9 /nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch | |
parent | 169a84eff8a29e910b215c8c8e2ab14ee92c5543 (diff) | |
download | abslibre-1c4db552865a01f756bc821139525fb61b0c7ae7.tar.gz abslibre-1c4db552865a01f756bc821139525fb61b0c7ae7.tar.bz2 abslibre-1c4db552865a01f756bc821139525fb61b0c7ae7.zip |
nonprism/icedove: updated to 60.5.1
Diffstat (limited to 'nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch')
-rw-r--r-- | nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch b/nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch deleted file mode 100644 index cf2e0eb9b..000000000 --- a/nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001 -From: Ralph Giles <giles@mozilla.com> -Date: Fri, 10 Feb 2017 12:58:18 -0800 -Subject: [PATCH] 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 a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml -index aee7ee947151a27c..d7e3f55119d3f4b6 100644 ---- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml -+++ b/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"} --- -2.12.2 - |