[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 63c28561f8a16bb989ec0278faa1227496c23367
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 06:51:40 2010 +0000

    [wx] Build fix for wxMac/Cocoa.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54643 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 43be8fa..5e4ce20 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-10  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix for wxMac/Cocoa.
+
+        * platform/wx/wxcode/mac/carbon/fontprops.cpp: Removed.
+        * platform/wx/wxcode/mac/carbon/fontprops.mm: Copied from WebCore/platform/wx/wxcode/mac/carbon/fontprops.cpp.
+        * wscript:
+
 2010-02-10  Jon Honeycutt  <jhoneycutt at apple.com>
 
         REGRESSION(24929): PDF page doesn't load in background tab
diff --git a/WebCore/platform/wx/wxcode/mac/carbon/fontprops.cpp b/WebCore/platform/wx/wxcode/mac/carbon/fontprops.mm
similarity index 100%
rename from WebCore/platform/wx/wxcode/mac/carbon/fontprops.cpp
rename to WebCore/platform/wx/wxcode/mac/carbon/fontprops.mm
diff --git a/WebCore/wscript b/WebCore/wscript
index 5fdf64c..8aa279c 100644
--- a/WebCore/wscript
+++ b/WebCore/wscript
@@ -53,6 +53,7 @@ if build_port == "wx":
         webcore_sources['wx-mac'] = [
                'platform/mac/WebCoreNSStringExtras.mm',
                'platform/mac/PurgeableBufferMac.cpp',
+               'platform/wx/wxcode/mac/carbon/fontprops.mm',
                'plugins/wx/PluginDataWx.cpp',
                'plugins/mac/PluginPackageMac.cpp',
                'plugins/mac/PluginViewMac.cpp'

-- 
WebKit Debian packaging