Title: [165485] trunk/Tools
- Revision
- 165485
- Author
- [email protected]
- Date
- 2014-03-12 11:16:49 -0700 (Wed, 12 Mar 2014)
Log Message
Unreviewed, rolling out r165471.
https://bugs.webkit.org/show_bug.cgi?id=130139
Didn't really fix the issue and broke another bot (Requested
by mrobinson on #webkit).
Reverted changeset:
"[CMake] Newer versions of CMake cannot find older versions of
Freetype"
https://bugs.webkit.org/show_bug.cgi?id=130107
http://trac.webkit.org/changeset/165471
Patch by Commit Queue <[email protected]> on 2014-03-12
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (165484 => 165485)
--- trunk/Tools/ChangeLog 2014-03-12 18:15:06 UTC (rev 165484)
+++ trunk/Tools/ChangeLog 2014-03-12 18:16:49 UTC (rev 165485)
@@ -1,3 +1,18 @@
+2014-03-12 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r165471.
+ https://bugs.webkit.org/show_bug.cgi?id=130139
+
+ Didn't really fix the issue and broke another bot (Requested
+ by mrobinson on #webkit).
+
+ Reverted changeset:
+
+ "[CMake] Newer versions of CMake cannot find older versions of
+ Freetype"
+ https://bugs.webkit.org/show_bug.cgi?id=130107
+ http://trac.webkit.org/changeset/165471
+
2014-03-11 Filip Pizlo <[email protected]>
It should be possible to build WebKit with FTL on iOS
Modified: trunk/Tools/gtk/jhbuildrc (165484 => 165485)
--- trunk/Tools/gtk/jhbuildrc 2014-03-12 18:15:06 UTC (rev 165484)
+++ trunk/Tools/gtk/jhbuildrc 2014-03-12 18:16:49 UTC (rev 165485)
@@ -31,9 +31,3 @@
# We always enable introspection so that we can sniff out problems with our
# annotations sooner rather than later.
autogenargs='--enable-introspection'
-
-# After https://github.com/Kitware/CMake/commit/7435ae7c97590a0713d86b63add761d5e1607ec1
-# CMake is no longer able to find the FreeType headers in our JHBuild root. We
-# work around this by specifying FREETYPE_DIR directly as a hint to the header
-# locator in CMake's bundled FindFreetype.cmake.
-addpath('FREETYPE_DIR', os.path.join(prefix, "include", "freetype2", "freetype"))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
