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

kevino at webkit.org kevino at webkit.org
Wed Dec 22 12:07:38 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit db9e14ec1ac7860b03c965191b4e22763db2616d
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 00:05:17 2010 +0000

    [wx] Build fix, don't build PluginDataNone.cpp even on GTK as PluginDataWx.cpp compiles.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3c98183..959bc23 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-15  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix, don't build PluginDataNone.cpp even on GTK as PluginDataWx.cpp compiles.
+
+        * wscript:
+
 2010-08-15  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/wscript b/WebCore/wscript
index 817c298..97c2461 100644
--- a/WebCore/wscript
+++ b/WebCore/wscript
@@ -74,7 +74,6 @@ if build_port == "wx":
         ]
     else:
         webcore_sources['wx-gtk'] = [
-               'plugins/PluginDataNone.cpp',
                'plugins/PluginViewNone.cpp',
                'plugins/PluginPackageNone.cpp'
         ]

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list