openttd-icu64.patch

   1 --- openttd-1.6.1/src/language.h~       2019-04-13 22:53:25.090428421 +0200
   2 +++ openttd-1.6.1/src/language.h        2019-04-13 22:46:25.201737686 +0200
   3 @@ -111,7 +111,7 @@
   4  extern const LanguageMetadata *_current_language;
   5
   6  #ifdef WITH_ICU_SORT
   7 -extern Collator *_current_collator;
   8 +extern icu::Collator *_current_collator;
   9  #endif /* WITH_ICU_SORT */
  10
  11  bool ReadLanguagePack(const LanguageMetadata *lang);
  12 --- openttd-1.6.1/src/strings.cpp~      2019-04-13 22:53:26.100481421 +0200
  13 +++ openttd-1.6.1/src/strings.cpp       2019-04-13 22:51:17.253720586 +0200
  14 @@ -52,7 +52,7 @@
  15  TextDirection _current_text_dir; ///< Text direction of the currently selected language.
  16
  17  #ifdef WITH_ICU_SORT
  18 -Collator *_current_collator = NULL;               ///< Collator for the language currently in use.
  19 +icu::Collator *_current_collator = NULL;               ///< Collator for the language currently in use.
  20  #endif /* WITH_ICU_SORT */
  21
  22  static uint64 _global_string_params_data[20];     ///< Global array of string parameters. To access, use #SetDParam.
  23 @@ -1801,7 +1801,7 @@
  24
  25         /* Create a collator instance for our current locale. */
  26         UErrorCode status = U_ZERO_ERROR;
  27 -       _current_collator = Collator::createInstance(Locale(_current_language->isocode), status);
  28 +       _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status);
  29         /* Sort number substrings by their numerical value. */
  30         if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status);
  31         /* Avoid using the collator if it is not correctly set. */