[oe] [meta-browser][PATCH 1/2] firefox: properly fix build without freetype-config

[Martin Jansa]

* fails with:
  ../../gfx/thebes/gfxFT2Utils.o: In function `gfxFT2LockedFace::GetMetrics(gfxFont::Metrics*, unsigned int*)':
  /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/firefox/10.0.11esr-r0/mozilla-esr10/gfx/thebes/gfxFT2Utils.cpp:139: undefined reference to `FT_Get_Sfnt_Table'
  /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/firefox/10.0.11esr-r0/mozilla-esr10/gfx/thebes/gfxFT2Utils.cpp:234: undefined reference to `FT_Get_Sfnt_Table'
  ../../gfx/thebes/gfxFT2Utils.o: In function `gfxFT2LockedFace::GetFontTable(unsigned int, FallibleTArray<unsigned char>&)':
  /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/firefox/10.0.11esr-r0/mozilla-esr10/gfx/thebes/gfxFT2Utils.cpp:364: undefined reference to `FT_Load_Sfnt_Table'
  /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/firefox/10.0.11esr-r0/mozilla-esr10/gfx/thebes/gfxFT2Utils.cpp:372: undefined reference to `FT_Load_Sfnt_Table'
  collect2: error: ld returned 1 exit status
  ../../config/rules.mk:1089: recipe for target 'libxul.so' failed

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 recipes-mozilla/firefox/firefox/freetype-2.5.patch | 73 ++++++++++++++++++++++
 recipes-mozilla/firefox/firefox_10.0.11esr.bb      |  2 +-
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 recipes-mozilla/firefox/firefox/freetype-2.5.patch

diff --git a/recipes-mozilla/firefox/firefox/freetype-2.5.patch b/recipes-mozilla/firefox/firefox/freetype-2.5.patch
new file mode 100644
index 0000000..78f4ff8
--- /dev/null
+++ b/recipes-mozilla/firefox/firefox/freetype-2.5.patch
@@ -0,0 +1,73 @@
+Adapted from:
+https://bugzilla.mozilla.org/show_bug.cgi?id=944454
+
+Upstream-Status: Backport
+
+Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
+
+diff -uNr mozilla-esr10.orig/config/system-headers mozilla-esr10/config/system-headers
+--- mozilla-esr10.orig/config/system-headers	2012-11-15 19:24:02.000000000 +0100
++++ mozilla-esr10/config/system-headers	2014-08-09 20:59:18.103672068 +0200
+@@ -273,6 +273,19 @@
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftsynth.h
++ftoutln.h
++ttnameid.h
++tttables.h
++t1tables.h
++ftlcdfil.h
++ftsizes.h
++ftadvanc.h
++ftbitmap.h
++ftxf86.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream
+diff -uNr mozilla-esr10.orig/js/src/config/system-headers mozilla-esr10/js/src/config/system-headers
+--- mozilla-esr10.orig/js/src/config/system-headers	2012-11-15 19:24:19.000000000 +0100
++++ mozilla-esr10/js/src/config/system-headers	2014-08-09 20:59:25.877672347 +0200
+@@ -273,6 +273,19 @@
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftsynth.h
++ftoutln.h
++ttnameid.h
++tttables.h
++t1tables.h
++ftlcdfil.h
++ftsizes.h
++ftadvanc.h
++ftbitmap.h
++ftxf86.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream
+--- mozilla-esr10.orig/configure	2014-08-09 23:05:46.397944139 +0200
++++ mozilla-esr10/configure	2014-08-09 23:07:23.691947627 +0200
+@@ -16011,8 +16011,7 @@
+ #define MOZ_PANGO 1
+ EOF
+ 
+-    else
+-        succeeded=no
++    fi
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+@@ -16105,7 +16104,6 @@
+ 
+         
+         
+-    fi
+ fi
+ 
+ if test "$MOZ_ENABLE_QT"
diff --git a/recipes-mozilla/firefox/firefox_10.0.11esr.bb b/recipes-mozilla/firefox/firefox_10.0.11esr.bb
index 98da1a4..307e672 100644
--- a/recipes-mozilla/firefox/firefox_10.0.11esr.bb
+++ b/recipes-mozilla/firefox/firefox_10.0.11esr.bb
@@ -73,6 +73,7 @@ SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/f
            file://debian-hacks/Bug-508942-Use-Preprocessor.py-filters-in-defines-an.patch \
            file://configure.patch \
            file://powerpc_va_list.patch \
+	   file://freetype-2.5.patch \
            file://vendor.js"
 
 SRC_URI[archive.md5sum] = "2f0e3a1dd7480e03f374c0121b4155e2"
@@ -85,7 +86,6 @@ inherit mozilla
 EXTRA_OEMAKE = "installdir=${libdir}/${PN}"
 
 ARM_INSTRUCTION_SET = "arm"
-TARGET_CC_ARCH += " -I${STAGING_INCDIR}/freetype2"
 
 do_install() {
 	oe_runmake DESTDIR="${D}" destdir="${D}" install
-- 
2.0.4