[GTK] REGRESSION(r166239): The ld version script is not being used
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 Aug 2014 07:30:26 +0000 (07:30 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 Aug 2014 07:30:26 +0000 (07:30 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172377 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/cmake/OptionsGTK.cmake
Source/cmake/gtksymbols.filter [moved from Tools/gtk/symbols.filter with 71% similarity]

index 98bc6f5..c45ab0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2014-08-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 
+        [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  <cgarcia@igalia.com>
+
         [GTK] Child processes should be installed in a versioned directory
         https://bugs.webkit.org/show_bug.cgi?id=135754
 
index a26ef70..76ca1f8 100644 (file)
@@ -704,6 +704,10 @@ target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
 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 ()
index 52c2788..9b713c7 100644 (file)
@@ -1,3 +1,12 @@
+2014-08-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [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  <timothy_horton@apple.com>
 
         REGRESSION (r172301): Combined phone number highlight doesn't appear if rich content is selected and we have no rich content services
index e7dbdc7..27538a6 100644 (file)
@@ -91,7 +91,7 @@ if (DEVELOPER_MODE)
 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.
similarity index 71%
rename from Tools/gtk/symbols.filter
rename to Source/cmake/gtksymbols.filter
index 81a9725..0c4183a 100644 (file)
@@ -1,8 +1,9 @@
 {
 global:
   webkit_*;
-  WebProcessMainGtk;
-  NetworkProcessMain;
+  WebProcessMainUnix;
+  NetworkProcessMainUnix;
+  PluginProcessMainUnix;
   _ZN6WebKit22WebGtkExtensionManager10initializeEPK14OpaqueWKBundlePKv;
   _ZN6WebKit22WebGtkExtensionManager6sharedEv;
 local: