[oe-commits] Martin Jansa : evas: Fix build with newer freetype

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 260a86b94eaf4bf53e4b2faee161afe85cf829a3
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=260a86b94eaf4bf53e4b2faee161afe85cf829a3

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Jan  1 13:04:41 2014 +0100

evas: Fix build with newer freetype

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 ...s_font_load-Fix-build-with-newer-freetype.patch | 26 ++++++++++++++++++++++
 meta-efl/recipes-efl/efl/evas_1.7.9.bb             |  1 +
 2 files changed, 27 insertions(+)

diff --git a/meta-efl/recipes-efl/efl/evas/0001-evas_font_load-Fix-build-with-newer-freetype.patch b/meta-efl/recipes-efl/efl/evas/0001-evas_font_load-Fix-build-with-newer-freetype.patch
new file mode 100644
index 0000000..0197f1c
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas/0001-evas_font_load-Fix-build-with-newer-freetype.patch
@@ -0,0 +1,26 @@
+From ff5e8aa48d223401497dbaad1ffdc81977b2c09d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Wed, 1 Jan 2014 13:03:48 +0100
+Subject: [PATCH] evas_font_load: Fix build with newer freetype
+
+Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
+---
+ src/lib/engines/common/evas_font_load.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/engines/common/evas_font_load.c b/src/lib/engines/common/evas_font_load.c
+index 805eaf8..6650816 100644
+--- a/src/lib/engines/common/evas_font_load.c
++++ b/src/lib/engines/common/evas_font_load.c
+@@ -5,7 +5,7 @@
+ 
+ #include "evas_font_private.h" /* for Frame-Queuing support */
+ #include "evas_font_ot.h"
+-#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
++#include <freetype2/tttables.h> /* Freetype2 OS/2 font table. */
+ 
+ #ifdef EVAS_CSERVE2
+ # include "../../cserve2/evas_cs2_private.h"
+-- 
+1.8.4.3
+
diff --git a/meta-efl/recipes-efl/efl/evas_1.7.9.bb b/meta-efl/recipes-efl/efl/evas_1.7.9.bb
index 455df46..1b6c7b3 100644
--- a/meta-efl/recipes-efl/efl/evas_1.7.9.bb
+++ b/meta-efl/recipes-efl/efl/evas_1.7.9.bb
@@ -171,6 +171,7 @@ PACKAGECONFIG[harfbuzz] = "--enable-harfbuzz,--disable-harfbuzz,harfbuzz"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+    file://0001-evas_font_load-Fix-build-with-newer-freetype.patch \
 "
 
 SRC_URI[md5sum] = "c96a23ede14cd0adb7e8e549e8acdee1"