aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2018-04-04 17:38:04 +0800
committerjbeich <jbeich@FreeBSD.org>2018-04-04 17:38:04 +0800
commitca92a42bbc9041e4d94f10bedffa5407f9c1ec94 (patch)
tree9cd92ccabefde376d0dab748f65afac86489ab22
parent4336cd808ce6b23377a6475fcec53fd0c8b32f9b (diff)
downloadfreebsd-ports-graphics-ca92a42bbc9041e4d94f10bedffa5407f9c1ec94.tar.gz
freebsd-ports-graphics-ca92a42bbc9041e4d94f10bedffa5407f9c1ec94.tar.zst
freebsd-ports-graphics-ca92a42bbc9041e4d94f10bedffa5407f9c1ec94.zip
databases/evolution-data-server: unbreak with ICU 61
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)
-rw-r--r--databases/evolution-data-server/files/patch-icu6131
1 files changed, 31 insertions, 0 deletions
diff --git a/databases/evolution-data-server/files/patch-icu61 b/databases/evolution-data-server/files/patch-icu61
new file mode 100644
index 00000000000..3d1b0082a63
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-icu61
@@ -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;
+