Changeset 159939 in webkit


Ignore:
Timestamp:
Dec 2, 2013 9:49:08 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] Fails to build with freetype 2.5.1
​https://bugs.webkit.org/show_bug.cgi?id=125074

Patch by Andres Gomez <Andres Gomez> 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:
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r159932 r159939  
     12013-12-02  Andres Gomez  <agomez@igalia.com>
     2
     3        [GTK] Fails to build with freetype 2.5.1
     4        https://bugs.webkit.org/show_bug.cgi?id=125074
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        FreeType specifies a canonical way of including their own
     9        headers. Now, we are following this recommendation so the
     10        compilation won't be broken again due to an upgrade in FeeType's
     11        including paths.
     12
     13        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
     14        * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
     15        * platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:
     16
    1172013-12-02  Chris Fleizach  <cfleizach@apple.com>
    218

  • trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp

    r158848 r159939  
    3030#include <cairo.h>
    3131#include <fontconfig/fcfreetype.h>
    32 #include <freetype/tttables.h>
     32#include <ft2build.h>
     33#include FT_TRUETYPE_TABLES_H
    3334#include <wtf/text/WTFString.h>
    3435

  • trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp

    r158848 r159939  
    4545#include <cairo.h>
    4646#include <fontconfig/fcfreetype.h>
    47 #include <freetype/tttables.h>
    48 #include <freetype/tttags.h>
     47#include <ft2build.h>
     48#include FT_TRUETYPE_TABLES_H
     49#include FT_TRUETYPE_TAGS_H
    4950#include <unicode/normlzr.h>
    5051#include <wtf/MathExtras.h>

  • trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp

    r158848 r159939  
    4040#include <cairo-ft.h>
    4141#include <cairo.h>
    42 #include <freetype/freetype.h>
    43 #include <freetype/tttables.h>
     42#include <ft2build.h>
     43#include FT_FREETYPE_H
     44#include FT_TRUETYPE_TABLES_H
    4445#include <hb.h>
    4546#include <wtf/text/CString.h>
Note: See TracChangeset for help on using the changeset viewer.