From owner-svn-ports-all@freebsd.org Wed Apr 4 10:11:49 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 E989CF80899; Wed, 4 Apr 2018 10:11:48 +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 9D2237053C; Wed, 4 Apr 2018 10:11:48 +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 9812D124ED; Wed, 4 Apr 2018 10:11:48 +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 w34ABmcX045398; Wed, 4 Apr 2018 10:11:48 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w34ABmiU045347; Wed, 4 Apr 2018 10:11:48 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804041011.w34ABmiU045347@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 10:11:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466416 - head/textproc/zorba X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/textproc/zorba X-SVN-Commit-Revision: 466416 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 10:11:49 -0000 Author: jbeich Date: Wed Apr 4 10:11:48 2018 New Revision: 466416 URL: https://svnweb.freebsd.org/changeset/ports/466416 Log: textproc/zorba: unbreak with ICU 61 In file included from src/functions/func_any_uri.cpp:27: In file included from src/functions/func_any_uri.h:30: In file included from src/functions/function_impl.h:25: In file included from src/context/static_context.h:43: In file included from src/zorbautils/hashmap_zstring.h:23: src/util/utf8_util.h:784:22: error: unknown type name 'Collator'; did you mean 'UCollator'? return static_cast( collation->getCollator() )->compare(us1, us2); ^~~~~~~~ UCollator /usr/local/include/unicode/ucol.h:58:26: note: 'UCollator' declared here typedef struct UCollator UCollator; ^ In file included from src/runtime/full_text/default_tokenizer.cpp:25: src/runtime/full_text/icu_tokenizer.h:56:27: error: unknown type name 'RuleBasedBreakIterator'; did you mean 'icu::RuleBasedBreakIterator'? typedef std::unique_ptr rbbi_ptr; ^~~~~~~~~~~~~~~~~~~~~~ icu::RuleBasedBreakIterator /usr/local/include/unicode/rbbi.h:53:20: note: 'icu::RuleBasedBreakIterator' declared here class U_COMMON_API RuleBasedBreakIterator /*U_FINAL*/ : public BreakIterator { ^ https://ssl.icu-project.org/trac/changeset/40705 PR: 227042 Reported by: antoine (via exp-run) Modified: head/textproc/zorba/Makefile (contents, props changed) Modified: head/textproc/zorba/Makefile ============================================================================== --- head/textproc/zorba/Makefile Wed Apr 4 10:11:13 2018 (r466415) +++ head/textproc/zorba/Makefile Wed Apr 4 10:11:48 2018 (r466416) @@ -41,6 +41,7 @@ USES= cmake:outsource compiler:c++11-lib libedit USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes USE_CXXSTD= c++11 +CXXFLAGS+= -DU_USING_ICU_NAMESPACE=1 CXXFLAGS+= -I${LOCALBASE}/include -O1 # compiler hangs with -O2 on CURRENT LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \