[packages/iceweasel] - fix freetype linking error

[baggins]

commit c908f1ec13e4af4e48d0380c3661865d7445c0c5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 13 23:32:11 2015 +0200

    - fix freetype linking error

 freetype.patch | 21 ++++++++++-----------
 iceweasel.spec |  3 ---
 2 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index a9a56f3..40b8ebd 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -1,8 +1,5 @@
 # TODO:
 # - consider --enable-libproxy
-# - fix compilation errors:
-#   `error: 'PRLogModuleInfo' does not name a type'
-#   and similar
 #
 # Conditional build:
 %bcond_with	tests		# enable tests (whatever they check)
diff --git a/freetype.patch b/freetype.patch
index 8d9d2cb..b68208e 100644
--- a/freetype.patch
+++ b/freetype.patch
@@ -1,11 +1,10 @@
---- iceweasel-41.0.1/mozilla/gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp~	2015-09-29 23:44:50.000000000 +0200
-+++ iceweasel-41.0.1/mozilla/gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp	2015-10-12 07:51:10.791980529 +0200
-@@ -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) {
+--- iceweasel-41.0.1/mozilla/config/system-headers~	2015-09-29 23:44:56.000000000 +0200
++++ iceweasel-41.0.1/mozilla/config/system-headers	2015-10-13 22:19:29.758370730 +0200
+@@ -454,6 +454,7 @@
+ frame/log.h
+ frame/req.h
+ freetype/freetype.h
++freetype/ftfntfmt.h
+ freetype/ftcache.h
+ freetype/ftglyph.h
+ freetype/ftsynth.h
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/c908f1ec13e4af4e48d0380c3661865d7445c0c5