svn commit: r466416 - head/textproc/zorba

[Jan Beich]

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<Collator*>( 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<RuleBasedBreakIterator> 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" \