- fix building with system cairo (bundled one is very old)

diff --git a/firefox.spec b/firefox.spec
index 0f03c2ff89ce189ad6f2e33663a510d92462744e..99c366988712f340ca8ee001b8f16f5f54074644 100644 (file)
--- a/firefox.spec
+++ b/firefox.spec
@@ -244,6 +244,7 @@ Patch6:             %{name}-no-subshell.patch
 Patch7:                %{name}-middle_click_paste.patch
 Patch8:                %{name}-system-virtualenv.patch
 Patch9:                %{name}-Disable-Firefox-Health-Report.patch
+Patch10:       system-cairo.patch
 URL:           https://www.mozilla.org/firefox/
 BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel
@@ -2020,6 +2021,7 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 %patch7 -p1
 %patch8 -p2
 %patch9 -p1
+%patch10 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' xpcom/typelib/xpt/tools/xpt.py xpcom/idl-parser/xpidl/xpidl.py
 

diff --git a/system-cairo.patch b/system-cairo.patch
new file mode 100644 (file)
index 0000000..930053a
--- /dev/null
+++ b/system-cairo.patch
@@ -0,0 +1,11 @@
+--- mozilla-release-239e434d6d2b8e1e2b697c3416d1e96d48fe98e5/gfx/2d/ScaledFontFontconfig.cpp~  2018-03-22 21:46:41.000000000 +0100
++++ mozilla-release-239e434d6d2b8e1e2b697c3416d1e96d48fe98e5/gfx/2d/ScaledFontFontconfig.cpp   2018-03-31 12:33:56.794222766 +0200
+@@ -397,7 +397,7 @@
+   FcPatternAddDouble(pattern, FC_PIXEL_SIZE, aSize);
+   aInstanceData.SetupPattern(pattern);
+ 
+-  cairo_font_face_t* font = cairo_ft_font_face_create_for_pattern(pattern, nullptr, 0);
++  cairo_font_face_t* font = cairo_ft_font_face_create_for_pattern(pattern);
+   if (cairo_font_face_status(font) != CAIRO_STATUS_SUCCESS) {
+     gfxWarning() << "Failed creating Cairo font face for Fontconfig pattern";
+     FcPatternDestroy(pattern);