[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 14:05:16 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 7062e713fb7a1b4e1a259e3d853e471ca0291237
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 4 06:20:54 2010 +0000

    Unreviewed build fix.
    
    WinCairo also needs access to the <inttypes.h> header requirement
    introduced by Bug 46357.
    
    * win/tools/vsprops/WinCairo.vsprops:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68998 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index bcd8fab..54a7ec3 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-03  Brent Fulgham  <bfulgham at webkit.org>
+
+        Unreviewed build fix.
+
+        WinCairo also needs access to the <inttypes.h> header requirement
+        introduced by Bug 46357.
+
+        * win/tools/vsprops/WinCairo.vsprops:
+
 2010-09-17  Sam Weinig  <sam at webkit.org>
 
         Reviewed, tweaked, and landed by Anders Carlsson.
diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
index 60873a3..9710568 100644
--- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
@@ -4,10 +4,10 @@
 	Version="8.00"
 	Name="WinCairo"
 	>
-  <Tool
+	<Tool
 		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\include\cairo&quot;;&quot;$(SolutionDir)\..\..\..\JavaScriptCore\os-win32&quot;"
 		PreprocessorDefinitions="WIN_CAIRO=1"
-		AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\include\cairo&quot;"
 	/>
 	<Tool
 		Name="VCLinkerTool"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list