Changeset 101079 in webkit

Timestamp:

Nov 23, 2011 6:25:45 AM (12 years ago)

Author:

commit-queue@webkit.org

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 <​halton.huo@intel.com> 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 <​halton.huo@intel.com> on 2011-11-23

• PlatformEfl.cmake: add ZLIB as dependency when using freetype

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PlatformEfl.cmake (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-11-23  Halton Huo  <halton.huo@intel.com>
+
+        [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  <mrobinson@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-23  Halton Huo  <halton.huo@intel.com>
+
+        [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  <mihnea@adobe.com>
 

trunk/Source/WebCore/PlatformEfl.cmake

@@ -118 +118 @@
       platform/graphics/freetype/SimpleFontDataFreeType.cpp
     )
+    LIST(APPEND WebCore_LIBRARIES
+      ${ZLIB_LIBRARIES}
+    )
   ENDIF ()
 

trunk/Source/cmake/OptionsEfl.cmake

@@ -125 +125 @@
 IF (FONT_BACKEND STREQUAL "freetype")
   FIND_PACKAGE(Freetype REQUIRED)
+  FIND_PACKAGE(ZLIB REQUIRED)
   SET(WTF_USE_FREETYPE 1)
   ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1)