From 2b901c6e74067673a3710dde8fe68344d284e390 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 17 May 2017 18:36:18 +0200 Subject: [PATCH] thunderbird: fix rust build --- srcpkgs/thunderbird/fix-python-foo.patch | 23 -------------- .../thunderbird/patches/fix-cheddar-dep.patch | 30 +++++++++++++++++++ 2 files changed, 30 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/thunderbird/fix-python-foo.patch create mode 100644 srcpkgs/thunderbird/patches/fix-cheddar-dep.patch diff --git a/srcpkgs/thunderbird/fix-python-foo.patch b/srcpkgs/thunderbird/fix-python-foo.patch deleted file mode 100644 index cf05f73046..0000000000 --- a/srcpkgs/thunderbird/fix-python-foo.patch +++ /dev/null @@ -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) diff --git a/srcpkgs/thunderbird/patches/fix-cheddar-dep.patch b/srcpkgs/thunderbird/patches/fix-cheddar-dep.patch new file mode 100644 index 0000000000..c2cf58f716 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-cheddar-dep.patch @@ -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"} +