Title: [101079] trunk
- Revision
- 101079
- Author
- [email protected]
- Date
- 2011-11-23 06:25:45 -0800 (Wed, 23 Nov 2011)
Log Message
[EFL] Add zlib depend when freetype is used.
https://bugs.webkit.org/show_bug.cgi?id=66365
Unreviewed build fix.
When freetype is enabled, uncompress() function is used by
WOFFFileFormat.cpp. Since zlib is not required by freetype, we need to
add libz as dependency for fix linking issue.
.:
Patch by Halton Huo <[email protected]> on 2011-11-23
* Source/cmake/OptionsEfl.cmake: search for ZLIB
Source/WebCore:
No new test because this change is only to fix linking issue.
Patch by Halton Huo <[email protected]> on 2011-11-23
* PlatformEfl.cmake: add ZLIB as dependency when using freetype
Modified Paths
Diff
Modified: trunk/ChangeLog (101078 => 101079)
--- trunk/ChangeLog 2011-11-23 14:23:22 UTC (rev 101078)
+++ trunk/ChangeLog 2011-11-23 14:25:45 UTC (rev 101079)
@@ -1,3 +1,16 @@
+2011-11-23 Halton Huo <[email protected]>
+
+ [EFL] Add zlib depend when freetype is used.
+ https://bugs.webkit.org/show_bug.cgi?id=66365
+
+ Unreviewed build fix.
+
+ When freetype is enabled, uncompress() function is used by
+ WOFFFileFormat.cpp. Since zlib is not required by freetype, we need to
+ add libz as dependency for fix linking issue.
+
+ * Source/cmake/OptionsEfl.cmake: search for ZLIB
+
2011-10-08 Martin Robinson <[email protected]>
[GTK] Enable WebGL by default
Modified: trunk/Source/WebCore/ChangeLog (101078 => 101079)
--- trunk/Source/WebCore/ChangeLog 2011-11-23 14:23:22 UTC (rev 101078)
+++ trunk/Source/WebCore/ChangeLog 2011-11-23 14:25:45 UTC (rev 101079)
@@ -1,3 +1,18 @@
+2011-11-23 Halton Huo <[email protected]>
+
+ [EFL] Add zlib depend when freetype is used.
+ https://bugs.webkit.org/show_bug.cgi?id=66365
+
+ Unreviewed build fix.
+
+ When freetype is enabled, uncompress() function is used by
+ WOFFFileFormat.cpp. Since zlib is not required by freetype, we need to
+ add libz as dependency for fix linking issue.
+
+ No new test because this change is only to fix linking issue.
+
+ * PlatformEfl.cmake: add ZLIB as dependency when using freetype
+
2011-11-23 Mihnea Ovidenie <[email protected]>
CSS Exclusions: parse the shorthand "wrap" property
Modified: trunk/Source/WebCore/PlatformEfl.cmake (101078 => 101079)
--- trunk/Source/WebCore/PlatformEfl.cmake 2011-11-23 14:23:22 UTC (rev 101078)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2011-11-23 14:25:45 UTC (rev 101079)
@@ -117,6 +117,9 @@
platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
platform/graphics/freetype/SimpleFontDataFreeType.cpp
)
+ LIST(APPEND WebCore_LIBRARIES
+ ${ZLIB_LIBRARIES}
+ )
ENDIF ()
IF (WTF_USE_PANGO)
Modified: trunk/Source/cmake/OptionsEfl.cmake (101078 => 101079)
--- trunk/Source/cmake/OptionsEfl.cmake 2011-11-23 14:23:22 UTC (rev 101078)
+++ trunk/Source/cmake/OptionsEfl.cmake 2011-11-23 14:25:45 UTC (rev 101079)
@@ -124,6 +124,7 @@
IF (FONT_BACKEND STREQUAL "freetype")
FIND_PACKAGE(Freetype REQUIRED)
+ FIND_PACKAGE(ZLIB REQUIRED)
SET(WTF_USE_FREETYPE 1)
ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1)
ELSE ()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
