svn commit: r466397 - head/misc/sword

[Jan Beich]

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<const UnicodeString, SWTransData> 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<UnicodeString, SWTransData> 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