[gimp] build/win: Upgrade webkitgtk to 2.0.4
- From: Michael Henning <mhenning src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] build/win: Upgrade webkitgtk to 2.0.4
- Date: Sun, 1 Jun 2014 03:39:15 +0000 (UTC)
commit a7953fb1a19f7fc8f450391b95e56a0688859ba0
Author: Michael Henning <drawoc darkrefraction com>
Date: Sat May 31 21:07:05 2014 -0400
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(-)
---
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 0000000..7e47094
--- /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 <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>
diff --git a/build/windows/jhbuild/webkitgtk.moduleset b/build/windows/jhbuild/webkitgtk.moduleset
index c8e57a0..d1f7aa2 100644
--- a/build/windows/jhbuild/webkitgtk.moduleset
+++ b/build/windows/jhbuild/webkitgtk.moduleset
@@ -39,11 +39,13 @@
</autotools>
<autotools id="webkitgtk">
- <branch version="2.0.3" repo="webkitgtk.org"
- module="webkitgtk-2.0.3.tar.xz"
- hash="sha1:136c649c34956cadfaac9b13bbad368b70d38820">
+ <branch version="2.0.4" repo="webkitgtk.org"
+ module="webkitgtk-2.0.4.tar.xz"
+ hash="sha1:3b9ddbdc61e38b5c8fdd108e891b7db5fb12d55a">
<patch file="webkit-add-autogen.patch" strip="1"/>
<patch file="webkit-2.0-disable-tests.patch" strip="1"/>
+ <!-- Part of: http://trac.webkit.org/changeset/159939 -->
+ <patch file="webkit-fix-freetype.diff" strip="2"/>
</branch>
<dependencies>
<dep package="mingw32-pthreads"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]