[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[tony at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit e2fa398f898b2fc1e7d32a87db9a321a5603cbae
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 17:37:45 2011 +0000

    2011-01-24  Tony Chang  <tony at chromium.org>
    
            Reviewed by James Robinson.
    
            [chromium] turn off gyp circular dependency checking and roll chromium deps
            https://bugs.webkit.org/show_bug.cgi?id=52935
    
            * DEPS:
            * gyp_webkit: Turn off gyp circular dependency checking on Linux
                and Win since we don't do these checks in gyp_chromium.  It's
                just making it harder for us to roll DEPS and have something
                explode.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76527 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 9c21d71..6fc13fc 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-24  Tony Chang  <tony at chromium.org>
+
+        Reviewed by James Robinson.
+
+        [chromium] turn off gyp circular dependency checking and roll chromium deps
+        https://bugs.webkit.org/show_bug.cgi?id=52935
+
+        * DEPS:
+        * gyp_webkit: Turn off gyp circular dependency checking on Linux
+            and Win since we don't do these checks in gyp_chromium.  It's
+            just making it harder for us to roll DEPS and have something
+            explode.
+
 2011-01-24  Satish Sampath  <satish at chromium.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/Source/WebKit/chromium/DEPS b/Source/WebKit/chromium/DEPS
index 8d08c3f..151d7dc 100644
--- a/Source/WebKit/chromium/DEPS
+++ b/Source/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '71969'
+  'chromium_rev': '72181'
 }
 
 deps = {
@@ -56,6 +56,8 @@ deps = {
   # skia dependencies
   'skia':
     Var('chromium_svn')+'/skia@'+Var('chromium_rev'),
+  'third_party/skia/gpu':
+    From('chromium_deps', 'src/third_party/skia/gpu'),
   'third_party/skia/src':
     From('chromium_deps', 'src/third_party/skia/src'),
   'third_party/skia/include':
diff --git a/Source/WebKit/chromium/gyp_webkit b/Source/WebKit/chromium/gyp_webkit
index 29e3e7c..768acac 100755
--- a/Source/WebKit/chromium/gyp_webkit
+++ b/Source/WebKit/chromium/gyp_webkit
@@ -76,6 +76,15 @@ if __name__ == '__main__':
   # Add includes.
   args.extend(['-I' + i for i in additional_include_files(args)])
 
+  # There shouldn't be a circular dependency relationship between .gyp files,
+  # but in Chromium's .gyp files, on non-Mac platforms, circular relationships
+  # currently exist.  The check for circular dependencies is currently
+  # bypassed on other platforms, but is left enabled on the Mac, where a
+  # violation of the rule causes Xcode to misbehave badly.
+  # http://crbug.com/35878.
+  if sys.platform not in ('darwin',):
+    args.append('--no-circular-check')
+
   # On linux, we want gyp to output a makefile (default is scons).
   if sys.platform == 'linux2':
     args.extend(['-fmake',

-- 
WebKit Debian packaging