[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[yael.aharon at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit 1dba3a94e7b63011874094cac8554d7a9f1aa8d9
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 23 19:28:41 2011 +0000

    2011-01-23  Yael Aharon  <yael.aharon at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt][Symbian] Fix --minimal build
            https://bugs.webkit.org/show_bug.cgi?id=52839
    
            Some of the plugins' functionality is reimplemented in
            Symbian specific files.
            Some of this functionality should be compiled in even if
            the guard NETSCAPE_PLUGIN_API is turned off.
            This patch moves that functionality out of the
            NETSCAPE_PLUGIN_API guard.
    
            Build fix so no new tests.
    
            * WebCore.pro:
            * plugins/symbian/PluginPackageSymbian.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76466 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index adc4326..f06ef70 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2011-01-23  Yael Aharon  <yael.aharon at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt][Symbian] Fix --minimal build
+        https://bugs.webkit.org/show_bug.cgi?id=52839
+
+        Some of the plugins' functionality is reimplemented in
+        Symbian specific files.
+        Some of this functionality should be compiled in even if 
+        the guard NETSCAPE_PLUGIN_API is turned off.
+        This patch moves that functionality out of the
+        NETSCAPE_PLUGIN_API guard.
+
+        Build fix so no new tests.
+
+        * WebCore.pro:
+        * plugins/symbian/PluginPackageSymbian.cpp:
+
 2011-01-23  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
index 0bdc5df..7c20077 100644
--- a/Source/WebCore/WebCore.pro
+++ b/Source/WebCore/WebCore.pro
@@ -2842,14 +2842,18 @@ contains (CONFIG, text_breaking_with_icu) {
     LIBS += -licuuc
 }
 
+symbian {
+    SOURCES += \
+        plugins/symbian/PluginDatabaseSymbian.cpp \
+        plugins/symbian/PluginPackageSymbian.cpp
+}
+
 contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
 
     SOURCES += plugins/npapi.cpp
 
     symbian {
         SOURCES += \
-        plugins/symbian/PluginPackageSymbian.cpp \
-        plugins/symbian/PluginDatabaseSymbian.cpp \
         plugins/symbian/PluginViewSymbian.cpp \
         plugins/symbian/PluginContainerSymbian.cpp
 
diff --git a/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp b/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp
index a14ac20..34aec4c 100644
--- a/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp
+++ b/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp
@@ -29,6 +29,7 @@
 
 namespace WebCore {
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
 bool PluginPackage::fetchInfo()
 {
     if (!load())
@@ -169,6 +170,7 @@ bool PluginPackage::load()
     m_loadCount++;
     return true;
 }
+#endif
 
 void PluginPackage::unload()
 {
@@ -186,9 +188,11 @@ void PluginPackage::unload()
     m_pluginLoader = 0;
 }
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
 uint16_t PluginPackage::NPVersion() const
 {
     return NP_VERSION_MINOR;
 }
+#endif
 }
 

-- 
WebKit Debian packaging