[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 651 Fix FTBFS with icu 4.4 (Closes: #589414)

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 651
Revision Id: iuculano at debian.org-20100717151656-8me981y80m4ho3s7
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Fix FTBFS with icu 4.4 (Closes: #589414)


--------------------------------------------------------
  ** Added :
        - debian/patches/icu44.patch

  ** Modified :
        - debian/changelog
        - debian/patches/series

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-07-08 11:35:42 +0000
+++ b/debian/changelog	2010-07-17 15:16:56 +0000
@@ -1,3 +1,9 @@
+chromium-browser (5.0.375.99~r51029-4) UNRELEASED; urgency=low
+
+  * Fix FTBFS with icu 4.4 (Closes: #589414)
+
+ -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 17 Jul 2010 17:08:55 +0200
+
 chromium-browser (5.0.375.99~r51029-3) unstable; urgency=low
 
   * [armel] Disabled thumb to fix FTBFS in armel

=== added file 'debian/patches/icu44.patch'
--- a/debian/patches/icu44.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/icu44.patch	2010-07-17 15:16:56 +0000
@@ -0,0 +1,24 @@
+--- a/src/base/i18n/word_iterator.h
++++ b/src/base/i18n/word_iterator.h
+@@ -9,6 +9,9 @@
+ #include <vector>
+ 
+ #include "unicode/uchar.h"
++#if U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 4
++#include "unicode/ubrk.h"
++#endif
+ 
+ #include "base/basictypes.h"
+ 
+@@ -67,7 +70,11 @@ class WordIterator {
+ 
+  private:
+   // ICU iterator.
++#if U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 4
++  UBreakIterator* iter_;
++#else
+   void* iter_;
++#endif
+ #if !defined(WCHAR_T_IS_UTF16)
+   std::vector<UChar> chars_;
+ #endif

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2010-07-08 11:19:54 +0000
+++ b/debian/patches/series	2010-07-17 15:16:56 +0000
@@ -19,3 +19,4 @@
 ffmpeg_arm.patch
 webkit-CVE-2010-1760.patch
 gtk-ambiance.patch
+icu44.patch