Hello community, here is the log from the commit of package aegisub for openSUSE:Factory checked in at 2018-06-08 23:18:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aegisub (Old) and /work/SRC/openSUSE:Factory/.aegisub.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aegisub" Fri Jun 8 23:18:17 2018 rev:27 rq:615164 version:3.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/aegisub/aegisub.changes 2018-05-29 10:32:59.966897071 +0200 +++ /work/SRC/openSUSE:Factory/.aegisub.new/aegisub.changes 2018-06-08 23:18:21.973777702 +0200 @@ -1,0 +2,5 @@ +Fri Jun 8 07:40:37 UTC 2018 - davejpla...@gmail.com + +- Use portable namespace in aegisub-icu.patch. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aegisub-icu.patch ++++++ --- /var/tmp/diff_new_pack.JigPG2/_old 2018-06-08 23:18:22.653753139 +0200 +++ /var/tmp/diff_new_pack.JigPG2/_new 2018-06-08 23:18:22.657752995 +0200 @@ -12,13 +12,13 @@ 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 @@ 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 @@ 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());