diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-12 21:05:05 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-12 21:05:05 +0000 |
| commit | 0eb7d69828e2f7747b1c8a56eeea076b91fa0d56 (patch) | |
| tree | c1a82746c5bd8849f7ae75c40ed60181a07b3120 /user/openttd/icu61.patch | |
| parent | a3a3dd263678e11f5f8da4ae05ca28183e9c205b (diff) | |
| download | packages-0eb7d69828e2f7747b1c8a56eeea076b91fa0d56.tar.gz packages-0eb7d69828e2f7747b1c8a56eeea076b91fa0d56.tar.bz2 packages-0eb7d69828e2f7747b1c8a56eeea076b91fa0d56.tar.xz packages-0eb7d69828e2f7747b1c8a56eeea076b91fa0d56.zip | |
user/openttd: new package
Diffstat (limited to 'user/openttd/icu61.patch')
| -rw-r--r-- | user/openttd/icu61.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/user/openttd/icu61.patch b/user/openttd/icu61.patch new file mode 100644 index 000000000..e4143d82f --- /dev/null +++ b/user/openttd/icu61.patch @@ -0,0 +1,45 @@ +From 19076c24c1f3baf2a22d1fa832d5688216cf54a3 Mon Sep 17 00:00:00 2001 +From: Charles Pigott <charlespigott@googlemail.com> +Date: Sun, 8 Apr 2018 01:06:18 +0100 +Subject: [PATCH] Fix #6690: Compilation with ICU 61 + +--- + src/language.h | 2 +- + src/strings.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/language.h b/src/language.h +index d33ba81892..ec241dbd8c 100644 +--- a/src/language.h ++++ b/src/language.h +@@ -105,7 +105,7 @@ extern LanguageList _languages; + extern const LanguageMetadata *_current_language; + + #ifdef WITH_ICU_SORT +-extern Collator *_current_collator; ++extern icu::Collator *_current_collator; + #endif /* WITH_ICU_SORT */ + + bool ReadLanguagePack(const LanguageMetadata *lang); +diff --git a/src/strings.cpp b/src/strings.cpp +index 1c539d9343..fd7420259a 100644 +--- a/src/strings.cpp ++++ b/src/strings.cpp +@@ -52,7 +52,7 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang + TextDirection _current_text_dir; ///< Text direction of the currently selected language. + + #ifdef WITH_ICU_SORT +-Collator *_current_collator = NULL; ///< Collator for the language currently in use. ++icu::Collator *_current_collator = NULL; ///< Collator for the language currently in use. + #endif /* WITH_ICU_SORT */ + + static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam. +@@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) + + /* Create a collator instance for our current locale. */ + UErrorCode status = U_ZERO_ERROR; +- _current_collator = Collator::createInstance(Locale(_current_language->isocode), status); ++ _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status); + /* Sort number substrings by their numerical value. */ + if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status); + /* Avoid using the collator if it is not correctly set. */ |