Update icu x86_64 package with namespace renaming enabled.

"Renaming" means the icu namespace is suffixed with the version number,
atm icu_55. Using "renaming" allows to use two different versions of ICU,
thus easing upgrades. For instance haikuwebkit uses a current version of ICU,
while the system uses a newer one after an upgrade.

* Replace all uses of the icu namespace in our public headers, with a macro
defaulting to icu. As the namespace is only used for private fields pointers,
there should be no impact.
* Locale kit *.cpp have to import the macro from <unicode/uversion.h> *before*
including any locale headers. Ditto for a Time preferences cpp file. This way,
the correct current icu namespace is referenced.
* Fixes bug #12057.

build/jam/repositories/HaikuPorts/x86_64

@@ -97,8 +97,8 @@ RemotePackageRepository HaikuPorts
 	harfbuzz_devel-0.9.39-1
 	help2man-1.44.1-1
 	htmldoc-1.8.27-3
-	icu-55.1-2
+	icu-55.1-3
-	icu_devel-55.1-2
+	icu_devel-55.1-3
 	icu54-54.1-1
 	icu54_devel-54.1-1
 	intltool-0.40.6-4

headers/os/locale/Collator.h

@@ -10,7 +10,10 @@
 #include <SupportDefs.h>
 
 
-namespace icu {
+#ifndef U_ICU_NAMESPACE
+  #define U_ICU_NAMESPACE icu
+#endif
+namespace U_ICU_NAMESPACE {
 	class Collator;
 };
 
@@ -73,7 +76,7 @@ public:
 private:
 			status_t			_SetStrength(int8 strength) const;
 
-			mutable icu::Collator*	fICUCollator;
+			mutable U_ICU_NAMESPACE::Collator*	fICUCollator;
 			int8				fDefaultStrength;
 			bool				fIgnorePunctuation;
 };

headers/os/locale/Country.h

@@ -16,7 +16,10 @@ class BBitmap;
 class BLanguage;
 class BMessage;
 
-namespace icu {
+#ifndef U_ICU_NAMESPACE
+  #define U_ICU_NAMESPACE icu
+#endif
+namespace U_ICU_NAMESPACE {
 	class DateFormat;
 	class Locale;
 }
@@ -45,7 +48,7 @@ public:
 private:
 	friend	class Private;
 
-			icu::Locale*		fICULocale;
+			U_ICU_NAMESPACE::Locale*		fICULocale;
 };
 
 

headers/os/locale/DateFormat.h

@@ -14,7 +14,10 @@
 #include <Locker.h>
 
 
-namespace icu {
+#ifndef U_ICU_NAMESPACE
+  #define U_ICU_NAMESPACE icu
+#endif
+namespace U_ICU_NAMESPACE {
 	class DateFormat;
 }
 
@@ -76,7 +79,7 @@ public:
 									BDate& output);
 
 private:
-			icu::DateFormat*	_CreateDateFormatter(
+			U_ICU_NAMESPACE::DateFormat*	_CreateDateFormatter(
 									const BDateFormatStyle style) const;
 
 };

headers/os/locale/DateTimeFormat.h

@@ -53,7 +53,7 @@ public:
 									const BTimeZone* timeZone = NULL) const;
 
 private:
-			icu::DateFormat*	_CreateDateTimeFormatter(
+			U_ICU_NAMESPACE::DateFormat*	_CreateDateTimeFormatter(
 									const BString& format) const;
 };
 

headers/os/locale/DurationFormat.h

@@ -14,7 +14,10 @@
 
 class BTimeZone;
 
-namespace icu {
+#ifndef U_ICU_NAMESPACE
+  #define U_ICU_NAMESPACE icu
+#endif
+namespace U_ICU_NAMESPACE {
 	class GregorianCalendar;
 }
 
@@ -43,7 +46,7 @@ public:
 private:
 			BString				fSeparator;
 			BTimeUnitFormat		fTimeUnitFormat;
-			icu::GregorianCalendar*	fCalendar;
+			U_ICU_NAMESPACE::GregorianCalendar*	fCalendar;
 };
 
 

headers/os/locale/FormattingConventions.h

@@ -17,7 +17,10 @@ class BBitmap;
 class BLanguage;
 class BMessage;
 
-namespace icu {
+#ifndef U_ICU_NAMESPACE
+  #define U_ICU_NAMESPACE icu
+#endif
+namespace U_ICU_NAMESPACE {
 	class DateFormat;
 	class Locale;
 }
@@ -137,7 +140,7 @@ private:
 
 			bool				fUseStringsFromPreferredLanguage;
 
-			icu::Locale*		fICULocale;
+			U_ICU_NAMESPACE::Locale*		fICULocale;
 };
 
 

headers/os/locale/Language.h

@@ -15,7 +15,10 @@ class BBitmap;
 
 // We must not include the icu headers in there as it could mess up binary
 // compatibility.
-namespace icu {
+#ifndef U_ICU_NAMESPACE
+  #define U_ICU_NAMESPACE icu
+#endif
+namespace U_ICU_NAMESPACE {
 	class Locale;
 }
 
@@ -64,7 +67,7 @@ private:
 	friend	class Private;
 
 			uint8				fDirection;
-			icu::Locale*		fICULocale;
+			U_ICU_NAMESPACE::Locale*		fICULocale;
 };
 
 

headers/os/locale/MessageFormat.h

@@ -13,7 +13,10 @@
 #include <Format.h>
 
 
-namespace icu {
+#ifndef U_ICU_NAMESPACE
+  #define U_ICU_NAMESPACE icu
+#endif
+namespace U_ICU_NAMESPACE {
 	class MessageFormat;
 	class UnicodeString;
 }
@@ -31,10 +34,10 @@ public:
 			status_t			Format(BString& buffer, const int64 arg) const;
 
 private:
-			status_t			_Initialize(const icu::UnicodeString&);
+			status_t			_Initialize(const U_ICU_NAMESPACE::UnicodeString&);
 
 private:
-			icu::MessageFormat*	fFormatter;
+			U_ICU_NAMESPACE::MessageFormat*	fFormatter;
 };
 
 

headers/os/locale/TimeFormat.h

@@ -48,7 +48,7 @@ public:
 									BPrivate::BTime& output);
 
 private:
-			icu::DateFormat*	_CreateTimeFormatter(
+			U_ICU_NAMESPACE::DateFormat*	_CreateTimeFormatter(
 									const BTimeFormatStyle style) const;
 };
 

headers/os/locale/TimeUnitFormat.h

@@ -12,7 +12,10 @@
 
 class BString;
 
-namespace icu {
+#ifndef U_ICU_NAMESPACE
+  #define U_ICU_NAMESPACE icu
+#endif
+namespace U_ICU_NAMESPACE {
 	class TimeUnitFormat;
 }
 
@@ -53,7 +56,7 @@ public:
 									) const;
 
 private:
-			icu::TimeUnitFormat*	fFormatter;
+			U_ICU_NAMESPACE::TimeUnitFormat*	fFormatter;
 };
 
 

headers/os/locale/TimeZone.h

@@ -9,7 +9,10 @@
 #include <String.h>
 
 
-namespace icu {
+#ifndef U_ICU_NAMESPACE
+  #define U_ICU_NAMESPACE icu
+#endif
+namespace U_ICU_NAMESPACE {
 	class Locale;
 	class TimeZone;
 }
@@ -46,8 +49,8 @@ public:
 private:
 	friend	class Private;
 
-			icu::TimeZone*		fICUTimeZone;
+			U_ICU_NAMESPACE::TimeZone*		fICUTimeZone;
-			icu::Locale*		fICULocale;
+			U_ICU_NAMESPACE::Locale*		fICULocale;
 			status_t			fInitStatus;
 
 	mutable uint32				fInitializedFields;

src/kits/locale/Collator.cpp

@@ -5,13 +5,15 @@
 */
 
 
+#include <unicode/uversion.h>
+#include <Collator.h>
+
 #include <ctype.h>
 #include <stdlib.h>
 
 #include <new>
 #include <typeinfo>
 
-#include <Collator.h>
 #include <UnicodeChar.h>
 #include <String.h>
 #include <Message.h>

src/kits/locale/Country.cpp

@@ -5,6 +5,7 @@
  */
 
 
+#include <unicode/uversion.h>
 #include <Country.h>
 
 #include <AutoDeleter.h>

src/kits/locale/DateFormat.cpp

@@ -7,6 +7,7 @@
  *		Adrien Desutugues <[email protected]>
  */
 
+#include <unicode/uversion.h>
 #include <DateFormat.h>
 
 #include <AutoDeleter.h>

src/kits/locale/DateTimeFormat.cpp

@@ -6,6 +6,7 @@
  *		Oliver Tappe <[email protected]>
  */
 
+#include <unicode/uversion.h>
 #include <DateTimeFormat.h>
 
 #include <AutoDeleter.h>

src/kits/locale/DurationFormat.cpp

@@ -7,6 +7,7 @@
  */
 
 
+#include <unicode/uversion.h>
 #include <DurationFormat.h>
 
 #include <new>

src/kits/locale/FormattingConventions.cpp

@@ -6,6 +6,7 @@
  */
 
 
+#include <unicode/uversion.h>
 #include <FormattingConventions.h>
 
 #include <AutoDeleter.h>

src/kits/locale/Language.cpp

@@ -4,6 +4,7 @@
  */
 
 
+#include <unicode/uversion.h>
 #include <Language.h>
 
 #include <stdlib.h>

src/kits/locale/LocaleRoster.cpp

@@ -8,6 +8,7 @@
  */
 
 
+#include <unicode/uversion.h>
 #include <LocaleRoster.h>
 
 #include <assert.h>

src/kits/locale/LocaleRosterData.cpp

@@ -8,6 +8,7 @@
  */
 
 
+#include <unicode/uversion.h>
 #include <LocaleRosterData.h>
 
 #include <Autolock.h>

src/kits/locale/MessageFormat.cpp

@@ -6,6 +6,8 @@
  *		Adrien Destugues, [email protected]
  *		John Scipione, [email protected]
  */
+
+#include <unicode/uversion.h>
 #include <MessageFormat.h>
 
 #include <Autolock.h>

src/kits/locale/NumberFormat.cpp

@@ -6,6 +6,7 @@
  */
 
 
+#include <unicode/uversion.h>
 #include <NumberFormat.h>
 
 #include <AutoDeleter.h>

src/kits/locale/TimeFormat.cpp

@@ -6,6 +6,7 @@
  *		Oliver Tappe <[email protected]>
  */
 
+#include <unicode/uversion.h>
 #include <TimeFormat.h>
 
 #include <AutoDeleter.h>

src/kits/locale/TimeUnitFormat.cpp

@@ -8,6 +8,7 @@
  */
 
 
+#include <unicode/uversion.h>
 #include <TimeUnitFormat.h>
 
 #include <new>

src/kits/locale/TimeZone.cpp

@@ -8,6 +8,7 @@
  */
 
 
+#include <unicode/uversion.h>
 #include <TimeZone.h>
 
 #include <new>

src/preferences/time/ZoneView.cpp

@@ -13,6 +13,7 @@
  */
 
 
+#include <unicode/uversion.h>
 #include "ZoneView.h"
 
 #include <stdlib.h>