58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
|
Upstream: Yes
|
||
|
|
Author: sidneys <sidneys.github.io@outlook.com>
|
||
|
|
Reason: fix build w/ ICU >= 60
|
||
|
|
--- libaegisub/common/character_count.cpp
|
||
|
|
+++ 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;
|
||
|
|
--- src/utils.cpp
|
||
|
|
+++ 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());
|
||
|
|
--- src/utils.cpp
|
||
|
|
+++ src/utils.cpp
|
||
|
|
@@ -44,6 +44,7 @@
|
||
|
|
#include <boost/filesystem/path.hpp>
|
||
|
|
#include <map>
|
||
|
|
#include <unicode/locid.h>
|
||
|
|
+#include <unicode/unistr.h>
|
||
|
|
#include <wx/clipbrd.h>
|
||
|
|
#include <wx/filedlg.h>
|
||
|
|
#include <wx/stdpaths.h>
|
||
|
|
|