[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit edd026269eb41a8b1400656a57ff97cc275a6b6e
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 18:23:36 2009 +0000

    wxMSW build fix, we can't use the simple hash there because the PlatformModuleVersion
    structure differs.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49688 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b4d1b2d..6930760 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-16  Kevin Ollivier  <kevino at theolliviers.com>
+
+        wxMSW build fix, we can't use the simple hash there because the PlatformModuleVersion 
+        structure differs.
+
+        * wtf/Platform.h:
+
 2009-10-16  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 3315d96..7151b51 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -859,7 +859,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #define WARN_UNUSED_RETURN
 #endif
 
-#if !ENABLE(NETSCAPE_PLUGIN_API) || (ENABLE(NETSCAPE_PLUGIN_API) && ((PLATFORM(UNIX) && PLATFORM(QT)) || PLATFORM(GTK)) || PLATFORM(WX))
+#if !ENABLE(NETSCAPE_PLUGIN_API) || (ENABLE(NETSCAPE_PLUGIN_API) && ((PLATFORM(UNIX) && (PLATFORM(QT) || PLATFORM(WX))) || PLATFORM(GTK)))
 #define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1
 #endif
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7051809..1997b3b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-16  Kevin Ollivier  <kevino at theolliviers.com>
+
+        wxMSW build fix, build the MSW source to get methods that use the MSW version of
+        PlatformModuleVersion.
+
+        * wscript:
+
 2009-10-16  Adam Barth  <abarth at webkit.org>
 
         Unreviewed build fix.  Add back MIMETypeRegistryChromium with the right
diff --git a/WebCore/wscript b/WebCore/wscript
index f183071..8ad3e9a 100644
--- a/WebCore/wscript
+++ b/WebCore/wscript
@@ -31,7 +31,6 @@ webcore_sources = {}
 
 if build_port == "wx":
     webcore_sources['plugins'] = [  'plugins/PluginDataNone.cpp',
-                                    'plugins/PluginPackageNone.cpp',
                                     'plugins/PluginViewNone.cpp'
                                   ]
     
@@ -43,15 +42,17 @@ if build_port == "wx":
                # widely available (it was fixed in 2.8.10).
                'platform/win/SharedTimerWin.cpp',
                'page/win/PageWin.cpp',
-        
+               'plugins/win/PluginPackageWin.cpp',
         ]
     elif sys.platform.startswith('darwin'):
         webcore_dirs.append('platform/wx/wxcode/mac/carbon')
         webcore_sources['wx-mac'] = [
                'platform/mac/PurgeableBufferMac.cpp',
         ]
+        webcore_sources['plugins'].append('plugins/PluginPackageNone.cpp')
     else:
         webcore_dirs.append('platform/wx/wxcode/gtk')
+        webcore_sources['plugins'].append('plugins/PluginPackageNone.cpp')
         
 from TaskGen import taskgen, feature, after
 import Task, ccroot
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 11f2c7a..fa99992 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-16  Kevin Ollivier  <kevino at theolliviers.com>
+
+        wxMSW build fix. Link to MSW library needed by PluginPackageWin.cpp.
+
+        * wx/build/settings.py:
+
 2009-10-15  Yuzo Fujishima  <yuzo at google.com>
 
         Reviewed by David Levin.
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index 0bababc..7636dc9 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -316,7 +316,7 @@ def common_configure(conf):
         conf.env.append_value('LIB', [
             'kernel32', 'user32','gdi32','comdlg32','winspool','winmm',
             'shell32', 'comctl32', 'ole32', 'oleaut32', 'uuid', 'advapi32', 
-            'wsock32', 'gdiplus'])
+            'wsock32', 'gdiplus', 'version'])
 
         conf.env['LIB_ICU'] = ['icudt', 'icule', 'iculx', 'icuuc', 'icuin', 'icuio', 'icutu']
         

-- 
WebKit Debian packaging