[aegisub] Fix build for icu-61

commit f81e922e98909717f9df3d2f9f5cab0474c89e37 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sun Jun 17 11:08:50 2018 +0100 Fix build for icu-61 aegisub.spec | 4 ++++ icu_61_buildfix.patch | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) --- diff --git a/aegisub.spec b/aegisub.spec index 5277b26..a4371b0 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -22,6 +22,9 @@ Patch0: %{name}-pthread.patch %if 0%{?fedora} > 27 Patch1: https://github.com/%{gituser}/%{gitname}/commit/dd67db47cb2203e7a14058e52... %endif +%if 0%{?fedora} > 28 +Patch2: https://github.com/%{gituser}/%{gitname}/commit/d4461f65be5aa440506bd23e9... +%endif ExclusiveArch: i686 x86_64 armv7hl @@ -91,6 +94,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %changelog * Sun Jun 17 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.2.2-10 - Rebuild for new libass version +- Fix build for icu-61 * Wed Feb 28 2018 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 3.2.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/icu_61_buildfix.patch b/icu_61_buildfix.patch new file mode 100644 index 0000000..71cf6b8 --- /dev/null +++ b/icu_61_buildfix.patch @@ -0,0 +1,58 @@ +From d4461f65be5aa440506bd23e90e71aaf8f0ebada Mon Sep 17 00:00:00 2001 +From: sidneys <sidneys.github.io(a)outlook.com&gt; +Date: Sat, 31 Mar 2018 02:57:19 +0200 +Subject: [PATCH] fix(updated-macos-build): prefix icu method calls + (icu::BreakIterator, icu::Locale, icu::UnicodeString) + +--- + libaegisub/common/character_count.cpp | 6 +++--- + src/utils.cpp | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libaegisub/common/character_count.cpp b/libaegisub/common/character_count.cpp +index 0b8c70b31..1276f74fb 100644 +--- a/libaegisub/common/character_count.cpp ++++ b/libaegisub/common/character_count.cpp +@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) { + 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)); + if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator"); + }); + +@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) { + + 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()) { + if (!mask) + ++count; + else { +@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) { + auto& bi = get_break_iterator(&str[0], str.size()); + + for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) { +- if (end == BreakIterator::DONE) ++ if (end == icu::BreakIterator::DONE) + return str.size(); + if (n == 0) + return pos; +diff --git a/src/utils.cpp b/src/utils.cpp +index 876c4c011..2416aa7a2 100644 +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio + } + + wxString LocalizedLanguageName(wxString const& lang) { +- Locale iculoc(lang.c_str()); ++ icu::Locale iculoc(lang.c_str()); + if (!iculoc.isBogus()) { +- UnicodeString ustr; ++ icu::UnicodeString ustr; + iculoc.getDisplayName(iculoc, ustr); + #ifdef _MSC_VER + return wxString(ustr.getBuffer());