Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Apr 2018 09:38:05 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r466409 - head/databases/evolution-data-server/files
Message-ID:  <201804040938.w349c5NQ003918@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Apr  4 09:38:04 2018
New Revision: 466409
URL: https://svnweb.freebsd.org/changeset/ports/466409

Log:
  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)

Added:
  head/databases/evolution-data-server/files/patch-icu61   (contents, props changed)

Added: head/databases/evolution-data-server/files/patch-icu61
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/evolution-data-server/files/patch-icu61	Wed Apr  4 09:38:04 2018	(r466409)
@@ -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;
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804040938.w349c5NQ003918>