From a7953fb1a19f7fc8f450391b95e56a0688859ba0 Mon Sep 17 00:00:00 2001 From: Michael Henning Date: Sat, 31 May 2014 21:07:05 -0400 Subject: [PATCH] build/win: Upgrade webkitgtk to 2.0.4 Also fix the build against the latest versions of freetype. --- .../jhbuild/patches/webkit-fix-freetype.diff | 14 ++++++++++++++ build/windows/jhbuild/webkitgtk.moduleset | 8 +++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 build/windows/jhbuild/patches/webkit-fix-freetype.diff diff --git a/build/windows/jhbuild/patches/webkit-fix-freetype.diff b/build/windows/jhbuild/patches/webkit-fix-freetype.diff new file mode 100644 index 0000000000..7e47094e24 --- /dev/null +++ b/build/windows/jhbuild/patches/webkit-fix-freetype.diff @@ -0,0 +1,14 @@ +Index: /trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp +=================================================================== +--- /trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp (revision 159938) ++++ /trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp (revision 159939) +@@ -40,6 +40,7 @@ + #include + #include +-#include +-#include ++#include ++#include FT_FREETYPE_H ++#include FT_TRUETYPE_TABLES_H + #include + #include diff --git a/build/windows/jhbuild/webkitgtk.moduleset b/build/windows/jhbuild/webkitgtk.moduleset index c8e57a0ca7..d1f7aa20d6 100644 --- a/build/windows/jhbuild/webkitgtk.moduleset +++ b/build/windows/jhbuild/webkitgtk.moduleset @@ -39,11 +39,13 @@ - + + +