Title: [110896] trunk
- Revision
- 110896
- Author
- par...@webkit.org
- Date
- 2012-03-15 15:17:54 -0700 (Thu, 15 Mar 2012)
Log Message
[EFL] Make zlib a general build requirement
https://bugs.webkit.org/show_bug.cgi?id=80153
Reviewed by Hajime Morita.
After r109538 WebSocket module needs zlib to support deflate-frame extension.
.:
* Source/cmake/OptionsEfl.cmake:
Source/_javascript_Core:
* wtf/Platform.h:
Source/WebCore:
* PlatformEfl.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (110895 => 110896)
--- trunk/ChangeLog 2012-03-15 22:16:36 UTC (rev 110895)
+++ trunk/ChangeLog 2012-03-15 22:17:54 UTC (rev 110896)
@@ -1,3 +1,14 @@
+2012-03-15 Patrick Gansterer <par...@webkit.org>
+
+ [EFL] Make zlib a general build requirement
+ https://bugs.webkit.org/show_bug.cgi?id=80153
+
+ Reviewed by Hajime Morita.
+
+ After r109538 WebSocket module needs zlib to support deflate-frame extension.
+
+ * Source/cmake/OptionsEfl.cmake:
+
2012-03-15 Rob Buis <rb...@rim.com>
[BlackBerry] Remove some features that we do not have anymore
Modified: trunk/Source/_javascript_Core/ChangeLog (110895 => 110896)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-15 22:16:36 UTC (rev 110895)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-15 22:17:54 UTC (rev 110896)
@@ -1,3 +1,14 @@
+2012-03-15 Patrick Gansterer <par...@webkit.org>
+
+ [EFL] Make zlib a general build requirement
+ https://bugs.webkit.org/show_bug.cgi?id=80153
+
+ Reviewed by Hajime Morita.
+
+ After r109538 WebSocket module needs zlib to support deflate-frame extension.
+
+ * wtf/Platform.h:
+
2012-03-15 Benjamin Poulain <bpoul...@apple.com>
NumericStrings should be inlined
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (110895 => 110896)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2012-03-15 22:16:36 UTC (rev 110895)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2012-03-15 22:17:54 UTC (rev 110896)
@@ -1203,7 +1203,7 @@
#define WTF_USE_WTFURL 0
#endif
-#if !PLATFORM(QT) && !PLATFORM(EFL)
+#if !defined(WTF_USE_ZLIB) && !PLATFORM(QT)
#define WTF_USE_ZLIB 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (110895 => 110896)
--- trunk/Source/WebCore/ChangeLog 2012-03-15 22:16:36 UTC (rev 110895)
+++ trunk/Source/WebCore/ChangeLog 2012-03-15 22:17:54 UTC (rev 110896)
@@ -1,3 +1,14 @@
+2012-03-15 Patrick Gansterer <par...@webkit.org>
+
+ [EFL] Make zlib a general build requirement
+ https://bugs.webkit.org/show_bug.cgi?id=80153
+
+ Reviewed by Hajime Morita.
+
+ After r109538 WebSocket module needs zlib to support deflate-frame extension.
+
+ * PlatformEfl.cmake:
+
2012-03-15 Robert Kroeger <rjkro...@chromium.org>
REGRESSION (r110371): broke platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html
Modified: trunk/Source/WebCore/PlatformEfl.cmake (110895 => 110896)
--- trunk/Source/WebCore/PlatformEfl.cmake 2012-03-15 22:16:36 UTC (rev 110895)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2012-03-15 22:17:54 UTC (rev 110896)
@@ -148,9 +148,6 @@
platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
platform/graphics/freetype/SimpleFontDataFreeType.cpp
)
- LIST(APPEND WebCore_LIBRARIES
- ${ZLIB_LIBRARIES}
- )
ENDIF ()
IF (WTF_USE_PANGO)
@@ -213,6 +210,7 @@
${SQLITE_LIBRARIES}
${Glib_LIBRARIES}
${LIBSOUP24_LIBRARIES}
+ ${ZLIB_LIBRARIES}
)
IF (ENABLE_VIDEO)
@@ -236,6 +234,7 @@
${SQLITE_INCLUDE_DIR}
${Glib_INCLUDE_DIRS}
${LIBSOUP24_INCLUDE_DIRS}
+ ${ZLIB_INCLUDE_DIRS}
)
IF (ENABLE_VIDEO)
Modified: trunk/Source/cmake/OptionsEfl.cmake (110895 => 110896)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-03-15 22:16:36 UTC (rev 110895)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-03-15 22:17:54 UTC (rev 110896)
@@ -30,6 +30,7 @@
FIND_PACKAGE(Threads REQUIRED)
FIND_PACKAGE(JPEG REQUIRED)
FIND_PACKAGE(PNG REQUIRED)
+FIND_PACKAGE(ZLIB REQUIRED)
FIND_PACKAGE(Glib REQUIRED)
FIND_PACKAGE(Gthread REQUIRED)
@@ -116,7 +117,6 @@
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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
