[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

barraclough at apple.com barraclough at apple.com
Wed Dec 22 11:43:18 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 37ae47215c18f61498451c220d8b6f949f841981
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 00:21:56 2010 +0000

    Build fix - add new header to !Mac projects.
    
    * GNUmakefile.am:
    * JavaScriptCore.gypi:
    * JavaScriptCore.vcproj/WTF/WTF.vcproj:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64696 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 59c3e8a..bab9c47 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-04  Gavin Barraclough  <barraclough at apple.com>
 
+        Build fix - add new header to !Mac projects.
+
+        * GNUmakefile.am:
+        * JavaScriptCore.gypi:
+        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
+
+2010-08-04  Gavin Barraclough  <barraclough at apple.com>
+
         Reviewed by Sam Weinig.
 
         Bug 43515 - Fix small design issues with PageAllocation, split out PageReservation.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 281cbe3..9e8bf86 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -463,6 +463,7 @@ javascriptcore_sources += \
 	JavaScriptCore/wtf/OwnPtr.h \
 	JavaScriptCore/wtf/PageAllocation.cpp \
 	JavaScriptCore/wtf/PageAllocation.h \
+	JavaScriptCore/wtf/PageReservation \
 	JavaScriptCore/wtf/PassOwnPtr.h \
 	JavaScriptCore/wtf/PassRefPtr.h \
 	JavaScriptCore/wtf/Platform.h \
diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi
index 1b806af..e48d5eb 100644
--- a/JavaScriptCore/JavaScriptCore.gypi
+++ b/JavaScriptCore/JavaScriptCore.gypi
@@ -400,6 +400,7 @@
             'wtf/OwnPtrCommon.h',
             'wtf/PageAllocation.cpp',
             'wtf/PageAllocation.h',
+            'wtf/PageReservation',
             'wtf/PassOwnPtr.h',
             'wtf/PassRefPtr.h',
             'wtf/Platform.h',
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
index 7f18f7e..9d551d0 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
@@ -437,6 +437,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\wtf\PageReservation.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\wtf\PassOwnPtr.h"
 			>
 		</File>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list