Title: [172377] trunk
- Revision
- 172377
- Author
- [email protected]
- Date
- 2014-08-10 00:30:26 -0700 (Sun, 10 Aug 2014)
Log Message
[GTK] REGRESSION(r166239): The ld version script is not being used
https://bugs.webkit.org/show_bug.cgi?id=135694
Reviewed by Martin Robinson.
.:
Move the symbols filter file from Tools/gtk to Source/cmake and rename
it as gtksymbols.filter. Also updated it, since some of the symbols
exported were renamed.
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/gtksymbols.filter: Renamed from Tools/gtk/symbols.filter.
Source/WebKit2:
* CMakeLists.txt: Add VERSION_SCRIPT to WebKit2 link flags if present.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (172376 => 172377)
--- trunk/ChangeLog 2014-08-10 07:09:47 UTC (rev 172376)
+++ trunk/ChangeLog 2014-08-10 07:30:26 UTC (rev 172377)
@@ -1,5 +1,19 @@
2014-08-10 Carlos Garcia Campos <[email protected]>
+ [GTK] REGRESSION(r166239): The ld version script is not being used
+ https://bugs.webkit.org/show_bug.cgi?id=135694
+
+ Reviewed by Martin Robinson.
+
+ Move the symbols filter file from Tools/gtk to Source/cmake and rename
+ it as gtksymbols.filter. Also updated it, since some of the symbols
+ exported were renamed.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/gtksymbols.filter: Renamed from Tools/gtk/symbols.filter.
+
+2014-08-10 Carlos Garcia Campos <[email protected]>
+
[GTK] Child processes should be installed in a versioned directory
https://bugs.webkit.org/show_bug.cgi?id=135754
Modified: trunk/Source/WebKit2/CMakeLists.txt (172376 => 172377)
--- trunk/Source/WebKit2/CMakeLists.txt 2014-08-10 07:09:47 UTC (rev 172376)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-08-10 07:30:26 UTC (rev 172377)
@@ -704,6 +704,10 @@
set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit")
set_target_properties(WebKit2 PROPERTIES LINK_INTERFACE_LIBRARIES "")
+if (WebKit2_VERSION_SCRIPT)
+ ADD_TARGET_PROPERTIES(WebKit2 LINK_FLAGS "${WebKit2_VERSION_SCRIPT}")
+endif ()
+
if (WebKit2_OUTPUT_NAME)
set_target_properties(WebKit2 PROPERTIES OUTPUT_NAME ${WebKit2_OUTPUT_NAME})
endif ()
Modified: trunk/Source/WebKit2/ChangeLog (172376 => 172377)
--- trunk/Source/WebKit2/ChangeLog 2014-08-10 07:09:47 UTC (rev 172376)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-10 07:30:26 UTC (rev 172377)
@@ -1,3 +1,12 @@
+2014-08-10 Carlos Garcia Campos <[email protected]>
+
+ [GTK] REGRESSION(r166239): The ld version script is not being used
+ https://bugs.webkit.org/show_bug.cgi?id=135694
+
+ Reviewed by Martin Robinson.
+
+ * CMakeLists.txt: Add VERSION_SCRIPT to WebKit2 link flags if present.
+
2014-08-09 Tim Horton <[email protected]>
REGRESSION (r172301): Combined phone number highlight doesn't appear if rich content is selected and we have no rich content services
Modified: trunk/Source/cmake/OptionsGTK.cmake (172376 => 172377)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-08-10 07:09:47 UTC (rev 172376)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-08-10 07:30:26 UTC (rev 172377)
@@ -91,7 +91,7 @@
else ()
set(ENABLE_TOOLS OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF)
- set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/autotools/symbols.filter")
+ set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
endif ()
# FIXME: We want to expose fewer options to downstream, but for now everything is public.
Copied: trunk/Source/cmake/gtksymbols.filter (from rev 172376, trunk/Tools/gtk/symbols.filter) (0 => 172377)
--- trunk/Source/cmake/gtksymbols.filter (rev 0)
+++ trunk/Source/cmake/gtksymbols.filter 2014-08-10 07:30:26 UTC (rev 172377)
@@ -0,0 +1,12 @@
+{
+global:
+ webkit_*;
+ WebProcessMainUnix;
+ NetworkProcessMainUnix;
+ PluginProcessMainUnix;
+ _ZN6WebKit22WebGtkExtensionManager10initializeEPK14OpaqueWKBundlePKv;
+ _ZN6WebKit22WebGtkExtensionManager6sharedEv;
+local:
+ webkit_media_player_debug;
+ *;
+};
Deleted: trunk/Tools/gtk/symbols.filter (172376 => 172377)
--- trunk/Tools/gtk/symbols.filter 2014-08-10 07:09:47 UTC (rev 172376)
+++ trunk/Tools/gtk/symbols.filter 2014-08-10 07:30:26 UTC (rev 172377)
@@ -1,11 +0,0 @@
-{
-global:
- webkit_*;
- WebProcessMainGtk;
- NetworkProcessMain;
- _ZN6WebKit22WebGtkExtensionManager10initializeEPK14OpaqueWKBundlePKv;
- _ZN6WebKit22WebGtkExtensionManager6sharedEv;
-local:
- webkit_media_player_debug;
- *;
-};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
