[GTK] Fails to build with freetype 2.5.1
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Dec 2013 17:49:08 +0000 (17:49 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Dec 2013 17:49:08 +0000 (17:49 +0000)
https://bugs.webkit.org/show_bug.cgi?id=125074

Patch by Andres Gomez <agomez@igalia.com> on 2013-12-02
Reviewed by Carlos Garcia Campos.

FreeType specifies a canonical way of including their own
headers. Now, we are following this recommendation so the
compilation won't be broken again due to an upgrade in FeeType's
including paths.

* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
* platform/graphics/freetype/SimpleFontDataFreeType.cpp:
* platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159939 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp
Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp

index 34cb988..e8ca4ae 100644 (file)
@@ -1,3 +1,19 @@
+2013-12-02  Andres Gomez  <agomez@igalia.com>
+
+        [GTK] Fails to build with freetype 2.5.1
+        https://bugs.webkit.org/show_bug.cgi?id=125074
+
+        Reviewed by Carlos Garcia Campos.
+
+        FreeType specifies a canonical way of including their own
+        headers. Now, we are following this recommendation so the
+        compilation won't be broken again due to an upgrade in FeeType's
+        including paths.
+
+        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+        * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
+        * platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:
+
 2013-12-02  Chris Fleizach  <cfleizach@apple.com>
 
         AX: Crash at WebCore::commonTreeScope
index 33d1d26..55cd9ce 100644 (file)
@@ -29,7 +29,8 @@
 #include <cairo-ft.h>
 #include <cairo.h>
 #include <fontconfig/fcfreetype.h>
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
 #include <wtf/text/WTFString.h>
 
 #if !PLATFORM(EFL) && !PLATFORM(NIX)
index 7ff114b..80c4042 100644 (file)
@@ -44,8 +44,9 @@
 #include <cairo-ft.h>
 #include <cairo.h>
 #include <fontconfig/fcfreetype.h>
-#include <freetype/tttables.h>
-#include <freetype/tttags.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
+#include FT_TRUETYPE_TAGS_H
 #include <unicode/normlzr.h>
 #include <wtf/MathExtras.h>
 #include <wtf/unicode/Unicode.h>
index ecaafc1..52b9240 100644 (file)
@@ -39,8 +39,9 @@
 #include "TextEncoding.h"
 #include <cairo-ft.h>
 #include <cairo.h>
-#include <freetype/freetype.h>
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_TRUETYPE_TABLES_H
 #include <hb.h>
 #include <wtf/text/CString.h>