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

kbr at google.com kbr at google.com
Wed Dec 22 11:43:02 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 73b93a25b851aa1282b1d1279b0afc7cbcdf306e
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 21:28:19 2010 +0000

    2010-08-04  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Dimitri Glazkov.
    
            Add ANGLE dependency for Chromium WebCore build
            https://bugs.webkit.org/show_bug.cgi?id=43508
    
            No new tests. Built modified version of patch from bug 42405 in
            Chromium to test.
    
            * WebCore.gyp/WebCore.gyp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64680 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5225d62..91f0b46 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-04  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Add ANGLE dependency for Chromium WebCore build
+        https://bugs.webkit.org/show_bug.cgi?id=43508
+
+        No new tests. Built modified version of patch from bug 42405 in
+        Chromium to test.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2010-08-04  Dan Bernstein  <mitz at apple.com>
 
         Allow the language for hyphenation to be specified
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 5ecb48a..a28ee5d 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -786,6 +786,7 @@
         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
         '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
+        '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
       ],
       'defines': [
         'WEBCORE_NAVIGATOR_VENDOR="Google Inc."',
@@ -793,7 +794,8 @@
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
         '<@(webcore_include_dirs)',
-        '<(chromium_src_dir)/gpu'
+        '<(chromium_src_dir)/gpu',
+        '<(chromium_src_dir)/third_party/angle/include/GLSLANG',
       ],
       'sources': [
         '<@(webcore_files)',

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list