summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_base.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_base.gyp')
-rw-r--r--www/chromium/files/patch-base_base.gyp25
1 files changed, 21 insertions, 4 deletions
diff --git a/www/chromium/files/patch-base_base.gyp b/www/chromium/files/patch-base_base.gyp
index b05b70e6a8f2..7cf562ded0bd 100644
--- a/www/chromium/files/patch-base_base.gyp
+++ b/www/chromium/files/patch-base_base.gyp
@@ -1,6 +1,6 @@
---- base/base.gyp.orig 2016-05-11 19:02:11 UTC
-+++ base/base.gyp
-@@ -113,7 +113,7 @@
+--- ./base/base.gyp.orig 2016-07-22 00:06:49.000000000 -0400
++++ ./base/base.gyp 2016-08-05 08:28:39.441243000 -0400
+@@ -114,7 +114,7 @@
],
'link_settings': {
'libraries': [
@@ -9,7 +9,24 @@
],
},
}],
-@@ -748,6 +748,11 @@
+@@ -286,13 +286,13 @@
+ ],
+ }],
+ ['icu_use_data_file_flag==1', {
+- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'],
++ 'defines': ['ICU_UTIL_DATA_IMPL=0'],
+ }, { # else icu_use_data_file_flag !=1
+ 'conditions': [
+ ['OS=="win"', {
+- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'],
++ 'defines': ['ICU_UTIL_DATA_IMPL=1'],
+ }, {
+- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'],
++ 'defines': ['ICU_UTIL_DATA_IMPL=2'],
+ }],
+ ],
+ }],
+@@ -773,6 +773,11 @@
'sync_socket_unittest.cc',
],
}],