Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2017-09-27 16:39:43 +02:00
commit 36d2b8e6c8
2 changed files with 12 additions and 0 deletions

View File

@ -159,6 +159,7 @@ Patch410: mozilla-1321521.patch
Patch411: mozilla-1321521-2.patch
Patch412: mozilla-1337988.patch
Patch413: mozilla-1353817.patch
Patch414: mozilla-1341234.patch
# Debian patches
Patch500: mozilla-440908.patch
@ -207,6 +208,7 @@ BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: yasm
BuildRequires: llvm
BuildRequires: llvm-devel
BuildRequires: clang
BuildRequires: clang-libs
Requires: mozilla-filesystem
@ -344,6 +346,7 @@ This package contains results of tests executed during build.
%endif
%endif
%patch413 -p1 -b .1353817
%patch414 -p1 -b .1341234
# Debian extension patch
%patch500 -p1 -b .440908

9
mozilla-1341234.patch Normal file
View File

@ -0,0 +1,9 @@
diff -up firefox-56.0/layout/style/bindgen.toml.in.old firefox-56.0/layout/style/bindgen.toml.in
--- firefox-56.0/layout/style/bindgen.toml.in.old 2017-09-27 16:30:14.518213900 +0200
+++ firefox-56.0/layout/style/bindgen.toml.in 2017-09-27 16:30:38.089179153 +0200
@@ -1,4 +1,5 @@
[build]
args = [
+ "/usr/include",
@BINDGEN_CFLAGS@
]