From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 14 Jun 2015 09:24:28 +0000 (+0200)
Subject: - fix building with freetypr 2.6
X-Git-Tag: auto/th/iceweasel-38.0.5-1~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Ficeweasel.git;a=commitdiff_plain;h=e425b710e2f24ecc1968f452f0bc65bc3b2df733

- fix building with freetypr 2.6
---

diff --git a/freetype-2.6.patch b/freetype-2.6.patch
new file mode 100644
index 0000000..6cd43bb
--- /dev/null
+++ b/freetype-2.6.patch
@@ -0,0 +1,31 @@
+--- 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);
diff --git a/iceweasel.spec b/iceweasel.spec
index 1ee1c85..1f474a2 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -48,6 +48,7 @@ Patch9:		%{name}-middle_click_paste.patch
 Patch10:	%{name}-packaging.patch
 Patch11:	system-virtualenv.patch
 Patch12:	Disable-Firefox-Health-Report.patch
+Patch13:	freetype-2.6.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
 BuildRequires:	OpenGL-devel
 BuildRequires:	ImageMagick
@@ -57,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.1.8
+BuildRequires:	freetype-devel >= 1:2.6
 BuildRequires:	gcc-c++ >= 6:4.4
 BuildRequires:	glib2-devel >= 1:2.22
 BuildRequires:	gstreamer-devel >= 1.0
@@ -217,6 +218,7 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 %patch10 -p1
 %patch11 -p2
 %patch12 -p1
+%patch13 -p1
 
 cp -a xulrunner/installer/*.pc.in browser/installer/