[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 869eeda34003f55ea65edd1dbed37d25f12eedca
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 11:40:13 2010 +0000

    2010-12-14  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Eric Seidel.
    
            [EFL] Add linker script to export less symbols
            https://bugs.webkit.org/show_bug.cgi?id=44609
    
            Filter the exported symbols by using a linker script. Only symbols
            starting with "ewk_" are exported.
    
            * cmake/OptionsEfl.cmake: Pass linker option to use a version script
            when linking webkit.
            * cmake/eflsymbols.filter: Added. Export only symbols starting with
            "ewk_" (C linkage).
    2010-12-14  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Eric Seidel.
    
            [EFL] Add linker script to export less symbols
            https://bugs.webkit.org/show_bug.cgi?id=44609
    
            Filter the exported symbols by using a linker script. Only symbols
            starting with "ewk_" are exported.
    
            * CMakeLists.txt: Add link flags to webkit library when there's a
            version script.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 12639f7..85e5110 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-14  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Eric Seidel.
+
+        [EFL] Add linker script to export less symbols
+        https://bugs.webkit.org/show_bug.cgi?id=44609
+
+        Filter the exported symbols by using a linker script. Only symbols
+        starting with "ewk_" are exported.
+
+        * cmake/OptionsEfl.cmake: Pass linker option to use a version script
+        when linking webkit.
+        * cmake/eflsymbols.filter: Added. Export only symbols starting with
+        "ewk_" (C linkage).
+
 2010-12-13  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
 
         Unreviewed build fix for EFL.
diff --git a/WebKit/CMakeLists.txt b/WebKit/CMakeLists.txt
index 57557e3..5de532d 100644
--- a/WebKit/CMakeLists.txt
+++ b/WebKit/CMakeLists.txt
@@ -73,5 +73,9 @@ IF (WebKit_LINK_FLAGS)
     ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS "${WebKit_LINK_FLAGS}")
 ENDIF ()
 
+IF (VERSION_SCRIPT)
+    ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS "${VERSION_SCRIPT}")
+ENDIF ()
+
 SET_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
 INSTALL(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION lib)
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8aa81d4..db0a85c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-14  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Eric Seidel.
+
+        [EFL] Add linker script to export less symbols
+        https://bugs.webkit.org/show_bug.cgi?id=44609
+
+        Filter the exported symbols by using a linker script. Only symbols
+        starting with "ewk_" are exported.
+
+        * CMakeLists.txt: Add link flags to webkit library when there's a
+        version script.
+
 2010-12-07  Simon Fraser  <simon.fraser at apple.com>
 
         Update Xcode project for newer Xcode.
diff --git a/cmake/OptionsEfl.cmake b/cmake/OptionsEfl.cmake
index ebaab4d..e85f717 100644
--- a/cmake/OptionsEfl.cmake
+++ b/cmake/OptionsEfl.cmake
@@ -48,6 +48,8 @@ SET(WebKit_LIBRARY_NAME ewebkit)
 SET(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
 ADD_DEFINITIONS(-DDATA_DIR="${DATA_DIR}")
 
+SET(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/cmake/eflsymbols.filter")
+
 WEBKIT_FEATURE(ENABLE_AS_IMAGE "Enable SVG as image" DEFAULT ON SVG)
 WEBKIT_FEATURE(ENABLE_BLOB "Enable blob slice" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT ON)
diff --git a/cmake/eflsymbols.filter b/cmake/eflsymbols.filter
new file mode 100644
index 0000000..356a00c
--- /dev/null
+++ b/cmake/eflsymbols.filter
@@ -0,0 +1,6 @@
+{
+        global:
+                ewk_*;
+        local:
+                *;
+};

-- 
WebKit Debian packaging