[wx] Build fixes after recent changes.

git-svn-id: svn://svn.chromium.org/blink/trunk@81212 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebCore/ChangeLog

+2011-03-15  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Build fix, only compile the methods when the INDEXED_DATABASE feature is enabled.
+        
+        * storage/IDBDatabaseCallbacksImpl.cpp:
+
 2011-03-15  Brady Eidson  <beidson@apple.com>
 
         Build fix after r81208 for https://bugs.webkit.org/show_bug.cgi?id=56425

third_party/WebKit/Source/WebCore/storage/IDBDatabaseCallbacksImpl.cpp

@@ -26,6 +26,8 @@
 #include "config.h"
 #include "IDBDatabaseCallbacksImpl.h"
 
+#if ENABLE(INDEXED_DATABASE)
+
 #include "IDBDatabase.h"
 
 namespace WebCore {
@@ -57,3 +59,5 @@ void IDBDatabaseCallbacksImpl::unregisterDatabase(IDBDatabase* database)
 }
 
 } // namespace WebCore
+
+#endif

third_party/WebKit/Tools/ChangeLog

+2011-03-15  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Build fixes for long linker commands on Win and method return error, plus a Mac
+        fix to link against the Security framework after recent WebKitSystemInterface changes.
+
+        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+        (LayoutTestController::originsWithLocalStorage):
+        * wx/build/settings.py:
+        * wx/build/waf_extensions.py:
+
 2011-03-15  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Darin Adler.

third_party/WebKit/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

@@ -588,6 +588,7 @@ void LayoutTestController::deleteAllLocalStorage()
 JSValueRef LayoutTestController::originsWithLocalStorage(JSContextRef context)
 {
     // FIXME: Implement.
+    return 0;
 }
 
 void LayoutTestController::deleteLocalStorageForOrigin(JSStringRef URL)

third_party/WebKit/Tools/wx/build/settings.py

@@ -343,7 +343,9 @@ def common_configure(conf):
 
         conf.env.append_value('CPPFLAGS', sdkflags)
         conf.env.append_value('LINKFLAGS', sdkflags)
-
+        
+        conf.env.append_value('LINKFLAGS', ['-framework', 'Security'])
+        
         conf.env.append_value('CPPPATH_SQLITE3', [os.path.join(wklibs_dir, 'WebCoreSQLite3')])
         conf.env.append_value('LIB_SQLITE3', ['WebCoreSQLite3'])
 

third_party/WebKit/Tools/wx/build/waf_extensions.py

@@ -40,10 +40,25 @@ def exec_command(s, **kw):
             if i.find(" ") != -1:
                 i = '"%s"' % i
             t.append(i)
-        os.write(fd, ' '.join(t[1:]))
+            
+        t1 = t[1:]
+        # Fix for LNK1170 error
+        filename_str = '@' + filename
+        filename2_str = None
+        if len(' '.join(s)) > 131070:
+            t2 = t[len(t) / 2:]
+            t1 = t[1:len(t) / 2]
+            (fd2, filename2) = tempfile.mkstemp()
+            os.write(fd2, ' '.join(t2))
+            os.close(fd2)
+            filename2_str = '@' + filename2
+        os.write(fd, ' '.join(t1))
         os.close(fd)
         
-        s = [s[0], '@' + filename]
+        s = [s[0]]
+        s.append(filename_str)
+        if filename2_str:
+            s.append(filename2_str)
         
     if 'log' in kw:
         kw['stdout'] = kw['stderr'] = kw['log']