icu fix, bug #374903

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 65 insertions, 14 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e69f6539e6d5..f7c4ad086cb9 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.401 2011/07/19 21:56:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.402 2011/07/20 09:04:40 wired Exp $
+
+  20 Jul 2011; Alex Alexander <wired@gentoo.org>
+  +files/chromium-icu-compatibility-r0.patch, chromium-14.0.825.0.ebuild:
+  icu fix, bug #374903
 
   19 Jul 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-14.0.825.0.ebuild, chromium-9999-r1.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 595abf912017..154f5aeeb63c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-cups-r0.patch 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2
 AUX chromium-ffmpeg-build-r0.patch 774 RMD160 a11ebd15927195fb047a366b1f9ab412a35d1262 SHA1 1972826179eed503f70a1499521072eb99c1fd16 SHA256 205a136035d09fb88549dfe4dbb97508e43a46f35ca791efa79d6c401aea5d84
 AUX chromium-glibc-2.14-r0.patch 1508 RMD160 6f8e88858cb02b825e512d1f030e681dbe1699b3 SHA1 c70e6dc5379f934ce726aa9ee46cd9db1ffefbbb SHA256 c434606b1599a47d8905d33c22dd65dd950d322108860572c55532189434a8ee
+AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99
 AUX chromium-launcher-r1.sh 680 RMD160 17fdc3576819c41d9320fab4b2dde3b8dc3c251b SHA1 5be5d25be14906458eb93cd7275c47f73c55fce4 SHA256 fa9cd53ee929ac77a52abc09eb65bb605b72b384533ba52fb90a905c72c3c208
 AUX chromium-launcher-r2.sh 940 RMD160 7a64e597998a8f95a7e3d1c26377842ff8106f89 SHA1 9630a36af707a810cbd646f3bac5deba984439f6 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e
 AUX chromium-libgcrypt-r0.patch 436 RMD160 855ecc89bd61f95378dc5aa5726b48cac7ede92c SHA1 3346e667a6581f7f62020ebc16fbf608c3a47cb6 SHA256 a81c598f544278a5638f3707db8a2fab85173e93b9a3ff097648babe58b665b0
@@ -23,14 +21,7 @@ EBUILD chromium-12.0.742.112.ebuild 12047 RMD160 ab3c47a41ff2d69f7d53eab715c9151
 EBUILD chromium-13.0.782.41-r1.ebuild 13209 RMD160 b3afde37f5c9a30888485d24eec8a24ecbb5b400 SHA1 55c724a8914f413e764cb5fa940ec0b9217bf18c SHA256 e3b7dd4dc0daa5983e5d784466e8bc7b52ec791ec88d8fcc2cf2d8442a1fbb4f
 EBUILD chromium-13.0.782.41.ebuild 12867 RMD160 0bcdef36bf296578eaf695119bd201a6d9d42d52 SHA1 3522f88aff71cc44b8a898f70ec8764662439443 SHA256 71c849f01eb4c7f052f497705ce3141be9f51bfa1a9a190f5b564dea45aecb09
 EBUILD chromium-14.0.814.0.ebuild 13007 RMD160 9ce5d042ffc200e698725b83b9e48c5befbc4c86 SHA1 bba766b58828b518ffe4d0a4277c62e462b19aaf SHA256 4904f004583c96763656e08c18138b8eed5bb23c3521fbfbf20919368bea7a60
-EBUILD chromium-14.0.825.0.ebuild 12998 RMD160 cd83e96a41e26a8ae4ba4c2a33e0cb5057e8a070 SHA1 ce6a75a1363d4f9c123ba3ed8f5ae37e775d3ffe SHA256 ec479d2c31d63fb675894c763bb6a14bcb97ae76206b71f7783a4728508f7b23
+EBUILD chromium-14.0.825.0.ebuild 13088 RMD160 b29e6bc01c59efe7bf9626e2d038699cc649b7d7 SHA1 ba5a4c4d84c63111bc342f240685eb3d98d4a812 SHA256 eb296529a88d2b1337d48668d9b28011da51a8cc2ab4815b38341b0ebd0e9562
 EBUILD chromium-9999-r1.ebuild 15031 RMD160 02047ebd1adbd07d439894fe2cec3685da62b091 SHA1 65a4902152d2fbf2e93c535b46cba0abbe05ad0a SHA256 72df7aaea7daaadb612399d73a7704d409ed76c84097e870be8f96fd32cc3670
-MISC ChangeLog 89338 RMD160 b09c850a0fb763a6b7d750a9de751dd37f501cfd SHA1 a0d4b2d1e165197ba7cdb2f682c394e4a8219cc5 SHA256 29c68880709261e799c048d3be6e193f5c1f7cbd8dd97fd23193af1ef65f56db
+MISC ChangeLog 89480 RMD160 3d2419ebdbcc084a6af05e2f120459da329b82a5 SHA1 e2bcecbaa64800e0dfc38ca4d9051b073ceb0326 SHA256 06b031c03075fef9c84e0345df76aedfb5b910748a43162ecc54b0c6de1ea939
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk4l/YwACgkQuUQtlDBCeQKrUQCeNs5a2IaPmfn8y0kAIK4hW2SJ
-xJgAnjoRU4XiiNnSSzlifRENgSz6HxXk
-=9KhG
------END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-14.0.825.0.ebuild b/www-client/chromium/chromium-14.0.825.0.ebuild
index f1e6dfa4e53e..1da5455d7c07 100644
--- a/www-client/chromium/chromium-14.0.825.0.ebuild
+++ b/www-client/chromium/chromium-14.0.825.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.825.0.ebuild,v 1.2 2011/07/19 21:56:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.825.0.ebuild,v 1.3 2011/07/20 09:04:40 wired Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -115,6 +115,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# bug #374903 - ICU 4.8 compatibility
+	epatch "${FILESDIR}/${PN}-icu-compatibility-r0.patch"
+
 	# Make sure we don't use bundled libvpx headers.
 	epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
 
diff --git a/www-client/chromium/files/chromium-icu-compatibility-r0.patch b/www-client/chromium/files/chromium-icu-compatibility-r0.patch
new file mode 100644
index 000000000000..305cb2fc64b2
--- /dev/null
+++ b/www-client/chromium/files/chromium-icu-compatibility-r0.patch
@@ -0,0 +1,53 @@
+this patch fixes build failures with ICU 4.8
+
+http://codereview.chromium.org/7421003/
+https://bugs.gentoo.org/show_bug.cgi?id=374903
+
+--- v8/src/extensions/experimental/number-format.cc
++++ v8/src/extensions/experimental/number-format.cc
+@@ -36,6 +36,8 @@
+ #include "unicode/numfmt.h"
+ #include "unicode/uchar.h"
+ #include "unicode/ucurr.h"
++#include "unicode/unum.h"
++#include "unicode/uversion.h"
+ 
+ namespace v8 {
+ namespace internal {
+@@ -231,6 +233,8 @@
+ }
+ 
+ // Generates ICU number format pattern from given skeleton.
++// TODO(cira): Remove once ICU includes equivalent method
++// (see http://bugs.icu-project.org/trac/ticket/8610).
+ static icu::DecimalFormat* CreateFormatterFromSkeleton(
+     const icu::Locale& icu_locale,
+     const icu::UnicodeString& skeleton,
+@@ -251,6 +255,7 @@
+     // Case of non-consecutive U+00A4 is taken care of in i18n.js.
+     int32_t end_index = skeleton.lastIndexOf(currency_symbol, index);
+ 
++#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 6)
+     icu::NumberFormat::EStyles style;
+     switch (end_index - index) {
+       case 0:
+@@ -262,6 +267,19 @@
+       default:
+         style = icu::NumberFormat::kPluralCurrencyStyle;
+     }
++#else  // ICU version is 4.8 or above (we ignore versions below 4.0).
++    UNumberFormatStyle style;
++    switch (end_index - index) {
++      case 0:
++        style = UNUM_CURRENCY;
++        break;
++      case 1:
++        style = UNUM_CURRENCY_ISO;
++        break;
++      default:
++        style = UNUM_CURRENCY_PLURAL;
++    }
++#endif
+ 
+     base_format = static_cast<icu::DecimalFormat*>(
+         icu::NumberFormat::createInstance(icu_locale, style, *status));