dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build/win: Upgrade webkitgtk to 2.0.4 

Also fix the build against the latest versions of freetype.
This commit is contained in:
Michael Henning 2014-05-31 21:07:05 -04:00
parent 42ba02bcd6
commit a7953fb1a1
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/windows/jhbuild/patches/webkit-fix-freetype.diff Normal file
View File

@ -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>

8
build/windows/jhbuild/webkitgtk.moduleset
View File

@ -39,11 +39,13 @@
</autotools> </autotools>
<autotools id="webkitgtk"> <autotools id="webkitgtk">
<branch version="2.0.3" repo="webkitgtk.org" <branch version="2.0.4" repo="webkitgtk.org"
module="webkitgtk-2.0.3.tar.xz" module="webkitgtk-2.0.4.tar.xz"
hash="sha1:136c649c34956cadfaac9b13bbad368b70d38820"> hash="sha1:3b9ddbdc61e38b5c8fdd108e891b7db5fb12d55a">
<patch file="webkit-add-autogen.patch" strip="1"/> <patch file="webkit-add-autogen.patch" strip="1"/>
<patch file="webkit-2.0-disable-tests.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> </branch>
<dependencies> <dependencies>
<dep package="mingw32-pthreads"/> <dep package="mingw32-pthreads"/>