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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d5933bd0ccf1e25c5356f731b30271b1e3c06e8d
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 18:05:40 2010 +0000

    2010-10-01  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Anders Carlsson.
    
            [CMake] Add handling for ENABLE(NETSCAPE_PLUGIN_API)
            https://bugs.webkit.org/show_bug.cgi?id=46309
    
            * CMakeLists.txt:
            * CMakeListsEfl.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68901 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 175362f..764cfbb 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1374,6 +1374,7 @@ SET(WebCore_SOURCES
     plugins/DOMPlugin.cpp
     plugins/PluginData.cpp
     plugins/PluginMainThreadScheduler.cpp
+    plugins/PluginPackage.cpp
 
     rendering/AutoTableLayout.cpp
     rendering/BidiRun.cpp
@@ -1612,6 +1613,20 @@ IF (ENABLE_MATHML)
     )
 ENDIF ()
 
+IF (ENABLE_NETSCAPE_PLUGIN_API)
+    LIST(APPEND WebCore_SOURCES
+        plugins/PluginDebug.cpp
+        plugins/PluginStream.cpp
+        plugins/PluginView.cpp
+        plugins/npapi.cpp
+    )
+ELSE ()
+    LIST(APPEND WebCore_SOURCES
+        plugins/PluginPackageNone.cpp
+        plugins/PluginViewNone.cpp
+    )
+ENDIF ()
+
 if (ENABLE_FILE_SYSTEM)
     LIST(APPEND WebCore_SOURCES
         bindings/js/JSDirectoryEntryCustom.cpp
diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index a4d4a60..4fa5c6d 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -59,7 +59,6 @@ LIST(APPEND WebCore_SOURCES
   platform/posix/FileSystemPOSIX.cpp
   platform/text/efl/TextBreakIteratorInternalICUEfl.cpp
   plugins/PluginDataNone.cpp
-  plugins/PluginViewNone.cpp
 )
 
 IF (WTF_PLATFORM_CAIRO)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5f708b8..03b6677 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-01  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        [CMake] Add handling for ENABLE(NETSCAPE_PLUGIN_API)
+        https://bugs.webkit.org/show_bug.cgi?id=46309
+
+        * CMakeLists.txt:
+        * CMakeListsEfl.txt:
+
 2010-10-01  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Darin Adler.

-- 
WebKit Debian packaging