Title: [109759] releases/WebKitGTK/webkit-1.8/Source/WebKit2
- Revision
- 109759
- Author
- mrobin...@webkit.org
- Date
- 2012-03-05 10:00:20 -0800 (Mon, 05 Mar 2012)
Log Message
Merging r109754
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit2/ChangeLog (109758 => 109759)
--- releases/WebKitGTK/webkit-1.8/Source/WebKit2/ChangeLog 2012-03-05 17:47:49 UTC (rev 109758)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit2/ChangeLog 2012-03-05 18:00:20 UTC (rev 109759)
@@ -1,3 +1,15 @@
+2012-03-05 Joone Hur <joone....@collabora.co.uk>
+
+ [GTK] zlib link error with --enable-webkit2
+ https://bugs.webkit.org/show_bug.cgi?id=79877
+
+ Reviewed by Martin Robinson.
+
+ zlib should be linked properly.
+
+ * GNUmakefile.am: Link $(ZLIB_LIBS) with libwebkit2gtk instead of
+ linking it with WebKitWebProcess.
+
2012-03-04 Sergio Villar Senin <svil...@igalia.com>
[WK2] [GTK] Destructor not invoked in EditorClientFrameDestructionObserver
Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit2/GNUmakefile.am (109758 => 109759)
--- releases/WebKitGTK/webkit-1.8/Source/WebKit2/GNUmakefile.am 2012-03-05 17:47:49 UTC (rev 109758)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit2/GNUmakefile.am 2012-03-05 18:00:20 UTC (rev 109759)
@@ -1109,7 +1109,8 @@
$(SQLITE3_LIBS) \
$(UNICODE_LIBS) \
$(XRENDER_LIBS) \
- $(XT_LIBS)
+ $(XT_LIBS) \
+ $(ZLIB_LIBS)
if ENABLE_WEBKIT2
pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
@@ -1279,8 +1280,7 @@
$(GLIB_LIBS) \
$(GTK_LIBS) \
$(GTK_UNIX_PRINTING_LIBS) \
- $(LIBSOUP_LIBS) \
- $(ZLIB_CFLAGS)
+ $(LIBSOUP_LIBS)
Programs_WebKitWebProcess_LDFLAGS = \
-no-fast-install \
@@ -1325,8 +1325,7 @@
$(SQLITE3_CFLAGS) \
$(UNICODE_CFLAGS) \
$(XRENDER_CFLAGS) \
- $(XT_CFLAGS) \
- $(ZLIB_LIBS)
+ $(XT_CFLAGS)
libexec_PROGRAMS += \
Programs/WebKitPluginProcess
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
