[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:32:43 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit fb8c02ded5883af8a755a04a52b53f244b3dc19a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 24 00:54:57 2009 +0000
2009-09-23 Marshall Culpepper <mculpepper at appcelerator.com>
Reviewed by Eric Seidel.
Added $(WebKitLibrariesDir)/include/cairo so cairo.h is found by
default when the necessary dependencies are extracted into the
WebKitLibrariesDir.
https://bugs.webkit.org/show_bug.cgi?id=29661
* WebCore.vcproj/WebCoreCairo.vsprops:
2009-09-23 Marshall Culpepper <mculpepper at appcelerator.com>
Reviewed by Eric Seidel.
Added $(WebKitLibrariesDir)/include/cairo so cairo.h is found by
default when the necessary dependencies are extracted into the
WebKitLibrariesDir.
https://bugs.webkit.org/show_bug.cgi?id=29661
* win/tools/vsprops/WinCairo.vsprops:
2009-09-23 Marshall Culpepper <mculpepper at appcelerator.com>
Reviewed by Eric Seidel.
jpeg.lib is now libjpeg.lib in DRT Cairo dependencies. return
"false" in non-implemented stub for setAlwaysAcceptCookies.
https://bugs.webkit.org/show_bug.cgi?id=29661
* DumpRenderTree/win/DumpRenderTree.vcproj:
* DumpRenderTree/win/DumpRenderTree.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48692 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2eee0cb..4e95f0b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-23 Marshall Culpepper <mculpepper at appcelerator.com>
+
+ Reviewed by Eric Seidel.
+
+ Added $(WebKitLibrariesDir)/include/cairo so cairo.h is found by
+ default when the necessary dependencies are extracted into the
+ WebKitLibrariesDir.
+ https://bugs.webkit.org/show_bug.cgi?id=29661
+
+ * WebCore.vcproj/WebCoreCairo.vsprops:
+
2009-09-23 Darin Adler <darin at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebCore/WebCore.vcproj/WebCoreCairo.vsprops b/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
index b1493d4..3531128 100644
--- a/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
+++ b/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
@@ -6,6 +6,6 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\svg\graphics\cairo";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib""
+ AdditionalIncludeDirectories=""$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\svg\graphics\cairo";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(WebKitLibrariesDir)\include\cairo""
/>
</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 80dfb80..99afe7a 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-23 Marshall Culpepper <mculpepper at appcelerator.com>
+
+ Reviewed by Eric Seidel.
+
+ Added $(WebKitLibrariesDir)/include/cairo so cairo.h is found by
+ default when the necessary dependencies are extracted into the
+ WebKitLibrariesDir.
+ https://bugs.webkit.org/show_bug.cgi?id=29661
+
+ * win/tools/vsprops/WinCairo.vsprops:
+
2009-09-09 Brent Fulgham <bfulgham at webkit.org>
Reviewed by Dave Levin.
diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
index ba3a503..b3b1e4c 100644
--- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
@@ -7,9 +7,11 @@
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN_CAIRO=1"
+ AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo""
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="cairo.lib libjpeg.lib zlib.lib libpng.lib"
+ AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib""
/>
</VisualStudioPropertySheet>
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3b7cd14..01f7cf1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-23 Marshall Culpepper <mculpepper at appcelerator.com>
+
+ Reviewed by Eric Seidel.
+
+ jpeg.lib is now libjpeg.lib in DRT Cairo dependencies. return
+ "false" in non-implemented stub for setAlwaysAcceptCookies.
+ https://bugs.webkit.org/show_bug.cgi?id=29661
+
+ * DumpRenderTree/win/DumpRenderTree.vcproj:
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+
2009-09-23 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Xan Lopez.
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index e4ba96a..2d95dd4 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -128,6 +128,7 @@ bool setAlwaysAcceptCookies(bool alwaysAcceptCookies)
return true;
#else
// FIXME: Implement!
+ return false;
#endif
}
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj b/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
index 2d59315..dea2467 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
@@ -271,7 +271,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite_Debug.lib cairo.lib jpeg.lib libpng.lib libcurl_imp.lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib oleacc.lib comsuppw.lib"
+ AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite_Debug.lib cairo.lib libjpeg.lib libpng.lib libcurl_imp.lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib oleacc.lib comsuppw.lib"
AdditionalLibraryDirectories=""
DelayLoadDLLs=""
SubSystem="1"
@@ -344,7 +344,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite.lib cairo.lib jpeg.lib libpng.lib libcurl_imp.lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib oleacc.lib comsuppw.lib"
+ AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite.lib cairo.lib libjpeg.lib libpng.lib libcurl_imp.lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib oleacc.lib comsuppw.lib"
AdditionalLibraryDirectories=""
DelayLoadDLLs=""
SubSystem="1"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list