[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

kevino at webkit.org kevino at webkit.org
Thu Feb 4 21:24:09 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 2c5de284088a1259d5e49f7b58ab32e5d5bafbfd
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 02:07:34 2010 +0000

    wx build fixes, add a missing header and add a new dir to the build system.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53665 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7b1db12..87fefe5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-21  Kevin Ollivier  <kevino at theolliviers.com>
+
+        Build fix, add missing header.
+
+        * dom/ScriptExecutionContext.cpp:
+
 2010-01-21  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/dom/ScriptExecutionContext.cpp b/WebCore/dom/ScriptExecutionContext.cpp
index b10f06e..80eb9a8 100644
--- a/WebCore/dom/ScriptExecutionContext.cpp
+++ b/WebCore/dom/ScriptExecutionContext.cpp
@@ -28,6 +28,7 @@
 #include "ScriptExecutionContext.h"
 
 #include "ActiveDOMObject.h"
+#include "Database.h"
 #include "DatabaseTask.h"
 #include "DatabaseThread.h"
 #include "MessagePort.h"
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5d99f46..b7aa46b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-21  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix, add new directory to dir list.
+
+        * wx/build/settings.py:
+
 2010-01-21  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index 2a50952..6016385 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -99,7 +99,8 @@ webcore_dirs = [
     'bindings',
     'bindings/js',
     'bridge', 
-    'bridge/c', 
+    'bridge/c',
+    'bridge/jsc',
     'css',
     'DerivedSources',
     'dom',

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list