Title: [151895] releases/WebKitGTK/webkit-2.0/Source/WebKit2
- Revision
- 151895
- Author
- [email protected]
- Date
- 2013-06-24 00:52:11 -0700 (Mon, 24 Jun 2013)
Log Message
[GTK] Merge r150008 into the webkit-2.0 branch
https://bugs.webkit.org/show_bug.cgi?id=117889
Patch by Zan Dobersek <[email protected]> on 2013-06-21
Reviewed by Carlos Garcia Campos.
* GNUmakefile.am: Merge r150008 with some changes, for instance not listing libPlatform.la, libPlatformGtk2.la
and libANGLE.la among the webcore layer dependencies as these libtool archives were created after the 2.0 branching.
* GNUmakefile.list.am: Merge r150008.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (151894 => 151895)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-06-24 07:32:21 UTC (rev 151894)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-06-24 07:52:11 UTC (rev 151895)
@@ -1,3 +1,14 @@
+2013-06-21 Zan Dobersek <[email protected]>
+
+ [GTK] Merge r150008 into the webkit-2.0 branch
+ https://bugs.webkit.org/show_bug.cgi?id=117889
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: Merge r150008 with some changes, for instance not listing libPlatform.la, libPlatformGtk2.la
+ and libANGLE.la among the webcore layer dependencies as these libtool archives were created after the 2.0 branching.
+ * GNUmakefile.list.am: Merge r150008.
+
2013-05-16 Manuel Rego Casasnovas <[email protected]>
[GTK] Fix memory leak in WebKitBackForwardList
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.am (151894 => 151895)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.am 2013-06-24 07:32:21 UTC (rev 151894)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.am 2013-06-24 07:52:11 UTC (rev 151895)
@@ -525,6 +525,26 @@
endif
$(plugin_process_for_dep): $(plugin_process_for_dep_list)
+webcore_layer_gtk2_deps = \
+ libWebCorePlatform.la \
+ libWebCoreGtk2.la \
+ libWebCore.la \
+ libWebCoreModules.la
+if ENABLE_SVG
+webcore_layer_gtk2_deps += \
+ libWebCoreSVG.la
+endif
+if ENABLE_INDEXED_DATABASE
+webcore_layer_gtk2_deps += \
+ libLevelDB.la
+endif
+
+webcore_layer_gtk2_archives = $(foreach lib, $(webcore_layer_gtk2_deps), $(shell echo $(lib) | sed "s/\(.*\)\.la/.libs\/\1.a/"))
+
+WebCoreLayerGtk2.a: $(webcore_layer_gtk2_deps)
+ $(AM_V_GEN)
+ $(AM_V_at)$(foreach archive, $(webcore_layer_gtk2_archives), $(shell ar t $(archive) | xargs -n50 ar cruT $@))
+
Programs_WebKitPluginProcess_CPPFLAGS = \
-include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
-I$(srcdir)/Source/WebKit2 \
@@ -582,18 +602,10 @@
Programs_WebKitPluginProcess_LDADD = \
-lpthread \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
- libWebCore.la
-
-#if ENABLE_SVG
-Programs_WebKitPluginProcess_LDADD += \
- libWebCoreSVG.la
-#endif
-
-Programs_WebKitPluginProcess_LDADD += \
- libWebCorePlatform.la \
- libWebCoreGtk2.la \
+ WebCoreLayerGtk2.a \
$(CAIRO_LIBS) \
$(COVERAGE_LDFLAGS) \
+ $(FREETYPE_LIBS) \
$(GEOCLUE_LIBS) \
$(GLIB_LIBS) \
$(GSTREAMER_LIBS) \
@@ -617,13 +629,6 @@
$(WINMM_LIBS) \
$(ZLIB_LIBS)
-# libWebCore and libWebCoreModules have circular dependencies that only seem to
-# be a problem when linking the plugin process; we don't really care about
-# modules for the plugin process, though, so to work around that we ignore
-# internal unresolved symbols
-Programs_WebKitPluginProcess_LDFLAGS = \
- -Wl,--unresolved-symbols=ignore-in-object-files
-
Programs_WebKitPluginProcess_CXXFLAGS = \
-fvisibility-inlines-hidden \
$(global_cxxflags)
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.list.am (151894 => 151895)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.list.am 2013-06-24 07:32:21 UTC (rev 151894)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.list.am 2013-06-24 07:52:11 UTC (rev 151895)
@@ -1326,7 +1326,12 @@
Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp \
Source/WebKit2/Shared/gtk/WebEventFactory.cpp \
Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp \
+ Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp \
+ Source/WebKit2/Shared/soup/PlatformCertificateInfo.h \
Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \
+ Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
+ Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h \
+ Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp \
Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp \
Source/WebKit2/WebProcess/Plugins/Plugin.cpp \
Source/WebKit2/WebProcess/Plugins/Plugin.h \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
