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

japhet at chromium.org japhet at chromium.org
Wed Dec 22 12:11:37 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 55fb7d10031f0ca3993e32446978cc80edec0d23
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 00:20:55 2010 +0000

    2010-08-16  Nate Chapin  <japhet at chromium.org>
    
            Unreviewed, build fix.
    
            Don't include TilingDataTest.cpp, since it doesn't
            compile on mac.
    
            * WebKit.gyp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65471 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 5e2a56d..5a37d5c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-16  Nate Chapin  <japhet at chromium.org>
+
+        Unreviewed, build fix.
+
+        Don't include TilingDataTest.cpp, since it doesn't
+        compile on mac.
+
+        * WebKit.gyp:
+
 2010-08-16  James Robinson  <jamesr at chromium.org>
 
         Compile fix.  Fix up paintsIntoCanvasBuffer impl.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index b5d5293..4da3c71 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -711,7 +711,8 @@
                         'tests/KeyboardTest.cpp',
                         'tests/KURLTest.cpp',
                         'tests/RunAllTests.cpp',
-                        'tests/TilingDataTest.cpp',
+                        # FIXME: This test is compile failing on mac.
+                        # 'tests/TilingDataTest.cpp',
                     ],
                     'conditions': [
                         ['OS=="win"', {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list