summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Horak <jhorak@redhat.com>2017-05-05 18:11:02 +0200
committerJan Horak <jhorak@redhat.com>2017-05-05 18:11:02 +0200
commit4f3e31551b762eb8d9e2a753cecfd91393c2f5fc (patch)
tree6604da62ec04da13387258462d205f69687568cc
parentMerge branch 'master' into f24 (diff)
downloadlibrewolf-fedora-ff-4f3e31551b762eb8d9e2a753cecfd91393c2f5fc.tar.gz
librewolf-fedora-ff-4f3e31551b762eb8d9e2a753cecfd91393c2f5fc.tar.bz2
librewolf-fedora-ff-4f3e31551b762eb8d9e2a753cecfd91393c2f5fc.zip
Added patch for fix build problems with rust cheddar package
-rw-r--r--build-1360521-missing-cheddar.patch13
-rw-r--r--firefox.spec2
2 files changed, 15 insertions, 0 deletions
diff --git a/build-1360521-missing-cheddar.patch b/build-1360521-missing-cheddar.patch
new file mode 100644
index 0000000..9595164
--- /dev/null
+++ b/build-1360521-missing-cheddar.patch
@@ -0,0 +1,13 @@
+diff --git a/mozilla-release/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/mozilla-release/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+index aee7ee9471..d7e3f55119 100644
+--- a/mozilla-release/media/libstagefright/binding/mp4parse_capi/Cargo.toml
++++ b/mozilla-release/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"}
diff --git a/firefox.spec b/firefox.spec
index b226259..a9a397b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -140,6 +140,7 @@ Patch20: firefox-build-prbool.patch
Patch25: rhbz-1219542-s390-build.patch
Patch26: build-icu-big-endian.patch
Patch27: mozilla-1335250.patch
+Patch28: build-1360521-missing-cheddar.patch
# Fedora specific patches
# Unable to install addons from https pages
@@ -310,6 +311,7 @@ cd %{tarballdir}
%patch25 -p1 -b .rhbz-1219542-s390
%endif
%patch27 -p1 -b .1335250
+%patch28 -p2 -b .1360521-missing-cheddar
%patch3 -p1 -b .arm
bgstack15