cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/evolution-data-server: unbreak with ICU 61

Browse Source 
src/libedataserver/e-alphabet-index-private.cpp:79:2: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'?
        UnicodeString string;
        ^~~~~~~~~~~~~
        icu::UnicodeString
/usr/local/include/unicode/unistr.h:286:20: note: 'icu::UnicodeString' declared here
class U_COMMON_API UnicodeString : public Replaceable
                   ^
src/libedataserver/e-alphabet-index-private.cpp:132:3: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'?
                UnicodeString ustring;
                ^~~~~~~~~~~~~
                icu::UnicodeString
/usr/local/include/unicode/unistr.h:286:20: note: 'icu::UnicodeString' declared here
class U_COMMON_API UnicodeString : public Replaceable
                   ^

https://ssl.icu-project.org/trac/changeset/40705

PR:		227042
Reported by:	antoine (via exp-run)
This commit is contained in:
Jan Beich 2018-04-04 09:38:04 +00:00
parent a4cfdd4c49
commit 0de2e367d7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=466409
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
databases/evolution-data-server/files/patch-icu61 Normal file
View File

@ -0,0 +1,31 @@
--- src/libedataserver/e-alphabet-index-private.cpp.orig 2017-05-08 12:04:10 UTC
+++ src/libedataserver/e-alphabet-index-private.cpp
@@ -76,7 +76,7 @@ _e_alphabet_index_cxx_get_index (EAlphabetIndex *alph
const gchar *word)
{
UErrorCode status = U_ZERO_ERROR;
- UnicodeString string;
+ icu::UnicodeString string;
gint index;
g_return_val_if_fail (alphabet_index != NULL, -1);
@@ -129,7 +129,7 @@ _e_alphabet_index_cxx_get_labels (EAlphabetIndex *alp
for (i = 0; alphabet_index->priv->nextBucket (status); i++) {
UAlphabeticIndexLabelType label_type;
- UnicodeString ustring;
+ icu::UnicodeString ustring;
std::string string;
label_type = alphabet_index->priv->getBucketLabelType ();
--- src/libedataserver/e-transliterator-private.cpp.orig 2017-05-08 12:04:10 UTC
+++ src/libedataserver/e-transliterator-private.cpp
@@ -74,7 +74,7 @@ gchar *
_e_transliterator_cxx_transliterate (ETransliterator *transliterator,
const gchar *str)
{
- UnicodeString transform;
+ icu::UnicodeString transform;
std::string sourceUTF8;
std::string targetUTF8;