From owner-svn-ports-all@freebsd.org Wed Apr 4 09:38:05 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BC769FA043E; Wed, 4 Apr 2018 09:38:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 58A906ED86; Wed, 4 Apr 2018 09:38:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3485411E6D; Wed, 4 Apr 2018 09:38:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w349c5G5003919; Wed, 4 Apr 2018 09:38:05 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w349c5NQ003918; Wed, 4 Apr 2018 09:38:05 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804040938.w349c5NQ003918@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 4 Apr 2018 09:38:05 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/databases/evolution-data-server/files X-SVN-Commit-Revision: 466409 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Apr 2018 09:38:06 -0000 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; +