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

[kevino at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a8dace832ce0dcc8fee4e5953cc5a71e8589a182
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 22:55:36 2010 +0000

    [wx] Build fixes for wxMSW.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67573 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 02b4a8b..5aab45b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-15  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fixes for wxMSW.
+
+        * wscript:
+
 2010-09-14  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/wscript b/wscript
index 54d207f..100f68f 100644
--- a/wscript
+++ b/wscript
@@ -48,6 +48,7 @@ if build_port == "wx":
 
 if sys.platform.startswith("win"):
     wk_includes.append(os.path.join(wk_root, 'WebCore','platform','win'))
+    wk_includes.append(os.path.join(wk_root, 'WebCore','platform','graphics','win'))
 
 windows_deps = [
                 'lib/pthreadVC2.dll',
@@ -68,8 +69,7 @@ if build_port == "wx":
         webcore_sources['wx-win'] = [
                'WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp',
                'WebCore/platform/graphics/win/TransformationMatrixWin.cpp',
-               'WebCore/platform/win/ScrollAnimatorWin.cpp',
-               'WebCore/platform/win/ScrollAnimatorWin.h',
+               'WebCore/platform/ScrollAnimatorWin.cpp',
                # wxTimer on Windows has a bug that causes it to eat crashes in callbacks
                # so we need to use the Win port's implementation until the wx bug fix is
                # widely available (it was fixed in 2.8.10).

-- 
WebKit Debian packaging