[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

evan at chromium.org evan at chromium.org
Fri Jan 21 14:56:01 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 0e7680410c3b95b6e4988e6b282d66367c640352
Author: evan at chromium.org <evan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 00:06:26 2011 +0000

    2011-01-04  Evan Martin  <evan at chromium.org>
    
            Reviewed by Tony Chang.
    
            [chromium] depend on harfbuzz explicitly
            https://bugs.webkit.org/show_bug.cgi?id=51895
    
            platform/graphics/chromium uses Harfbuzz directly.  Rather than
            expecting Skia to adjust the include paths, be explicit about
            the dependency.
    
            * WebCore.gyp/WebCore.gyp:
    2011-01-04  Evan Martin  <evan at chromium.org>
    
            Reviewed by Tony Chang.
    
            [chromium] depend on harfbuzz explicitly
            https://bugs.webkit.org/show_bug.cgi?id=51895
    
            Update Chromium DEPS to pick up newer Chromium version
            that simplifies expressing the Harfbuzz dependency.
    
            * DEPS:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75023 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 243ad59..6c5a9a8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-04  Evan Martin  <evan at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] depend on harfbuzz explicitly
+        https://bugs.webkit.org/show_bug.cgi?id=51895
+
+        platform/graphics/chromium uses Harfbuzz directly.  Rather than
+        expecting Skia to adjust the include paths, be explicit about
+        the dependency.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2011-01-04  Darin Adler  <darin at apple.com>
 
         Reviewed by Brady Eidson.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 0b2bbbc..50bdbf0 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -1104,6 +1104,9 @@
             ['include', 'platform/graphics/chromium/FontPlatformDataLinux\\.cpp$'],
             ['include', 'platform/graphics/chromium/SimpleFontDataLinux\\.cpp$'],
           ],
+          'dependencies': [
+            '<(chromium_src_dir)/third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
+          ],
         }],
         ['OS=="mac"', {
           # Necessary for Mac .mm stuff.
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c4a9fae..08660f0 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-04  Evan Martin  <evan at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] depend on harfbuzz explicitly
+        https://bugs.webkit.org/show_bug.cgi?id=51895
+
+        Update Chromium DEPS to pick up newer Chromium version
+        that simplifies expressing the Harfbuzz dependency.
+
+        * DEPS:
+
 2011-01-04  Zhe Su  <suzhe at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 3d91c0b..818891f 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '70319'
+  'chromium_rev': '70448'
 }
 
 deps = {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list