File chromium-gyp-system-icu.patch of Package chromium
diff -up chromium-6.0.399.0/src/app/app_base.gypi.system-icu chromium-6.0.399.0/app/app_base.gypi
--- chromium-6.0.399.0/src/app/app_base.gypi.system-icu 2010-05-09 04:17:22.000000000 -0400
+++ chromium-6.0.399.0/src/app/app_base.gypi 2010-05-10 15:02:26.527784965 -0400
@@ -78,8 +78,7 @@
'../gfx/gfx.gyp:gfx',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libjpeg/libjpeg.gyp:libjpeg',
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/sqlite/sqlite.gyp:sqlite',
diff -up chromium-6.0.399.0/src/app/app.gyp.system-icu chromium-6.0.399.0/app/app.gyp
--- chromium-6.0.399.0/src/app/app.gyp.system-icu 2010-05-09 04:17:22.000000000 -0400
+++ chromium-6.0.399.0/src/app/app.gyp 2010-05-10 15:02:26.530192203 -0400
@@ -30,8 +30,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libjpeg/libjpeg.gyp:libjpeg',
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/zlib/zlib.gyp:zlib',
diff -up chromium-6.0.399.0/src/base/base.gyp.system-icu chromium-6.0.399.0/base/base.gyp
--- chromium-6.0.399.0/src/base/base.gyp.system-icu 2010-05-09 04:18:32.000000000 -0400
+++ chromium-6.0.399.0/src/base/base.gyp 2010-05-10 15:02:26.540381674 -0400
@@ -16,8 +16,7 @@
'msvs_guid': '968F3222-9798-4D21-BE08-15ECB5EF2994',
'dependencies': [
'base',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
@@ -158,7 +157,7 @@
'include_dirs': [
# word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU
# #include for unicode/uchar.h. This should probably be cleaned up.
- '../third_party/icu/public/common',
+ # '../third_party/icu/public/common',
],
'dependencies': [
'base',
diff -up chromium-6.0.399.0/src/build/all.gyp.system-icu chromium-6.0.399.0/build/all.gyp
--- chromium-6.0.399.0/src/build/all.gyp.system-icu 2010-05-10 15:02:26.462990779 -0400
+++ chromium-6.0.399.0/src/build/all.gyp 2010-05-10 15:02:26.593879427 -0400
@@ -28,7 +28,6 @@
'../third_party/cld/cld.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
'../third_party/ffmpeg/ffmpeg.gyp:*',
- '../third_party/icu/icu.gyp:*',
'../third_party/libjpeg/libjpeg.gyp:*',
'../third_party/libpng/libpng.gyp:*',
'../third_party/libxml/libxml.gyp:*',
diff -up chromium-6.0.399.0/src/build/temp_gyp/googleurl.gyp.system-icu chromium-6.0.399.0/build/temp_gyp/googleurl.gyp
--- chromium-6.0.399.0/src/build/temp_gyp/googleurl.gyp.system-icu 2010-05-09 04:18:26.000000000 -0400
+++ chromium-6.0.399.0/src/build/temp_gyp/googleurl.gyp 2010-05-10 15:02:27.939589803 -0400
@@ -14,9 +14,7 @@
'msvs_guid': 'EF5E94AB-B646-4E5B-A058-52EF07B8351C',
'dependencies': [
'../../base/base.gyp:base',
- '../../third_party/icu/icu.gyp:icudata',
- '../../third_party/icu/icu.gyp:icui18n',
- '../../third_party/icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'sources': [
'../../googleurl/src/gurl.cc',
@@ -59,7 +57,7 @@
'dependencies': [
'googleurl',
'../../testing/gtest.gyp:gtest',
- '../../third_party/icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'sources': [
'../../googleurl/src/gurl_unittest.cc',
diff -up chromium-6.0.399.0/src/chrome/chrome_browser.gypi.system-icu chromium-6.0.399.0/chrome/chrome_browser.gypi
--- chromium-6.0.399.0/src/chrome/chrome_browser.gypi.system-icu 2010-05-09 04:19:29.000000000 -0400
+++ chromium-6.0.399.0/src/chrome/chrome_browser.gypi 2010-05-10 15:02:28.034948536 -0400
@@ -28,8 +28,7 @@
'../skia/skia.gyp:skia',
'../third_party/bzip2/bzip2.gyp:bzip2',
'../third_party/expat/expat.gyp:expat',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
diff -up chromium-6.0.399.0/src/chrome/chrome_common.gypi.system-icu chromium-6.0.399.0/chrome/chrome_common.gypi
--- chromium-6.0.399.0/src/chrome/chrome_common.gypi.system-icu 2010-05-09 04:19:29.000000000 -0400
+++ chromium-6.0.399.0/src/chrome/chrome_common.gypi 2010-05-10 15:03:20.620592203 -0400
@@ -163,8 +163,7 @@
'../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
'../third_party/bzip2/bzip2.gyp:bzip2',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/sqlite/sqlite.gyp:sqlite',
'../third_party/zlib/zlib.gyp:zlib',
diff -up chromium-6.0.399.0/src/chrome/chrome.gyp.system-icu chromium-6.0.399.0/chrome/chrome.gyp
--- chromium-6.0.399.0/src/chrome/chrome.gyp.system-icu 2010-05-09 04:19:29.000000000 -0400
+++ chromium-6.0.399.0/src/chrome/chrome.gyp 2010-05-10 15:02:28.078302220 -0400
@@ -527,8 +527,7 @@
'../net/net.gyp:http_listen_socket',
'theme_resources',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'include_dirs': [
'..',
@@ -578,8 +577,7 @@
'chrome_strings',
'../media/media.gyp:media',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/hunspell/hunspell.gyp:hunspell',
'../webkit/support/webkit_support.gyp:glue',
@@ -822,7 +820,7 @@
'../base/base.gyp:base',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../jingle/jingle.gyp:notifier',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/sqlite/sqlite.gyp:sqlite',
'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
diff -up chromium-6.0.399.0/src/chrome/chrome_renderer.gypi.system-icu chromium-6.0.399.0/chrome/chrome_renderer.gypi
--- chromium-6.0.399.0/src/chrome/chrome_renderer.gypi.system-icu 2010-05-09 04:19:29.000000000 -0400
+++ chromium-6.0.399.0/src/chrome/chrome_renderer.gypi 2010-05-10 15:02:28.085562748 -0400
@@ -19,8 +19,7 @@
'../third_party/hunspell/hunspell.gyp:hunspell',
'../third_party/cld/cld.gyp:cld',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
'../webkit/support/webkit_support.gyp:glue',
diff -up chromium-6.0.399.0/src/chrome/chrome_tests.gypi.system-icu chromium-6.0.399.0/chrome/chrome_tests.gypi
--- chromium-6.0.399.0/src/chrome/chrome_tests.gypi.system-icu 2010-05-09 04:19:29.000000000 -0400
+++ chromium-6.0.399.0/src/chrome/chrome_tests.gypi 2010-05-10 15:02:28.090392202 -0400
@@ -272,8 +272,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libxml/libxml.gyp:libxml',
# run time dependencies
'default_plugin/default_plugin.gyp:default_plugin',
@@ -496,8 +495,7 @@
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libxml/libxml.gyp:libxml',
],
'include_dirs': [
@@ -649,8 +647,7 @@
'../third_party/bzip2/bzip2.gyp:bzip2',
'../third_party/cld/cld.gyp:cld',
'../third_party/expat/expat.gyp:expat',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
@@ -1464,8 +1461,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'include_dirs': [
'..',
@@ -2118,8 +2114,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
],
diff -up chromium-6.0.399.0/src/chrome_frame/chrome_frame.gyp.system-icu chromium-6.0.399.0/chrome_frame/chrome_frame.gyp
--- chromium-6.0.399.0/src/chrome_frame/chrome_frame.gyp.system-icu 2010-05-09 04:17:41.000000000 -0400
+++ chromium-6.0.399.0/src/chrome_frame/chrome_frame.gyp 2010-05-10 15:02:28.108033488 -0400
@@ -364,8 +364,7 @@
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'chrome_frame_npapi',
'chrome_frame_ie',
'npchrome_frame',
diff -up chromium-6.0.399.0/src/gfx/gfx.gyp.system-icu chromium-6.0.399.0/gfx/gfx.gyp
--- chromium-6.0.399.0/src/gfx/gfx.gyp.system-icu 2010-05-09 04:17:22.000000000 -0400
+++ chromium-6.0.399.0/src/gfx/gfx.gyp 2010-05-10 15:02:28.116704632 -0400
@@ -52,8 +52,7 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libjpeg/libjpeg.gyp:libjpeg',
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/sqlite/sqlite.gyp:sqlite',
diff -up chromium-6.0.399.0/src/net/net.gyp.system-icu chromium-6.0.399.0/net/net.gyp
--- chromium-6.0.399.0/src/net/net.gyp.system-icu 2010-05-10 15:02:26.489337613 -0400
+++ chromium-6.0.399.0/src/net/net.gyp 2010-05-10 15:02:28.121958380 -0400
@@ -15,8 +15,7 @@
'../base/base.gyp:base_i18n',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../sdch/sdch.gyp:sdch',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/zlib/zlib.gyp:zlib',
'net_resources',
'ssl_false_start_blacklist_process#host',
@@ -283,8 +282,7 @@
'../base/base.gyp:base_i18n',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../sdch/sdch.gyp:sdch',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/zlib/zlib.gyp:zlib',
'net_base',
'net_resources',
diff -up chromium-6.0.399.0/src/printing/printing.gyp.system-icu chromium-6.0.399.0/printing/printing.gyp
--- chromium-6.0.399.0/src/printing/printing.gyp.system-icu 2010-05-09 04:17:23.000000000 -0400
+++ chromium-6.0.399.0/src/printing/printing.gyp 2010-05-10 15:02:28.140790298 -0400
@@ -16,8 +16,7 @@
'../base/base.gyp:base_i18n',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'msvs_guid': '9E5416B9-B91B-4029-93F4-102C1AD5CAF4',
'include_dirs': [
diff -up chromium-6.0.399.0/src/skia/skia.gyp.system-icu chromium-6.0.399.0/skia/skia.gyp
--- chromium-6.0.399.0/src/skia/skia.gyp.system-icu 2010-05-09 04:17:42.000000000 -0400
+++ chromium-6.0.399.0/src/skia/skia.gyp 2010-05-10 15:02:28.162776217 -0400
@@ -597,7 +597,7 @@
'../build/linux/system.gyp:freetype2',
'../third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
'../third_party/harfbuzz/harfbuzz.gyp:harfbuzz_interface',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'cflags': [
'-Wno-unused',
diff -up chromium-6.0.399.0/src/third_party/cld/cld.gyp.system-icu chromium-6.0.399.0/third_party/cld/cld.gyp
--- chromium-6.0.399.0/src/third_party/cld/cld.gyp.system-icu 2010-05-09 04:18:26.000000000 -0400
+++ chromium-6.0.399.0/src/third_party/cld/cld.gyp 2010-05-10 15:02:28.143492969 -0400
@@ -8,7 +8,7 @@
'target_name': 'cld',
'type': '<(library)',
'dependencies': [
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'include_dirs': [
'.',
diff -up chromium-6.0.399.0/src/third_party/hunspell/hunspell.gyp.system-icu chromium-6.0.399.0/third_party/hunspell/hunspell.gyp
--- chromium-6.0.399.0/src/third_party/hunspell/hunspell.gyp.system-icu 2010-05-09 04:35:18.000000000 -0400
+++ chromium-6.0.399.0/src/third_party/hunspell/hunspell.gyp 2010-05-10 15:02:28.144671564 -0400
@@ -10,7 +10,7 @@
'msvs_guid': 'D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E',
'dependencies': [
'../../base/base.gyp:base',
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'defines': [
'HUNSPELL_STATIC',
diff -up chromium-6.0.399.0/src/third_party/libxml/libxml.gyp.system-icu chromium-6.0.399.0/third_party/libxml/libxml.gyp
--- chromium-6.0.399.0/src/third_party/libxml/libxml.gyp.system-icu 2010-05-09 04:18:23.000000000 -0400
+++ chromium-6.0.399.0/src/third_party/libxml/libxml.gyp 2010-05-10 15:02:28.145873995 -0400
@@ -163,11 +163,11 @@
'src/include',
],
'dependencies': [
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
'../zlib/zlib.gyp:zlib',
],
'export_dependent_settings': [
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'direct_dependent_settings': {
'defines': [
diff -up chromium-6.0.399.0/src/third_party/sqlite/sqlite.gyp.system-icu chromium-6.0.399.0/third_party/sqlite/sqlite.gyp
--- chromium-6.0.399.0/src/third_party/sqlite/sqlite.gyp.system-icu 2010-05-09 04:18:25.000000000 -0400
+++ chromium-6.0.399.0/src/third_party/sqlite/sqlite.gyp 2010-05-10 15:02:28.148224470 -0400
@@ -205,8 +205,7 @@
'src/src',
],
'dependencies': [
- '../icu/icu.gyp:icui18n',
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'direct_dependent_settings': {
'include_dirs': [
@@ -235,7 +234,7 @@
'target_name': 'sqlite_shell',
'type': 'executable',
'dependencies': [
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
'sqlite',
],
'sources': [
diff -up chromium-6.0.399.0/src/third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp.system-icu chromium-6.0.399.0/third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
--- chromium-6.0.399.0/src/third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp.system-icu 2010-05-09 04:22:49.000000000 -0400
+++ chromium-6.0.399.0/src/third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp 2010-05-10 15:02:28.150738860 -0400
@@ -97,8 +97,7 @@
'msvs_guid': 'AA8A5A85-592B-4357-BC60-E0E91E026AF6',
'dependencies': [
'wtf_config',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+ '<(chromium_src_dir)/build/linux/system.gyp:icu',
],
'include_dirs': [
'../',
@@ -128,8 +127,7 @@
},
'export_dependent_settings': [
'wtf_config',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+ '<(chromium_src_dir)/build/linux/system.gyp:icu',
],
'msvs_disabled_warnings': [4127, 4355, 4510, 4512, 4610, 4706],
'conditions': [
diff -up chromium-6.0.399.0/src/views/views.gyp.system-icu chromium-6.0.399.0/views/views.gyp
--- chromium-6.0.399.0/src/views/views.gyp.system-icu 2010-05-09 04:18:26.000000000 -0400
+++ chromium-6.0.399.0/src/views/views.gyp 2010-05-10 15:02:28.153151317 -0400
@@ -43,8 +43,7 @@
'../app/app.gyp:app_strings',
'../app/app.gyp:app_resources',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'sources': [
# All .cc, .h under views, except unittests
@@ -363,8 +362,7 @@
'dependencies': [
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'views',
],
'include_dirs': [
diff -up chromium-6.0.399.0/src/webkit/glue/webkit_glue.gypi.system-icu chromium-6.0.399.0/webkit/glue/webkit_glue.gypi
--- chromium-6.0.399.0/src/webkit/glue/webkit_glue.gypi.system-icu 2010-05-09 04:17:23.000000000 -0400
+++ chromium-6.0.399.0/src/webkit/glue/webkit_glue.gypi 2010-05-10 15:02:28.157964231 -0400
@@ -114,8 +114,7 @@
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/printing/printing.gyp:printing',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/build/linux/system.gyp:icu',
'<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
'<(DEPTH)/third_party/ppapi/ppapi.gyp:ppapi_c',
'webkit_resources',
diff -up chromium-6.0.399.0/src/webkit/tools/test_shell/test_shell.gypi.system-icu chromium-6.0.399.0/webkit/tools/test_shell/test_shell.gypi
--- chromium-6.0.399.0/src/webkit/tools/test_shell/test_shell.gypi.system-icu 2010-05-09 04:17:23.000000000 -0400
+++ chromium-6.0.399.0/src/webkit/tools/test_shell/test_shell.gypi 2010-05-10 15:02:28.160371518 -0400
@@ -599,7 +599,7 @@
'mac_bundle': 1,
'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
'dependencies': [
- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/build/linux/system.gyp:icu',
'npapi_test_common',
],
'sources': [
