Title: [126305] trunk/Source/WebCore
- Revision
- 126305
- Author
- [email protected]
- Date
- 2012-08-22 08:46:01 -0700 (Wed, 22 Aug 2012)
Log Message
[EFL] Build failures with harfbuzz outside standard locations
https://bugs.webkit.org/show_bug.cgi?id=93030
Reviewed by Rob Buis.
Add ${HARFBUZZ_INCLUDE_DIRS} to the list of included paths: so far
it was being implicitly pulled from evas's pkg-config file, and
used to work when WebKit-EFL's dependencies were built with
jhbuild -- in this case, harfbuzz is built before evas, which is
then built with harfbuzz support and adds the required paths to
its .pc file.
We need to include things directly to account for the case of
people not using jhbuild and thus not necessarily having harfbuzz
as an evas dependency.
* PlatformEfl.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126304 => 126305)
--- trunk/Source/WebCore/ChangeLog 2012-08-22 15:34:57 UTC (rev 126304)
+++ trunk/Source/WebCore/ChangeLog 2012-08-22 15:46:01 UTC (rev 126305)
@@ -1,3 +1,23 @@
+2012-08-22 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Build failures with harfbuzz outside standard locations
+ https://bugs.webkit.org/show_bug.cgi?id=93030
+
+ Reviewed by Rob Buis.
+
+ Add ${HARFBUZZ_INCLUDE_DIRS} to the list of included paths: so far
+ it was being implicitly pulled from evas's pkg-config file, and
+ used to work when WebKit-EFL's dependencies were built with
+ jhbuild -- in this case, harfbuzz is built before evas, which is
+ then built with harfbuzz support and adds the required paths to
+ its .pc file.
+
+ We need to include things directly to account for the case of
+ people not using jhbuild and thus not necessarily having harfbuzz
+ as an evas dependency.
+
+ * PlatformEfl.cmake:
+
2012-08-22 Raul Hudea <[email protected]>
Crash in WebCore::RenderBlock::removeChild
Modified: trunk/Source/WebCore/PlatformEfl.cmake (126304 => 126305)
--- trunk/Source/WebCore/PlatformEfl.cmake 2012-08-22 15:34:57 UTC (rev 126304)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2012-08-22 15:46:01 UTC (rev 126305)
@@ -155,6 +155,7 @@
"${WEBCORE_DIR}/platform/graphics/freetype"
"${WEBCORE_DIR}/platform/graphics/harfbuzz/"
"${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
+ ${HARFBUZZ_INCLUDE_DIRS}
)
LIST(APPEND WebCore_SOURCES
platform/graphics/WOFFFileFormat.cpp
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
