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

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c465669d800f773d5c6eb77824e277711c9d89b6
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 14:00:34 2010 +0000

    2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Don't use -whole-archive to link-in libWebKit2.a except for libQtWebKit.so
            https://bugs.webkit.org/show_bug.cgi?id=47347
    
            * WebCore.pro:
    2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Don't use -whole-archive to link-in libWebKit2.a except for libQtWebKit.so
            https://bugs.webkit.org/show_bug.cgi?id=47347
    
            * WebKit2.pri:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69397 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4c67a0c..5fa9a61 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Don't use -whole-archive to link-in libWebKit2.a except for libQtWebKit.so
+        https://bugs.webkit.org/show_bug.cgi?id=47347
+
+        * WebCore.pro:
+
 2010-10-08  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 6bcfeef..9b1c534 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -172,7 +172,7 @@ include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
 
 webkit2 {
     include($$PWD/../WebKit2/WebKit2.pri)
-    addWebKit2Lib(../WebKit2)
+    addWebKit2LibWholeArchive(../WebKit2)
 }
 
 # Extract sources to build from the generator definitions
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4521fe7..bcd0a26 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Don't use -whole-archive to link-in libWebKit2.a except for libQtWebKit.so
+        https://bugs.webkit.org/show_bug.cgi?id=47347
+
+        * WebKit2.pri:
+
 2010-10-08  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit2/WebKit2.pri b/WebKit2/WebKit2.pri
index 103fed1..2427fd8 100644
--- a/WebKit2/WebKit2.pri
+++ b/WebKit2/WebKit2.pri
@@ -8,24 +8,39 @@ else: WEBKIT2_TARGET = webkit2
 CONFIG(debug, debug|release) : WEBKIT2_DESTDIR = debug
 else: WEBKIT2_DESTDIR = release
 
-defineTest(addWebKit2Lib) {
+defineTest(_addWebKit2Lib_common) {
     pathToWebKit2Output = $$ARGS/$$WEBKIT2_DESTDIR
 
     QMAKE_LIBDIR += $$pathToWebKit2Output
 
-    # Make symbols visible
-    mac:QMAKE_LFLAGS += -Wl,-all_load -l$$WEBKIT2_TARGET
-    else:QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
-
     POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}lib$${WEBKIT2_TARGET}.a
 
     # The following line is to prevent qmake from adding webkit2 to libQtWebKit's prl dependencies.
     CONFIG -= explicitlib
 
     export(QMAKE_LIBDIR)
-    export(QMAKE_LFLAGS)
     export(POST_TARGETDEPS)
     export(CONFIG)
 
     return(true)
 }
+
+defineTest(addWebKit2Lib) {
+    _addWebKit2Lib_common($$ARGS)
+
+    QMAKE_LFLAGS += -l$$WEBKIT2_TARGET
+    export(QMAKE_LFLAGS)
+
+    return(true)
+}
+
+defineTest(addWebKit2LibWholeArchive) {
+    _addWebKit2Lib_common($$ARGS)
+
+    # -whole-archive makes all objects, even if unreferenced, included in the linked target.
+    mac:QMAKE_LFLAGS += -Wl,-all_load -l$$WEBKIT2_TARGET
+    else:QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
+    export(QMAKE_LFLAGS)
+
+    return(true)
+}

-- 
WebKit Debian packaging