summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2013-09-28 22:31:53 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2013-09-28 22:31:53 +0000
commitef1a634c1f9ff395b5060a1420a0ae305e9a7345 (patch)
tree83f5f14bdc63352a7f6997bdc916242d2eb9d71b /www-client/chromium/files
parentMajor upstream 0.27 release. (diff)
downloadhistorical-ef1a634c1f9ff395b5060a1420a0ae305e9a7345.tar.gz
historical-ef1a634c1f9ff395b5060a1420a0ae305e9a7345.tar.bz2
historical-ef1a634c1f9ff395b5060a1420a0ae305e9a7345.zip
Fix the patch and apply it, bug #486342 by floppym.
Package-Manager: portage-2.2.1/cvs/Linux i686 Manifest-Sign-Key: 0x30427902
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r--www-client/chromium/files/chromium-system-icu-r0.patch34
1 files changed, 23 insertions, 11 deletions
diff --git a/www-client/chromium/files/chromium-system-icu-r0.patch b/www-client/chromium/files/chromium-system-icu-r0.patch
index 27a7b7d76810..5138afc681db 100644
--- a/www-client/chromium/files/chromium-system-icu-r0.patch
+++ b/www-client/chromium/files/chromium-system-icu-r0.patch
@@ -1,14 +1,26 @@
---- build/linux/unbundle/icu.gyp.orig 2013-05-08 16:16:58.989728264 +0000
-+++ build/linux/unbundle/icu.gyp 2013-05-08 16:18:07.910115715 +0000
-@@ -7,6 +7,11 @@
+--- build/linux/unbundle/icu.gyp.orig 2013-09-27 18:18:50.531839532 +0000
++++ build/linux/unbundle/icu.gyp 2013-09-27 18:19:08.301950500 +0000
+@@ -7,6 +7,7 @@
{
'target_name': 'system_icu',
'type': 'none',
-+ 'direct_dependent_settings': {
-+ 'defines': [
-+ 'U_USING_ICU_NAMESPACE=0',
-+ ],
-+ },
- 'link_settings': {
- 'ldflags': [
- '<!@(icu-config --ldflags)',
++ 'toolsets': ['host', 'target'],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'U_USING_ICU_NAMESPACE=0',
+@@ -30,6 +31,7 @@
+ {
+ 'target_name': 'icui18n',
+ 'type': 'none',
++ 'toolsets': ['host', 'target'],
+ 'dependencies': ['system_icu'],
+ 'export_dependent_settings': ['system_icu'],
+ 'variables': {
+@@ -116,6 +118,7 @@
+ {
+ 'target_name': 'icuuc',
+ 'type': 'none',
++ 'toolsets': ['host', 'target'],
+ 'dependencies': ['system_icu'],
+ 'export_dependent_settings': ['system_icu'],
+ 'variables': {