summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--third_party/harfbuzz-ng/harfbuzz.gyp5
2 files changed, 6 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 2d24a9a..0de5f56 100644
--- a/DEPS
+++ b/DEPS
@@ -8,7 +8,7 @@ vars = {
"sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "131194",
+ "webkit_revision": "131128",
"chromium_git": "http://git.chromium.org/git",
"chromiumos_git": "http://git.chromium.org/chromiumos",
"swig_revision": "69281",
diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp
index 7f89abb..f8b09ea 100644
--- a/third_party/harfbuzz-ng/harfbuzz.gyp
+++ b/third_party/harfbuzz-ng/harfbuzz.gyp
@@ -31,6 +31,9 @@
'src/hb-font.h',
'src/hb-glib.cc',
'src/hb-glib.h',
+ 'src/hb-gobject-enums.cc',
+ 'src/hb-gobject-structs.cc',
+ 'src/hb-gobject.h',
'src/hb-icu.cc',
'src/hb-icu.h',
'src/hb-mutex-private.hh',
@@ -93,6 +96,7 @@
],
'sources/': [
['exclude', 'src/hb-glib\\.(cc|h)$'],
+ ['exclude', 'src/hb-gobject.*\\.(cc|h)$'],
],
'include_dirs': [
'src',
@@ -112,6 +116,7 @@
],
'sources/': [
['include', 'src/hb-glib\\.(cc|h)$'],
+ ['include', 'src/hb-gobject.*\\.(cc|h)$'],
],
'dependencies': [
'../../base/base.gyp:base',