Prepare for ICU update

- libicule and libiculx do not exist anymore in newer ICU versions
  (harfbuzz replaces them), but we didn't actually use them, so remove
  them from the build feature and from the package dependencies
- Add namespace usage marcos since the newer ICU packages put ICU things
  in a namespace, making it easier to have multiple versions of ICU used
  side by side.

No functional change intended, but this makes it possible to build the
code with either ICU 57 (for gcc2) or 66 (for other architectures).
This commit is contained in:
Adrien Destugues
2020-08-02 11:58:14 +02:00
parent b3aed2adb5
commit 1bad1ff34a
46 changed files with 142 additions and 52 deletions
-2
View File
@@ -66,8 +66,6 @@ requires {
lib:libicudata
lib:libicui18n
lib:libicuio
lib:libicule
lib:libiculx
lib:libicutest
lib:libicutu
lib:libicuuc
-2
View File
@@ -66,8 +66,6 @@ requires {
lib:libicudata
lib:libicui18n
lib:libicuio
lib:libicule
lib:libiculx
lib:libicutest
lib:libicutu
lib:libicuuc
-2
View File
@@ -66,8 +66,6 @@ requires {
lib:libicudata >= 57
lib:libicui18n >= 57
lib:libicuio >= 57
lib:libicule >= 57
lib:libiculx >= 57
lib:libicutest >= 57
lib:libicutu >= 57
lib:libicuuc >= 57
-2
View File
@@ -66,8 +66,6 @@ requires {
lib:libicudata >= 57
lib:libicui18n >= 57
lib:libicuio >= 57
lib:libicule >= 57
lib:libiculx >= 57
lib:libicutest >= 57
lib:libicutu >= 57
lib:libicuuc >= 57
-2
View File
@@ -67,8 +67,6 @@ requires {
lib:libicudata >= 57
lib:libicui18n >= 57
lib:libicuio >= 57
lib:libicule >= 57
lib:libiculx >= 57
lib:libicutest >= 57
lib:libicutu >= 57
lib:libicuuc >= 57
@@ -27,8 +27,6 @@ requires {
lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicule_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libiculx_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH%
-2
View File
@@ -67,8 +67,6 @@ requires {
lib:libicudata >= 57
lib:libicui18n >= 57
lib:libicuio >= 57
lib:libicule >= 57
lib:libiculx >= 57
lib:libicutest >= 57
lib:libicutu >= 57
lib:libicuuc >= 57
@@ -28,8 +28,6 @@ requires {
lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicule_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libiculx_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH%
-2
View File
@@ -67,8 +67,6 @@ requires {
lib:libicudata >= 57
lib:libicui18n >= 57
lib:libicuio >= 57
lib:libicule >= 57
lib:libiculx >= 57
lib:libicutest >= 57
lib:libicutu >= 57
lib:libicuuc >= 57
@@ -27,8 +27,6 @@ requires {
lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicule_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libiculx_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH%
+3
View File
@@ -22,6 +22,9 @@
#include <unicode/tblcoll.h>
U_NAMESPACE_USE
BCollator::BCollator()
:
fIgnorePunctuation(true)
+3
View File
@@ -28,6 +28,9 @@
#include <stdlib.h>
U_NAMESPACE_USE
BCountry::BCountry(const char* countryCode)
:
fICULocale(NULL)
+3
View File
@@ -27,6 +27,9 @@
#include <vector>
U_NAMESPACE_USE
static const DateFormatSymbols::DtWidthType kDateFormatStyleToWidth[] = {
DateFormatSymbols::WIDE,
DateFormatSymbols::ABBREVIATED,
+3
View File
@@ -22,6 +22,9 @@
#include <unicode/smpdtfmt.h>
U_NAMESPACE_USE
BDateTimeFormat::BDateTimeFormat(const BLocale* locale)
: BFormat(locale)
{
+3
View File
@@ -22,6 +22,9 @@
#include <TimeZonePrivate.h>
U_NAMESPACE_USE
// maps our unit element to the corresponding ICU unit
static const UCalendarDateFields skUnitMap[] = {
UCAL_YEAR,
@@ -33,6 +33,9 @@
#include <stdlib.h>
U_NAMESPACE_USE
// #pragma mark - helpers
+3
View File
@@ -26,6 +26,9 @@
#include <unicode/locid.h>
U_NAMESPACE_USE
BLanguage::BLanguage()
:
fDirection(B_LEFT_TO_RIGHT),
+1
View File
@@ -43,6 +43,7 @@
using BPrivate::CatalogAddOnInfo;
using BPrivate::MutableLocaleRoster;
U_NAMESPACE_USE
/*
+3
View File
@@ -36,6 +36,9 @@
#include <unicode/timezone.h>
U_NAMESPACE_USE
namespace BPrivate {
+3
View File
@@ -21,6 +21,9 @@
#include <unicode/numfmt.h>
U_NAMESPACE_USE
class BNumberFormatImpl {
public:
BNumberFormatImpl();
@@ -25,6 +25,9 @@
#include <TimeUnitFormat.h>
U_NAMESPACE_USE
static const URelativeDateTimeUnit kTimeUnitToRelativeDateTime[] = {
UDAT_REL_UNIT_YEAR,
UDAT_REL_UNIT_MONTH,
+3
View File
@@ -19,6 +19,9 @@
#include <unicode/msgfmt.h>
U_NAMESPACE_USE
BStringFormat::BStringFormat(const BLanguage& language, const BString pattern)
: BFormat(language, BFormattingConventions())
{
+3
View File
@@ -24,6 +24,9 @@
#include <vector>
U_NAMESPACE_USE
BTimeFormat::BTimeFormat()
: BFormat()
{
+4
View File
@@ -23,6 +23,10 @@
#include <Locale.h>
#include <LocaleRoster.h>
U_NAMESPACE_USE
// maps our unit element to the corresponding ICU unit
static const TimeUnit::UTimeUnitFields skUnitMap[] = {
TimeUnit::UTIMEUNIT_YEAR,
+3
View File
@@ -20,6 +20,9 @@
#include <Language.h>
U_NAMESPACE_USE
const char* BTimeZone::kNameOfGmtZone = "GMT";
@@ -11,6 +11,9 @@
#include <unicode/uchar.h>
U_NAMESPACE_USE
namespace BPrivate {
namespace Libroot {
@@ -15,6 +15,9 @@
#include <AutoDeleter.h>
U_NAMESPACE_USE
namespace BPrivate {
namespace Libroot {
@@ -27,6 +27,9 @@
#endif
U_NAMESPACE_USE
namespace BPrivate {
namespace Libroot {
@@ -16,6 +16,9 @@
#include <ErrnoMaintainer.h>
U_NAMESPACE_USE
namespace BPrivate {
namespace Libroot {
@@ -9,6 +9,9 @@
#include <string.h>
U_NAMESPACE_USE
namespace BPrivate {
namespace Libroot {
@@ -10,6 +10,9 @@
#include <string.h>
U_NAMESPACE_USE
namespace BPrivate {
namespace Libroot {
@@ -12,6 +12,9 @@
#include <strings.h>
U_NAMESPACE_USE
namespace BPrivate {
namespace Libroot {
@@ -12,6 +12,9 @@
#include <strings.h>
U_NAMESPACE_USE
namespace BPrivate {
namespace Libroot {
@@ -13,6 +13,9 @@
#include <unicode/gregocal.h>
U_NAMESPACE_USE
namespace BPrivate {
namespace Libroot {
@@ -18,6 +18,10 @@
#include "ICUMessagesData.h"
U_NAMESPACE_USE
namespace BPrivate {
namespace Libroot {