[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kevino at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit dcbc77867798ebbecd428751c5dbb18e0b021832
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 19:10:19 2010 +0000

    wx fixes after XBM removal and recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 9deb28a..a7a8295 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-14  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix, missing header.
+
+        * WebView.cpp:
+
 2010-01-09  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index 5503e85..7a31b87 100644
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -34,6 +34,7 @@
 #include "Editor.h"
 #include "EmptyClients.h"
 #include "EventHandler.h"
+#include "FileChooser.h"
 #include "FocusController.h"
 #include "Frame.h"
 #include "FrameLoader.h"
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0eee23a..7e8a2f3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-14  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix after removal of XBM support.
+
+        * wx/build/settings.py:
+
 2010-01-14  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index 8acb610..2a50952 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -125,8 +125,7 @@ webcore_dirs = [
     'platform/image-decoders/gif', 
     'platform/image-decoders/ico', 
     'platform/image-decoders/jpeg', 
-    'platform/image-decoders/png', 
-    'platform/image-decoders/xbm', 
+    'platform/image-decoders/png',
     'platform/image-decoders/zlib',
     'platform/mock',
     'platform/network', 

-- 
WebKit Debian packaging