[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bfulgham at webkit.org
bfulgham at webkit.org
Wed Dec 22 13:25:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c0d6b8e07a52d8349913e1581a8a38ffca7fb91a
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 14 21:43:54 2010 +0000
Build correction, no review.
WebCore:
* WebCore.vcproj/WebCore.vcproj: Add missing OwnPtrCairo.cpp
implementation file.
* platform/graphics/cairo/OwnPtrCairo.cpp: Add missing include
for <cairo.h>
WebKit2:
* win/WebKit2.vcproj: Disable build for Cairo targets of
the WebURLRequestWin.cpp and WebURLResponseWin.cpp files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67499 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 475fd31..6519106 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-14 Brent Fulgham <bfulgham at webkit.org>
+
+ Build correction, no review.
+
+ * WebCore.vcproj/WebCore.vcproj: Add missing OwnPtrCairo.cpp
+ implementation file.
+ * platform/graphics/cairo/OwnPtrCairo.cpp: Add missing include
+ for <cairo.h>
+
2010-09-14 Chris Guillory <chris.guillory at google.com>
Reviewed by Chris Fleizach.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 873a0da..985eccb 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -26575,6 +26575,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\platform\graphics\cairo\OwnPtrCairo.cpp"
+ >
+ </File>
+ <File
RelativePath="..\platform\graphics\cairo\PathCairo.cpp"
>
<FileConfiguration
@@ -42504,6 +42508,62 @@
>
</File>
<File
+ RelativePath="..\bindings\js\specialization\JSBindingState.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\bindings\js\specialization\JSBindingState.h"
+ >
+ </File>
+ <File
RelativePath="..\bindings\js\JSCallbackData.cpp"
>
<FileConfiguration
@@ -44472,6 +44532,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\bindings\js\JSEntryCustom.cpp"
+ >
+ </File>
+ <File
RelativePath="..\bindings\js\JSEventCustom.cpp"
>
<FileConfiguration
@@ -46684,10 +46748,6 @@
>
</File>
<File
- RelativePath="..\bindings\js\JSEntryCustom.cpp"
- >
- </File>
- <File
RelativePath="..\bindings\js\JSImageConstructor.cpp"
>
<FileConfiguration
@@ -49799,62 +49859,6 @@
RelativePath="..\bindings\js\WorkerScriptController.h"
>
</File>
- <File
- RelativePath="..\bindings\js\specialization\JSBindingState.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\bindings\js\specialization\JSBindingState.h"
- >
- </File>
</Filter>
</Filter>
<Filter
diff --git a/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp b/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp
index 75a1f13..a62c1ae 100644
--- a/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp
+++ b/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp
@@ -25,6 +25,8 @@
#include <fontconfig/fcfreetype.h>
#endif
+#include <cairo.h>
+
namespace WTF {
#if defined(USE_FREETYPE)
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4b66f70..7b35f47 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-14 Brent Fulgham <bfulgham at webkit.org>
+
+ Build correction, no review.
+
+ * win/WebKit2.vcproj: Disable build for Cairo targets of
+ the WebURLRequestWin.cpp and WebURLResponseWin.cpp files.
+
2010-09-14 Eric Seidel <eric at webkit.org>
Unreviewed, reverting changes r67451 and r67451.
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index a555c19..b84b0fc 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -578,10 +578,42 @@
<File
RelativePath="..\Shared\win\WebURLRequestWin.cpp"
>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\Shared\win\WebURLResponseWin.cpp"
>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
</Filter>
</Filter>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list