thunderbird: fix rust build

This commit is contained in:
Enno Boland 2017-05-17 18:36:18 +02:00
parent fb264f9fd4
commit 2b901c6e74
2 changed files with 30 additions and 23 deletions

View file

@ -1,23 +0,0 @@
reverted from https://hg.mozilla.org/mozilla-central/rev/aa63a2a40325
--- mozilla/dom/bindings/GenerateCSS2PropertiesWebIDL.py.orig
+++ mozilla/dom/bindings/GenerateCSS2PropertiesWebIDL.py
@@ -16,7 +16,7 @@
return " [%s] attribute DOMString %s;\n" % (", ".join(extendedAttrs),
propName)
def generate(output, idlFilename, preprocessorHeader):
- cpp = list(buildconfig.substs['CPP'])
+ cpp = shellutil.split(buildconfig.substs['CPP'])
cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
cpp.append(preprocessorHeader)
preprocessed = subprocess.check_output(cpp)
--- mozilla/layout/style/GenerateCSSPropsGenerated.py.orig
+++ mozilla/layout/style/GenerateCSSPropsGenerated.py
@@ -10,7 +10,7 @@
from mozbuild import shellutil
def get_properties(preprocessorHeader):
- cpp = list(buildconfig.substs['CPP'])
+ cpp = shellutil.split(buildconfig.substs['CPP'])
cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
cpp.append(preprocessorHeader)
preprocessed = subprocess.check_output(cpp)

View file

@ -0,0 +1,30 @@
See Bug https://bugzilla.mozilla.org/show_bug.cgi?id=1338655
--- mozilla/media/libstagefright/binding/mp4parse-cargo.patch.orig 2017-05-17 18:28:48.627377816 +0200
+++ mozilla/media/libstagefright/binding/mp4parse-cargo.patch 2017-05-17 18:30:27.349873737 +0200
@@ -25,12 +25,14 @@ diff --git a/media/libstagefright/bindin
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"}
--- mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml.orig 2017-05-17 18:30:58.571714318 +0200
+++ mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml 2017-05-17 18:31:02.624693622 +0200
@@ -18,6 +18,8 @@ exclude = [
"*.mp4",
]
+build = false
+
[dependencies]
"mp4parse" = {version = "0.6.0", path = "../mp4parse"}