- proper fix for freetype 2.6

diff --git a/freetype-2.6.patch b/freetype-2.6.patch
index 6cd43bbe58453ebda48a912f0612d55eb5e05e0e..1b4403e5628d7822a1142a03c966473eacdaf031 100644 (file)
--- a/freetype-2.6.patch
+++ b/freetype-2.6.patch
@@ -1,31 +1,10 @@
---- mozilla/gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp~  2015-05-25 23:28:39.000000000 +0200
-+++ mozilla/gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp   2015-06-14 11:20:11.673675291 +0200
-@@ -39,7 +39,7 @@
- #include FT_BITMAP_H
- // In the past, FT_GlyphSlot_Own_Bitmap was defined in this header file.
- #include FT_SYNTHESIS_H
--#include FT_XFREE86_H
-+#include FT_FONT_FORMATS_H
- #ifdef FT_LCD_FILTER_H
- #include FT_LCD_FILTER_H
- #endif
-@@ -557,7 +557,7 @@
-     info->fEmSize = 1000;
- 
-     bool cid = false;
--    const char* fontType = FT_Get_X11_Font_Format(face);
-+    const char* fontType = FT_Get_Font_Format(face);
-     if (strcmp(fontType, "Type 1") == 0) {
-         info->fType = SkAdvancedTypefaceMetrics::kType1_Font;
-     } else if (strcmp(fontType, "CID Type 1") == 0) {
---- mozilla/gfx/cairo/cairo/src/cairo-ft-font.c~       2015-05-25 23:28:55.000000000 +0200
-+++ mozilla/gfx/cairo/cairo/src/cairo-ft-font.c        2015-06-14 11:21:19.521750404 +0200
-@@ -1252,7 +1252,7 @@
- 
-           align = cairo_format_stride_for_width (format, bitmap->width);
- 
--          FT_Bitmap_New( &tmp );
-+          FT_Bitmap_Init( &tmp );
- 
-           if (FT_Bitmap_Convert( library, bitmap, &tmp, align ))
-               return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+--- mozilla/config/system-headers~     2015-05-25 23:28:44.000000000 +0200
++++ mozilla/config/system-headers      2015-06-11 23:07:35.000000000 +0200
+@@ -471,6 +470,7 @@
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h

diff --git a/iceweasel.spec b/iceweasel.spec
index 1f474a228331c54ba422fc68b93d84348a3d2283..172c48b8663a89d99d3e9890df0a975a7c1b669e 100644 (file)
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -58,7 +58,7 @@ BuildRequires:        automake
 BuildRequires: bzip2-devel
 BuildRequires: cairo-devel >= 1.10.2-5
 BuildRequires: dbus-glib-devel >= 0.60
-BuildRequires: freetype-devel >= 1:2.6
+BuildRequires: freetype-devel >= 1:2.1.8
 BuildRequires: gcc-c++ >= 6:4.4
 BuildRequires: glib2-devel >= 1:2.22
 BuildRequires: gstreamer-devel >= 1.0