<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166037] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166037">166037</a></dd>
<dt>Author</dt> <dd>thiago.lacerda@openbossa.org</dd>
<dt>Date</dt> <dd>2014-03-20 20:47:26 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][GTK] Get CMake to find Freetype2 properly
https://bugs.webkit.org/show_bug.cgi?id=130150
Reviewed by Martin Robinson.
Newer versions of CMake are not able to find Freetype2 correctly.
FindFreetype2.cmake checks for the version number in freetype.h header, since it seems that bug exists in
freetype2 repo, because a completely different version number is found in freetype2.pc.
.:
* Source/cmake/FindFreetype2.cmake: Added.
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
Source/WebCore:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
Source/WebKit:
* PlatformEfl.cmake:
Source/WebKit2:
* PlatformEfl.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformEflcmake">trunk/Source/WebKit/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeFindFreetype2cmake">trunk/Source/cmake/FindFreetype2.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (166036 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-21 03:13:46 UTC (rev 166036)
+++ trunk/ChangeLog 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-20 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [EFL][GTK] Get CMake to find Freetype2 properly
+ https://bugs.webkit.org/show_bug.cgi?id=130150
+
+ Reviewed by Martin Robinson.
+
+ Newer versions of CMake are not able to find Freetype2 correctly.
+ FindFreetype2.cmake checks for the version number in freetype.h header, since it seems that bug exists in
+ freetype2 repo, because a completely different version number is found in freetype2.pc.
+
+ * Source/cmake/FindFreetype2.cmake: Added.
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+
</ins><span class="cx"> 2014-03-20 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Replay: capture and replay mouse events
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166036 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-21 03:13:46 UTC (rev 166036)
+++ trunk/Source/WebCore/ChangeLog 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-20 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [EFL][GTK] Get CMake to find Freetype2 properly
+ https://bugs.webkit.org/show_bug.cgi?id=130150
+
+ Reviewed by Martin Robinson.
+
+ Newer versions of CMake are not able to find Freetype2 correctly.
+ FindFreetype2.cmake checks for the version number in freetype.h header, since it seems that bug exists in
+ freetype2 repo, because a completely different version number is found in freetype2.pc.
+
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+
</ins><span class="cx"> 2014-03-20 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Suppress errors about using gdk_threads_enter gdk_threads_leave
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (166036 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2014-03-21 03:13:46 UTC (rev 166036)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> ${E_DBUS_EUKIT_LIBRARIES}
</span><span class="cx"> ${E_DBUS_LIBRARIES}
</span><span class="cx"> ${FONTCONFIG_LIBRARIES}
</span><del>- ${FREETYPE_LIBRARIES}
</del><ins>+ ${FREETYPE2_LIBRARIES}
</ins><span class="cx"> ${GLIB_GIO_LIBRARIES}
</span><span class="cx"> ${GLIB_GOBJECT_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> ${EEZE_INCLUDE_DIRS}
</span><span class="cx"> ${EINA_INCLUDE_DIRS}
</span><span class="cx"> ${EVAS_INCLUDE_DIRS}
</span><del>- ${FREETYPE_INCLUDE_DIRS}
</del><ins>+ ${FREETYPE2_INCLUDE_DIRS}
</ins><span class="cx"> ${LIBXML2_INCLUDE_DIR}
</span><span class="cx"> ${LIBXSLT_INCLUDE_DIR}
</span><span class="cx"> ${SQLITE_INCLUDE_DIR}
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (166036 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-03-21 03:13:46 UTC (rev 166036)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> ${CAIRO_LIBRARIES}
</span><span class="cx"> ${ENCHANT_LIBRARIES}
</span><span class="cx"> ${FONTCONFIG_LIBRARIES}
</span><del>- ${FREETYPE_LIBRARIES}
</del><ins>+ ${FREETYPE2_LIBRARIES}
</ins><span class="cx"> ${GEOCLUE_LIBRARIES}
</span><span class="cx"> ${GLIB_GIO_LIBRARIES}
</span><span class="cx"> ${GLIB_GMODULE_LIBRARIES}
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> ${ATK_INCLUDE_DIRS}
</span><span class="cx"> ${CAIRO_INCLUDE_DIRS}
</span><span class="cx"> ${ENCHANT_INCLUDE_DIRS}
</span><del>- ${FREETYPE_INCLUDE_DIRS}
</del><ins>+ ${FREETYPE2_INCLUDE_DIRS}
</ins><span class="cx"> ${GEOCLUE_INCLUDE_DIRS}
</span><span class="cx"> ${GIO_UNIX_INCLUDE_DIRS}
</span><span class="cx"> ${GLIB_INCLUDE_DIRS}
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (166036 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-03-21 03:13:46 UTC (rev 166036)
+++ trunk/Source/WebKit/ChangeLog 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-20 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [EFL][GTK] Get CMake to find Freetype2 properly
+ https://bugs.webkit.org/show_bug.cgi?id=130150
+
+ Reviewed by Martin Robinson.
+
+ Newer versions of CMake are not able to find Freetype2 correctly.
+ FindFreetype2.cmake checks for the version number in freetype.h header, since it seems that bug exists in
+ freetype2 repo, because a completely different version number is found in freetype2.pc.
+
+ * PlatformEfl.cmake:
+
</ins><span class="cx"> 2014-03-20 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Speculative build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformEfl.cmake (166036 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformEfl.cmake 2014-03-21 03:13:46 UTC (rev 166036)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> ${EO_LIBRARIES}
</span><span class="cx"> ${EVAS_LIBRARIES}
</span><span class="cx"> ${FONTCONFIG_LIBRARIES}
</span><del>- ${FREETYPE_LIBRARIES}
</del><ins>+ ${FREETYPE2_LIBRARIES}
</ins><span class="cx"> ${GLIB_GOBJECT_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><span class="cx"> ${HARFBUZZ_LIBRARIES}
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166036 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-21 03:13:46 UTC (rev 166036)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-20 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [EFL][GTK] Get CMake to find Freetype2 properly
+ https://bugs.webkit.org/show_bug.cgi?id=130150
+
+ Reviewed by Martin Robinson.
+
+ Newer versions of CMake are not able to find Freetype2 correctly.
+ FindFreetype2.cmake checks for the version number in freetype.h header, since it seems that bug exists in
+ freetype2 repo, because a completely different version number is found in freetype2.pc.
+
+ * PlatformEfl.cmake:
+
</ins><span class="cx"> 2014-03-20 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Suppress errors about using gdk_threads_enter gdk_threads_leave
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (166036 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2014-03-21 03:13:46 UTC (rev 166036)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> ${EO_LIBRARIES}
</span><span class="cx"> ${EVAS_LIBRARIES}
</span><span class="cx"> ${FONTCONFIG_LIBRARIES}
</span><del>- ${Freetype_LIBRARIES}
</del><ins>+ ${FREETYPE2_LIBRARIES}
</ins><span class="cx"> ${GLIB_GIO_LIBRARIES}
</span><span class="cx"> ${GLIB_GOBJECT_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span></span></pre></div>
<a id="trunkSourcecmakeFindFreetype2cmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/FindFreetype2.cmake (0 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindFreetype2.cmake (rev 0)
+++ trunk/Source/cmake/FindFreetype2.cmake 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -0,0 +1,88 @@
</span><ins>+# Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(PC_FREETYPE2 REQUIRED freetype2)
+
+find_path(FREETYPE2_HEADER_DIR
+ NAMES freetype.h
+ HINTS ${PC_FREETYPE2_INCLUDE_DIRS}
+ ${PC_FREETYPE2_INCLUDEDIR}
+ PATH_SUFFIXES freetype
+)
+
+find_path(FREETYPE2_ROOT_INCLUDE_DIR
+ NAMES freetype/freetype.h
+ HINTS ${PC_FREETYPE2_INCLUDE_DIRS}
+ ${PC_FREETYPE2_INCLUDEDIR}
+)
+
+find_library(FREETYPE2_LIBRARIES
+ NAMES freetype
+ HINTS ${PC_FREETYPE2_LIBDIR}
+ ${PC_FREETYPE2_LIBRARY_DIRS}
+)
+
+set(FREETYPE2_INCLUDE_DIRS ${FREETYPE2_HEADER_DIR})
+
+# Since Freetype 2.5.1 there is no freetype/freetype.h, so this variable can be null
+if (FREETYPE2_ROOT_INCLUDE_DIR)
+ list(APPEND FREETYPE2_INCLUDE_DIRS ${FREETYPE2_ROOT_INCLUDE_DIR})
+endif ()
+
+# Inspired in the original FindFreetype.cmake
+if (FREETYPE2_HEADER_DIR AND EXISTS "${FREETYPE2_HEADER_DIR}/freetype.h")
+ file(STRINGS "${FREETYPE2_HEADER_DIR}/freetype.h" freetype_version_str
+ REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
+
+ unset(FREETYPE2_VERSION_STRING)
+ foreach (VPART MAJOR MINOR PATCH)
+ foreach (VLINE ${freetype_version_str})
+ if (VLINE MATCHES "^#[\t ]*define[\t ]+FREETYPE_${VPART}")
+ string(REGEX REPLACE "^#[\t ]*define[\t ]+FREETYPE_${VPART}[\t ]+([0-9]+)$" "\\1"
+ FREETYPE2_VERSION_PART "${VLINE}")
+ if (FREETYPE2_VERSION_STRING)
+ set(FREETYPE2_VERSION_STRING "${FREETYPE2_VERSION_STRING}.${FREETYPE2_VERSION_PART}")
+ else ()
+ set(FREETYPE2_VERSION_STRING "${FREETYPE2_VERSION_PART}")
+ endif ()
+ unset(FREETYPE2_VERSION_PART)
+ endif ()
+ endforeach ()
+ endforeach ()
+endif ()
+
+set(VERSION_OK TRUE)
+if (FREETYPE2_VERSION_STRING)
+ if (PC_FREETYPE2_FIND_VERSION_EXACT)
+ if (NOT("${Freetype2_FIND_VERSION}" VERSION_EQUAL "${FREETYPE2_VERSION_STRING}"))
+ set(VERSION_OK FALSE)
+ endif ()
+ else ()
+ if ("${FREETYPE2_VERSION_STRING}" VERSION_LESS "${Freetype2_FIND_VERSION}")
+ set(VERSION_OK FALSE)
+ endif ()
+ endif ()
+endif ()
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype2 DEFAULT_MSG FREETYPE2_INCLUDE_DIRS FREETYPE2_LIBRARIES VERSION_OK)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (166036 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-03-21 03:13:46 UTC (rev 166036)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> find_package(Eeze ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
</span><span class="cx"> find_package(Efreet ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
</span><span class="cx">
</span><del>-find_package(Freetype 2.4.2 REQUIRED)
</del><ins>+find_package(Freetype2 2.4.2 REQUIRED)
</ins><span class="cx"> find_package(HarfBuzz 0.9.2 REQUIRED)
</span><span class="cx"> add_definitions(-DWTF_USE_FREETYPE=1)
</span><span class="cx"> add_definitions(-DWTF_USE_HARFBUZZ=1)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (166036 => 166037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-03-21 03:13:46 UTC (rev 166036)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-03-21 03:47:26 UTC (rev 166037)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> find_package(Cairo 1.10.2 REQUIRED)
</span><span class="cx"> find_package(Fontconfig 2.8.0 REQUIRED)
</span><del>-find_package(Freetype 2.4.2 REQUIRED)
</del><ins>+find_package(Freetype2 2.4.2 REQUIRED)
</ins><span class="cx"> find_package(GTK2 2.24.10 REQUIRED)
</span><span class="cx"> find_package(GDK2 2.24.10 REQUIRED)
</span><span class="cx"> find_package(HarfBuzz 0.9.2 REQUIRED)
</span></span></pre>
</div>
</div>
</body>
</html>