[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 536d2f124b637d011509952ca57919a447c5c7c4
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 08:54:19 2010 +0000

    [Qt] Make it possible to link with -no-undefined.
    
    Reviewed by Tor Arne Vestbø.
    
    * WebCore.pro: Add missing explicit dependency to libXrender due to the
    use of XRenderFindVisualFormat in the X11 plugin code.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53529 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e72f781..1eeca0a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Tor Arne Vestbø.
 
+        [Qt] Make it possible to link with -no-undefined.
+
+        * WebCore.pro: Add missing explicit dependency to libXrender due to the
+        use of XRenderFindVisualFormat in the X11 plugin code.
+
+2010-01-20  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
         Add missing files to the build.
 
         * WebCore.pro:
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 1487801..cc025a6 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2083,7 +2083,10 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
                 INCLUDEPATH += platform/mac
                 # Note: XP_MACOSX is defined in npapi.h
             } else {
-                !embedded: CONFIG += x11
+                !embedded {
+                    CONFIG += x11
+                    LIBS += -lXrender
+                }
                 SOURCES += \
                     plugins/qt/PluginContainerQt.cpp \
                     plugins/qt/PluginPackageQt.cpp \

-- 
WebKit Debian packaging