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

ap at apple.com ap at apple.com
Thu Apr 8 01:59:27 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 21a37c87ed5fd9cf16698297c988eb7b9bd78a80
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 21:04:10 2010 +0000

            Qt and Gtk build fixes.
    
            * GNUmakefile.am:
            * WebCore.pro:
            Added CRuntimeObject.{c,cpp}.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55253 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a7f2c0b..fd6eb6e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-02-25  Alexey Proskuryakov  <ap at apple.com>
 
+        Qt and Gtk build fixes.
+
+        * GNUmakefile.am:
+        * WebCore.pro:
+        Added CRuntimeObject.{c,cpp}.
+
+2010-02-25  Alexey Proskuryakov  <ap at apple.com>
+
         Windows build fix.
 
         * WebCore.vcproj/WebCore.vcproj: Added CRuntimeObject.{c,cpp}.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 92f8103..f54c2f9 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -512,6 +512,8 @@ webcore_sources += \
 	WebCore/bridge/IdentifierRep.h \
 	WebCore/bridge/NP_jsobject.cpp \
 	WebCore/bridge/NP_jsobject.h \
+	WebCore/bridge/c/CRuntimeObject.cpp \
+	WebCore/bridge/c/CRuntimeObject.h \
 	WebCore/bridge/c/c_class.cpp \
 	WebCore/bridge/c/c_class.h \
 	WebCore/bridge/c/c_instance.cpp \
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 17c6f88..071ecca 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -376,6 +376,7 @@ SOURCES += \
     bridge/runtime_method.cpp \
     bridge/runtime_object.cpp \
     bridge/runtime_root.cpp \
+    bridge/c/CRuntimeObject.cpp \
     bridge/c/c_class.cpp \
     bridge/c/c_instance.cpp \
     bridge/c/c_runtime.cpp \
@@ -1063,6 +1064,7 @@ HEADERS += \
     bindings/js/StringSourceProvider.h \
     bindings/js/WorkerScriptController.h \
     bridge/Bridge.h \
+    bridge/c/CRuntimeObject.h \
     bridge/c/c_class.h \
     bridge/c/c_instance.h \
     bridge/c/c_runtime.h \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list