From owner-svn-ports-head@freebsd.org Wed Apr 4 08:03:59 2018 Return-Path: Delivered-To: svn-ports-head@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 40FD5F9BFCA; Wed, 4 Apr 2018 08:03:59 +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 E89176A5F3; Wed, 4 Apr 2018 08:03:58 +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 CB47E10F53; Wed, 4 Apr 2018 08:03:58 +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 w3483wvp093785; Wed, 4 Apr 2018 08:03:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3483wbv093784; Wed, 4 Apr 2018 08:03:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804040803.w3483wbv093784@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 08:03:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466397 - head/misc/sword X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/misc/sword X-SVN-Commit-Revision: 466397 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Apr 2018 08:03:59 -0000 Author: jbeich Date: Wed Apr 4 08:03:58 2018 New Revision: 466397 URL: https://svnweb.freebsd.org/changeset/ports/466397 Log: misc/sword: unbreak with ICU 61 In file included from ../src/mgr/swmgr.cpp:108: ../include/utf8transliterator.h:53:2: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'? UnicodeString resource; ^~~~~~~~~~~~~ icu::UnicodeString /usr/local/include/unicode/unistr.h:286:20: note: 'icu::UnicodeString' declared here class U_COMMON_API UnicodeString : public Replaceable ^ In file included from ../src/mgr/swmgr.cpp:108: ../include/utf8transliterator.h:56:24: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'? typedef std::map SWTransMap; ^~~~~~~~~~~~~ icu::UnicodeString /usr/local/include/unicode/unistr.h:286:20: note: 'icu::UnicodeString' declared here class U_COMMON_API UnicodeString : public Replaceable ^ In file included from ../src/mgr/swmgr.cpp:108: ../include/utf8transliterator.h:57:19: error: use of undeclared identifier 'UnicodeString' typedef std::pair SWTransPair; ^ ../include/utf8transliterator.h:84:2: error: unknown type name 'Transliterator'; did you mean 'UTransliterator'? Transliterator *createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status); ^~~~~~~~~~~~~~ UTransliterator /usr/local/include/unicode/utrans.h:70:15: note: 'UTransliterator' declared here typedef void* UTransliterator; ^ In file included from ../src/mgr/swmgr.cpp:108: ../include/utf8transliterator.h:84:36: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'? Transliterator *createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status); ^~~~~~~~~~~~~ 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) Modified: head/misc/sword/Makefile (contents, props changed) Modified: head/misc/sword/Makefile ============================================================================== --- head/misc/sword/Makefile Wed Apr 4 08:03:48 2018 (r466396) +++ head/misc/sword/Makefile Wed Apr 4 08:03:58 2018 (r466397) @@ -16,6 +16,7 @@ BUILD_DEPENDS= cppunit-config:devel/cppunit GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-conf --with-zlib +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 INSTALL_TARGET= install-strip USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes