diff --git a/aegisub-icu.patch b/aegisub-icu.patch index 7063c79..c7701ed 100644 --- a/aegisub-icu.patch +++ b/aegisub-icu.patch @@ -12,13 +12,13 @@ didn't in the past. Index: libaegisub/common/character_count.cpp =================================================================== --- libaegisub/common/character_count.cpp.orig 2014-12-08 02:07:09.000000000 +0200 -+++ libaegisub/common/character_count.cpp 2018-05-19 13:36:11.101071666 +0200 ++++ libaegisub/common/character_count.cpp 2018-06-08 09:19:09.591507615 +0200 @@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(c static std::once_flag token; std::call_once(token, [&] { UErrorCode status = U_ZERO_ERROR; - bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status)); -+ bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status)); ++ bi.reset(U_ICU_NAMESPACE::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status)); if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator"); }); @@ -27,7 +27,7 @@ Index: libaegisub/common/character_count.cpp size_t count = 0; auto pos = character_bi.first(); - for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) { -+ for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) { ++ for (auto end = character_bi.next(); end != U_ICU_NAMESPACE::BreakIterator::DONE; pos = end, end = character_bi.next()) { if (!mask) ++count; else { @@ -36,23 +36,23 @@ Index: libaegisub/common/character_count.cpp for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) { - if (end == BreakIterator::DONE) -+ if (end == icu::BreakIterator::DONE) ++ if (end == U_ICU_NAMESPACE::BreakIterator::DONE) return str.size(); if (n == 0) return pos; Index: src/utils.cpp =================================================================== --- src/utils.cpp.orig 2018-05-19 12:35:15.069871773 +0200 -+++ src/utils.cpp 2018-05-19 14:06:59.572174480 +0200 ++++ src/utils.cpp 2018-06-08 09:22:06.796104985 +0200 @@ -265,9 +265,9 @@ agi::fs::path SaveFileSelector(wxString } wxString LocalizedLanguageName(wxString const& lang) { - Locale iculoc(lang.c_str()); -+ icu::Locale iculoc(lang.c_str()); ++ U_ICU_NAMESPACE::Locale iculoc(lang.c_str()); if (!iculoc.isBogus()) { - UnicodeString ustr; -+ icu::UnicodeString ustr; ++ U_ICU_NAMESPACE::UnicodeString ustr; iculoc.getDisplayName(iculoc, ustr); #ifdef _MSC_VER return wxString(ustr.getBuffer()); diff --git a/aegisub.changes b/aegisub.changes index cb0b864..a4d38e1 100644 --- a/aegisub.changes +++ b/aegisub.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 8 07:40:37 UTC 2018 - davejplater@gmail.com + +- Use portable namespace in aegisub-icu.patch. + ------------------------------------------------------------------- Sat May 19 13:07:22 UTC 2018 - davejplater@gmail.com