aegisub-icu64.patch

   1 --- aegisub-3.2.2/libaegisub/common/character_count.cpp~        2014-12-08 01:07:09.000000000 +0100
   2 +++ aegisub-3.2.2/libaegisub/common/character_count.cpp 2019-04-15 08:12:10.451191386 +0200
   3 @@ -36,7 +36,7 @@
   4         static std::once_flag token;
   5         std::call_once(token, [&] {
   6                 UErrorCode status = U_ZERO_ERROR;
   7 -               bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
   8 +               bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
   9                 if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
  10         });
  11
  12 @@ -58,7 +58,7 @@
  13
  14         size_t count = 0;
  15         auto pos = character_bi.first();
  16 -       for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
  17 +       for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
  18                 if (!mask)
  19                         ++count;
  20                 else {
  21 @@ -143,7 +143,7 @@
  22         auto& bi = get_break_iterator(&str[0], str.size());
  23
  24         for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
  25 -               if (end == BreakIterator::DONE)
  26 +               if (end == icu::BreakIterator::DONE)
  27                         return str.size();
  28                 if (n == 0)
  29                         return pos;
  30 --- aegisub-3.2.2/src/utils.cpp~        2019-04-15 08:06:15.502668259 +0200
  31 +++ aegisub-3.2.2/src/utils.cpp 2019-04-15 09:01:36.733106091 +0200
  32 @@ -265,9 +265,9 @@
  33  }
  34
  35  wxString LocalizedLanguageName(wxString const& lang) {
  36 -       Locale iculoc(lang.c_str());
  37 +       icu::Locale iculoc(lang.c_str());
  38         if (!iculoc.isBogus()) {
  39 -               UnicodeString ustr;
  40 +               icu::UnicodeString ustr;
  41                 iculoc.getDisplayName(iculoc, ustr);
  42  #ifdef _MSC_VER
  43                 return wxString(ustr.getBuffer());